2 * interactive diff, inspired/stolen from
3 * kernighan and pike, _unix programming environment_.
13 void copy(Biobuf*, char*, Biobuf*, char*);
14 void idiff(Biobuf*, char*, Biobuf*, char*, Biobuf*, char*, Biobuf*, char*);
15 int opentemp(char*, int, long);
16 void rundiff(char*, char*, int);
21 fprint(2, "usage: idiff [-bw] file1 file2\n");
26 main(int argc, char **argv)
29 char diffout[40], idiffout[40];
30 Biobuf *b1, *b2, bdiff, bout, bstdout;
47 if((d = dirstat(argv[0])) == nil)
48 sysfatal("stat %s: %r", argv[0]);
50 sysfatal("%s is a directory", argv[0]);
52 if((d = dirstat(argv[1])) == nil)
53 sysfatal("stat %s: %r", argv[1]);
55 sysfatal("%s is a directory", argv[1]);
58 if((b1 = Bopen(argv[0], OREAD)) == nil)
59 sysfatal("open %s: %r", argv[0]);
60 if((b2 = Bopen(argv[1], OREAD)) == nil)
61 sysfatal("open %s: %r", argv[1]);
63 strcpy(diffout, "/tmp/idiff.XXXXXX");
64 fd = opentemp(diffout, ORDWR|ORCLOSE, 0);
65 strcpy(idiffout, "/tmp/idiff.XXXXXX");
66 ofd = opentemp(idiffout, ORDWR|ORCLOSE, 0);
67 rundiff(argv[0], argv[1], fd);
69 Binit(&bdiff, fd, OREAD);
70 Binit(&bout, ofd, OWRITE);
71 idiff(b1, argv[0], b2, argv[1], &bdiff, diffout, &bout, idiffout);
75 Binit(&bout, ofd, OREAD);
76 Binit(&bstdout, 1, OWRITE);
77 copy(&bout, idiffout, &bstdout, "<stdout>");
82 opentemp(char *template, int mode, long perm)
87 fd = mkstemp(template);
89 sysfatal("could not create temporary file");
98 rundiff(char *arg1, char *arg2, int outfd)
105 arg[narg++] = "/bin/diff";
115 switch(pid = fork()){
117 sysfatal("fork: %r");
122 exec("/bin/diff", arg);
123 sysfatal("exec: %r");
128 sysfatal("wait: %r");
130 sysfatal("wait got unexpected pid %d", w->pid);
131 if((p = strchr(w->msg, ':')) && strcmp(p, ": some") != 0)
132 sysfatal("%s", w->msg);
144 arg[narg++] = "/bin/rc";
149 switch(pid = fork()){
151 sysfatal("fork: %r");
154 exec("/bin/rc", arg);
155 sysfatal("exec: %r");
160 sysfatal("wait: %r");
162 sysfatal("wait got unexpected pid %d", wpid);
167 parse(char *s, int *pfrom1, int *pto1, int *pcmd, int *pfrom2, int *pto2)
169 *pfrom1 = *pto1 = *pfrom2 = *pto2 = 0;
173 sysfatal("bad diff output0");
175 *pfrom1 = strtol(s, &s, 10);
178 *pto1 = strtol(s, &s, 10);
182 sysfatal("bad diff output1");
185 sysfatal("bad diff output2");
188 sysfatal("bad diff output3");
190 *pfrom2 = strtol(s, &s, 10);
193 *pto2 = strtol(s, &s, 10);
199 skiplines(Biobuf *b, char *name, int n)
204 while(Brdline(b, '\n')==nil){
206 sysfatal("early end of file on %s", name);
207 Bseek(b, Blinelen(b), 1);
213 copylines(Biobuf *bin, char *nin, Biobuf *bout, char *nout, int n)
219 while((p=Brdline(bin, '\n'))==nil){
220 if(Blinelen(bin) <= 0)
221 sysfatal("early end of file on %s", nin);
225 m = Bread(bin, buf, m);
226 if(Bwrite(bout, buf, m) != m)
227 sysfatal("error writing %s: %r", nout);
229 if(Bwrite(bout, p, Blinelen(bin)) != Blinelen(bin))
230 sysfatal("error writing %s: %r", nout);
235 copy(Biobuf *bin, char *nin, Biobuf *bout, char *nout)
241 while((m = Bread(bin, buf, sizeof buf)) > 0)
242 if(Bwrite(bout, buf, m) != m)
243 sysfatal("error writing %s: %r", nout);
247 idiff(Biobuf *b1, char *name1, Biobuf *b2, char *name2, Biobuf *bdiff, char *namediff, Biobuf *bout, char *nameout)
250 int interactive, defaultanswer, cmd, diffoffset;
251 int n, from1, to1, from2, to2, nf1, nf2;
258 Binit(&berr, 2, OWRITE);
259 while(diffoffset = Boffset(bdiff), p = Brdline(bdiff, '\n')){
260 p[Blinelen(bdiff)-1] = '\0';
261 parse(p, &from1, &to1, &cmd, &from2, &to2);
262 p[Blinelen(bdiff)-1] = '\n';
263 n = to1-from1 + to2-from2 + 1; /* #lines from diff */
270 to1++; /* make half-open intervals */
273 p[Blinelen(bdiff)-1] = '\0';
274 fprint(2, "%s\n", p);
275 p[Blinelen(bdiff)-1] = '\n';
276 copylines(bdiff, namediff, &berr, "<stderr>", n);
279 skiplines(bdiff, namediff, n);
283 memset(buf, 0, sizeof buf);
284 if(read(0, buf, sizeof buf - 1) < 0)
285 sysfatal("read console: %r");
287 buf[0] = defaultanswer;
291 copylines(b1, name1, bout, nameout, from1-nf1);
292 skiplines(b1, name1, to1-from1);
293 skiplines(b2, name2, from2-nf2);
294 copylines(b2, name2, bout, nameout, to2-from2);
297 copylines(b1, name1, bout, nameout, to1-nf1);
298 skiplines(b2, name2, to2-nf2);
301 copylines(b1, name1, bout, nameout, from1-nf1);
302 skiplines(b1, name1, to1-from1);
303 skiplines(b2, name2, to2-nf2);
304 if(Bseek(bdiff, diffoffset, 0) != diffoffset)
305 sysfatal("seek in diff output: %r");
306 copylines(bdiff, namediff, bout, nameout, n+1);
312 if(buf[1]=='<' || buf[1]=='>' || buf[1]=='='){
314 defaultanswer = buf[1];
316 fprint(2, "must be q<, q>, or q=\n");
319 fprint(2, "expect: <, >, =, q<, q>, q=, !cmd\n");
322 }while(buf[0] != '<' && buf[0] != '>' && buf[0] != '=');
326 copy(b1, name1, bout, nameout);