2 * interactive diff, inspired/stolen from
3 * kernighan and pike, _unix programming environment_.
10 #define opentemp idiffopentemp
15 void copy(Biobuf*, char*, Biobuf*, char*);
16 void idiff(Biobuf*, char*, Biobuf*, char*, Biobuf*, char*, Biobuf*, char*);
17 int opentemp(char*, int, long);
18 void rundiff(char*, char*, int);
23 fprint(2, "usage: idiff [-bw] file1 file2\n");
28 main(int argc, char **argv)
31 char diffout[40], idiffout[40];
32 Biobuf *b1, *b2, bdiff, bout, bstdout;
49 if((d = dirstat(argv[0])) == nil)
50 sysfatal("stat %s: %r", argv[0]);
52 sysfatal("%s is a directory", argv[0]);
54 if((d = dirstat(argv[1])) == nil)
55 sysfatal("stat %s: %r", argv[1]);
57 sysfatal("%s is a directory", argv[1]);
60 if((b1 = Bopen(argv[0], OREAD)) == nil)
61 sysfatal("open %s: %r", argv[0]);
62 if((b2 = Bopen(argv[1], OREAD)) == nil)
63 sysfatal("open %s: %r", argv[1]);
65 strcpy(diffout, "/tmp/idiff.XXXXXX");
66 fd = opentemp(diffout, ORDWR|ORCLOSE, 0);
67 strcpy(idiffout, "/tmp/idiff.XXXXXX");
68 ofd = opentemp(idiffout, ORDWR|ORCLOSE, 0);
69 rundiff(argv[0], argv[1], fd);
71 Binit(&bdiff, fd, OREAD);
72 Binit(&bout, ofd, OWRITE);
73 idiff(b1, argv[0], b2, argv[1], &bdiff, diffout, &bout, idiffout);
77 Binit(&bout, ofd, OREAD);
78 Binit(&bstdout, 1, OWRITE);
79 copy(&bout, idiffout, &bstdout, "<stdout>");
84 opentemp(char *template, int mode, long perm)
89 fd = mkstemp(template);
91 sysfatal("could not create temporary file");
100 rundiff(char *arg1, char *arg2, int outfd)
108 arg[narg++] = "diff";
118 switch(pid = fork()){
120 sysfatal("fork: %r");
126 sysfatal("exec: %r");
131 sysfatal("wait: %r");
133 sysfatal("wait got unexpected pid %d", w->pid);
134 if((p = strchr(w->msg, ':')) && strcmp(p, ": some") != 0)
135 sysfatal("%s", w->msg);
152 switch(pid = fork()){
154 sysfatal("fork: %r");
158 sysfatal("exec: %r");
163 sysfatal("wait: %r");
165 sysfatal("wait got unexpected pid %d", wpid);
170 parse(char *s, int *pfrom1, int *pto1, int *pcmd, int *pfrom2, int *pto2)
172 *pfrom1 = *pto1 = *pfrom2 = *pto2 = 0;
176 sysfatal("bad diff output0");
178 *pfrom1 = strtol(s, &s, 10);
181 *pto1 = strtol(s, &s, 10);
185 sysfatal("bad diff output1");
188 sysfatal("bad diff output2");
191 sysfatal("bad diff output3");
193 *pfrom2 = strtol(s, &s, 10);
196 *pto2 = strtol(s, &s, 10);
202 skiplines(Biobuf *b, char *name, int n)
207 while(Brdline(b, '\n')==nil){
209 sysfatal("early end of file on %s", name);
210 Bseek(b, Blinelen(b), 1);
216 copylines(Biobuf *bin, char *nin, Biobuf *bout, char *nout, int n)
222 while((p=Brdline(bin, '\n'))==nil){
223 if(Blinelen(bin) <= 0)
224 sysfatal("early end of file on %s", nin);
228 m = Bread(bin, buf, m);
229 if(Bwrite(bout, buf, m) != m)
230 sysfatal("error writing %s: %r", nout);
232 if(Bwrite(bout, p, Blinelen(bin)) != Blinelen(bin))
233 sysfatal("error writing %s: %r", nout);
238 copy(Biobuf *bin, char *nin, Biobuf *bout, char *nout)
244 while((m = Bread(bin, buf, sizeof buf)) > 0)
245 if(Bwrite(bout, buf, m) != m)
246 sysfatal("error writing %s: %r", nout);
250 idiff(Biobuf *b1, char *name1, Biobuf *b2, char *name2, Biobuf *bdiff, char *namediff, Biobuf *bout, char *nameout)
253 int interactive, defaultanswer, cmd, diffoffset;
254 int n, from1, to1, from2, to2, nf1, nf2;
261 Binit(&berr, 2, OWRITE);
262 while(diffoffset = Boffset(bdiff), p = Brdline(bdiff, '\n')){
263 p[Blinelen(bdiff)-1] = '\0';
264 parse(p, &from1, &to1, &cmd, &from2, &to2);
265 p[Blinelen(bdiff)-1] = '\n';
266 n = to1-from1 + to2-from2 + 1; /* #lines from diff */
273 to1++; /* make half-open intervals */
276 p[Blinelen(bdiff)-1] = '\0';
277 fprint(2, "%s\n", p);
278 p[Blinelen(bdiff)-1] = '\n';
279 copylines(bdiff, namediff, &berr, "<stderr>", n);
282 skiplines(bdiff, namediff, n);
286 memset(buf, 0, sizeof buf);
287 if(read(0, buf, sizeof buf - 1) < 0)
288 sysfatal("read console: %r");
290 buf[0] = defaultanswer;
294 copylines(b1, name1, bout, nameout, from1-nf1);
295 skiplines(b1, name1, to1-from1);
296 skiplines(b2, name2, from2-nf2);
297 copylines(b2, name2, bout, nameout, to2-from2);
300 copylines(b1, name1, bout, nameout, to1-nf1);
301 skiplines(b2, name2, to2-nf2);
304 copylines(b1, name1, bout, nameout, from1-nf1);
305 skiplines(b1, name1, to1-from1);
306 skiplines(b2, name2, to2-nf2);
307 if(Bseek(bdiff, diffoffset, 0) != diffoffset)
308 sysfatal("seek in diff output: %r");
309 copylines(bdiff, namediff, bout, nameout, n+1);
315 if(buf[1]=='<' || buf[1]=='>' || buf[1]=='='){
317 defaultanswer = buf[1];
319 fprint(2, "must be q<, q>, or q=\n");
322 fprint(2, "expect: <, >, =, q<, q>, q=, !cmd\n");
325 }while(buf[0] != '<' && buf[0] != '>' && buf[0] != '=');
329 copy(b1, name1, bout, nameout);