2 bc7cb1a1 2003-11-23 devnull * interactive diff, inspired/stolen from
3 bc7cb1a1 2003-11-23 devnull * kernighan and pike, _unix programming environment_.
6 bc7cb1a1 2003-11-23 devnull #include <u.h>
7 bc7cb1a1 2003-11-23 devnull #include <libc.h>
8 bc7cb1a1 2003-11-23 devnull #include <bio.h>
10 bc7cb1a1 2003-11-23 devnull int diffbflag;
11 bc7cb1a1 2003-11-23 devnull int diffwflag;
13 bc7cb1a1 2003-11-23 devnull void copy(Biobuf*, char*, Biobuf*, char*);
14 bc7cb1a1 2003-11-23 devnull void idiff(Biobuf*, char*, Biobuf*, char*, Biobuf*, char*, Biobuf*, char*);
15 bc7cb1a1 2003-11-23 devnull void rundiff(char*, char*, int);
18 bc7cb1a1 2003-11-23 devnull usage(void)
20 bc7cb1a1 2003-11-23 devnull fprint(2, "usage: idiff [-bw] file1 file2\n");
21 bc7cb1a1 2003-11-23 devnull exits("usage");
25 bc7cb1a1 2003-11-23 devnull main(int argc, char **argv)
27 bc7cb1a1 2003-11-23 devnull int fd, ofd;
28 bc7cb1a1 2003-11-23 devnull char diffout[40], idiffout[40];
29 bc7cb1a1 2003-11-23 devnull Biobuf *b1, *b2, bdiff, bout, bstdout;
32 bc7cb1a1 2003-11-23 devnull ARGBEGIN{
35 bc7cb1a1 2003-11-23 devnull case 'b':
36 bc7cb1a1 2003-11-23 devnull diffbflag++;
38 bc7cb1a1 2003-11-23 devnull case 'w':
39 bc7cb1a1 2003-11-23 devnull diffwflag++;
43 bc7cb1a1 2003-11-23 devnull if(argc != 2)
46 bc7cb1a1 2003-11-23 devnull if((d = dirstat(argv[0])) == nil)
47 bc7cb1a1 2003-11-23 devnull sysfatal("stat %s: %r", argv[0]);
48 bc7cb1a1 2003-11-23 devnull if(d->mode&DMDIR)
49 bc7cb1a1 2003-11-23 devnull sysfatal("%s is a directory", argv[0]);
51 bc7cb1a1 2003-11-23 devnull if((d = dirstat(argv[1])) == nil)
52 bc7cb1a1 2003-11-23 devnull sysfatal("stat %s: %r", argv[1]);
53 bc7cb1a1 2003-11-23 devnull if(d->mode&DMDIR)
54 bc7cb1a1 2003-11-23 devnull sysfatal("%s is a directory", argv[1]);
57 bc7cb1a1 2003-11-23 devnull if((b1 = Bopen(argv[0], OREAD)) == nil)
58 bc7cb1a1 2003-11-23 devnull sysfatal("open %s: %r", argv[0]);
59 bc7cb1a1 2003-11-23 devnull if((b2 = Bopen(argv[1], OREAD)) == nil)
60 bc7cb1a1 2003-11-23 devnull sysfatal("open %s: %r", argv[1]);
62 bc7cb1a1 2003-11-23 devnull strcpy(diffout, "/tmp/idiff.XXXXXX");
63 a58a827f 2008-07-10 rsc fd = opentemp(diffout, ORDWR|ORCLOSE);
64 bc7cb1a1 2003-11-23 devnull strcpy(idiffout, "/tmp/idiff.XXXXXX");
65 a58a827f 2008-07-10 rsc ofd = opentemp(idiffout, ORDWR|ORCLOSE);
66 bc7cb1a1 2003-11-23 devnull rundiff(argv[0], argv[1], fd);
67 bc7cb1a1 2003-11-23 devnull seek(fd, 0, 0);
68 bc7cb1a1 2003-11-23 devnull Binit(&bdiff, fd, OREAD);
69 bc7cb1a1 2003-11-23 devnull Binit(&bout, ofd, OWRITE);
70 bc7cb1a1 2003-11-23 devnull idiff(b1, argv[0], b2, argv[1], &bdiff, diffout, &bout, idiffout);
71 bc7cb1a1 2003-11-23 devnull Bterm(&bdiff);
72 bc7cb1a1 2003-11-23 devnull Bflush(&bout);
73 bc7cb1a1 2003-11-23 devnull seek(ofd, 0, 0);
74 bc7cb1a1 2003-11-23 devnull Binit(&bout, ofd, OREAD);
75 bc7cb1a1 2003-11-23 devnull Binit(&bstdout, 1, OWRITE);
76 bc7cb1a1 2003-11-23 devnull copy(&bout, idiffout, &bstdout, "<stdout>");
77 bc7cb1a1 2003-11-23 devnull exits(nil);
81 bc7cb1a1 2003-11-23 devnull rundiff(char *arg1, char *arg2, int outfd)
83 bc7cb1a1 2003-11-23 devnull char *arg[10], *p;
84 bc7cb1a1 2003-11-23 devnull int narg, pid;
85 bc7cb1a1 2003-11-23 devnull Waitmsg *w;
87 bc7cb1a1 2003-11-23 devnull narg = 0;
88 fcb69ec5 2005-07-14 devnull arg[narg++] = "9";
89 b4a659b6 2004-04-19 devnull arg[narg++] = "diff";
90 bc7cb1a1 2003-11-23 devnull arg[narg++] = "-n";
91 bc7cb1a1 2003-11-23 devnull if(diffbflag)
92 bc7cb1a1 2003-11-23 devnull arg[narg++] = "-b";
93 bc7cb1a1 2003-11-23 devnull if(diffwflag)
94 bc7cb1a1 2003-11-23 devnull arg[narg++] = "-w";
95 bc7cb1a1 2003-11-23 devnull arg[narg++] = arg1;
96 bc7cb1a1 2003-11-23 devnull arg[narg++] = arg2;
97 bc7cb1a1 2003-11-23 devnull arg[narg] = nil;
99 bc7cb1a1 2003-11-23 devnull switch(pid = fork()){
100 bc7cb1a1 2003-11-23 devnull case -1:
101 bc7cb1a1 2003-11-23 devnull sysfatal("fork: %r");
104 bc7cb1a1 2003-11-23 devnull dup(outfd, 1);
105 bc7cb1a1 2003-11-23 devnull close(0);
106 fcb69ec5 2005-07-14 devnull exec("9", arg);
107 bc7cb1a1 2003-11-23 devnull sysfatal("exec: %r");
109 bc7cb1a1 2003-11-23 devnull default:
110 bc7cb1a1 2003-11-23 devnull w = wait();
111 bc7cb1a1 2003-11-23 devnull if(w==nil)
112 bc7cb1a1 2003-11-23 devnull sysfatal("wait: %r");
113 bc7cb1a1 2003-11-23 devnull if(w->pid != pid)
114 bc7cb1a1 2003-11-23 devnull sysfatal("wait got unexpected pid %d", w->pid);
115 bc7cb1a1 2003-11-23 devnull if((p = strchr(w->msg, ':')) && strcmp(p, ": some") != 0)
116 bc7cb1a1 2003-11-23 devnull sysfatal("%s", w->msg);
117 bc7cb1a1 2003-11-23 devnull free(w);
122 bc7cb1a1 2003-11-23 devnull runcmd(char *cmd)
124 bc7cb1a1 2003-11-23 devnull char *arg[10];
125 bc7cb1a1 2003-11-23 devnull int narg, pid, wpid;
127 bc7cb1a1 2003-11-23 devnull narg = 0;
128 b4a659b6 2004-04-19 devnull arg[narg++] = "rc";
129 bc7cb1a1 2003-11-23 devnull arg[narg++] = "-c";
130 bc7cb1a1 2003-11-23 devnull arg[narg++] = cmd;
131 bc7cb1a1 2003-11-23 devnull arg[narg] = nil;
133 bc7cb1a1 2003-11-23 devnull switch(pid = fork()){
134 bc7cb1a1 2003-11-23 devnull case -1:
135 bc7cb1a1 2003-11-23 devnull sysfatal("fork: %r");
138 b4a659b6 2004-04-19 devnull exec("rc", arg);
139 bc7cb1a1 2003-11-23 devnull sysfatal("exec: %r");
141 bc7cb1a1 2003-11-23 devnull default:
142 bc7cb1a1 2003-11-23 devnull wpid = waitpid();
143 bc7cb1a1 2003-11-23 devnull if(wpid < 0)
144 bc7cb1a1 2003-11-23 devnull sysfatal("wait: %r");
145 bc7cb1a1 2003-11-23 devnull if(wpid != pid)
146 bc7cb1a1 2003-11-23 devnull sysfatal("wait got unexpected pid %d", wpid);
151 bc7cb1a1 2003-11-23 devnull parse(char *s, int *pfrom1, int *pto1, int *pcmd, int *pfrom2, int *pto2)
153 bc7cb1a1 2003-11-23 devnull *pfrom1 = *pto1 = *pfrom2 = *pto2 = 0;
155 bc7cb1a1 2003-11-23 devnull s = strchr(s, ':');
156 bc7cb1a1 2003-11-23 devnull if(s == nil)
157 bc7cb1a1 2003-11-23 devnull sysfatal("bad diff output0");
159 bc7cb1a1 2003-11-23 devnull *pfrom1 = strtol(s, &s, 10);
160 bc7cb1a1 2003-11-23 devnull if(*s == ','){
162 bc7cb1a1 2003-11-23 devnull *pto1 = strtol(s, &s, 10);
164 bc7cb1a1 2003-11-23 devnull *pto1 = *pfrom1;
165 bc7cb1a1 2003-11-23 devnull if(*s++ != ' ')
166 bc7cb1a1 2003-11-23 devnull sysfatal("bad diff output1");
167 bc7cb1a1 2003-11-23 devnull *pcmd = *s++;
168 bc7cb1a1 2003-11-23 devnull if(*s++ != ' ')
169 bc7cb1a1 2003-11-23 devnull sysfatal("bad diff output2");
170 bc7cb1a1 2003-11-23 devnull s = strchr(s, ':');
171 bc7cb1a1 2003-11-23 devnull if(s == nil)
172 bc7cb1a1 2003-11-23 devnull sysfatal("bad diff output3");
174 bc7cb1a1 2003-11-23 devnull *pfrom2 = strtol(s, &s, 10);
175 bc7cb1a1 2003-11-23 devnull if(*s == ','){
177 bc7cb1a1 2003-11-23 devnull *pto2 = strtol(s, &s, 10);
179 bc7cb1a1 2003-11-23 devnull *pto2 = *pfrom2;
183 bc7cb1a1 2003-11-23 devnull skiplines(Biobuf *b, char *name, int n)
187 bc7cb1a1 2003-11-23 devnull for(i=0; i<n; i++){
188 bc7cb1a1 2003-11-23 devnull while(Brdline(b, '\n')==nil){
189 bc7cb1a1 2003-11-23 devnull if(Blinelen(b) <= 0)
190 bc7cb1a1 2003-11-23 devnull sysfatal("early end of file on %s", name);
191 bc7cb1a1 2003-11-23 devnull Bseek(b, Blinelen(b), 1);
197 bc7cb1a1 2003-11-23 devnull copylines(Biobuf *bin, char *nin, Biobuf *bout, char *nout, int n)
199 bc7cb1a1 2003-11-23 devnull char buf[4096], *p;
200 bc7cb1a1 2003-11-23 devnull int i, m;
202 bc7cb1a1 2003-11-23 devnull for(i=0; i<n; i++){
203 bc7cb1a1 2003-11-23 devnull while((p=Brdline(bin, '\n'))==nil){
204 bc7cb1a1 2003-11-23 devnull if(Blinelen(bin) <= 0)
205 bc7cb1a1 2003-11-23 devnull sysfatal("early end of file on %s", nin);
206 bc7cb1a1 2003-11-23 devnull m = Blinelen(bin);
207 bc7cb1a1 2003-11-23 devnull if(m > sizeof buf)
208 bc7cb1a1 2003-11-23 devnull m = sizeof buf;
209 bc7cb1a1 2003-11-23 devnull m = Bread(bin, buf, m);
210 bc7cb1a1 2003-11-23 devnull if(Bwrite(bout, buf, m) != m)
211 bc7cb1a1 2003-11-23 devnull sysfatal("error writing %s: %r", nout);
213 bc7cb1a1 2003-11-23 devnull if(Bwrite(bout, p, Blinelen(bin)) != Blinelen(bin))
214 bc7cb1a1 2003-11-23 devnull sysfatal("error writing %s: %r", nout);
219 bc7cb1a1 2003-11-23 devnull copy(Biobuf *bin, char *nin, Biobuf *bout, char *nout)
221 bc7cb1a1 2003-11-23 devnull char buf[4096];
224 bc7cb1a1 2003-11-23 devnull USED(nin);
225 bc7cb1a1 2003-11-23 devnull while((m = Bread(bin, buf, sizeof buf)) > 0)
226 bc7cb1a1 2003-11-23 devnull if(Bwrite(bout, buf, m) != m)
227 bc7cb1a1 2003-11-23 devnull sysfatal("error writing %s: %r", nout);
231 bc7cb1a1 2003-11-23 devnull idiff(Biobuf *b1, char *name1, Biobuf *b2, char *name2, Biobuf *bdiff, char *namediff, Biobuf *bout, char *nameout)
233 bc7cb1a1 2003-11-23 devnull char buf[256], *p;
234 bc7cb1a1 2003-11-23 devnull int interactive, defaultanswer, cmd, diffoffset;
235 bc7cb1a1 2003-11-23 devnull int n, from1, to1, from2, to2, nf1, nf2;
236 bc7cb1a1 2003-11-23 devnull Biobuf berr;
238 bc7cb1a1 2003-11-23 devnull nf1 = 1;
239 bc7cb1a1 2003-11-23 devnull nf2 = 1;
240 bc7cb1a1 2003-11-23 devnull interactive = 1;
241 bc7cb1a1 2003-11-23 devnull defaultanswer = 0;
242 bc7cb1a1 2003-11-23 devnull Binit(&berr, 2, OWRITE);
243 bc7cb1a1 2003-11-23 devnull while(diffoffset = Boffset(bdiff), p = Brdline(bdiff, '\n')){
244 bc7cb1a1 2003-11-23 devnull p[Blinelen(bdiff)-1] = '\0';
245 bc7cb1a1 2003-11-23 devnull parse(p, &from1, &to1, &cmd, &from2, &to2);
246 bc7cb1a1 2003-11-23 devnull p[Blinelen(bdiff)-1] = '\n';
247 bc7cb1a1 2003-11-23 devnull n = to1-from1 + to2-from2 + 1; /* #lines from diff */
248 bc7cb1a1 2003-11-23 devnull if(cmd == 'c')
250 bc7cb1a1 2003-11-23 devnull else if(cmd == 'a')
251 bc7cb1a1 2003-11-23 devnull from1++;
252 bc7cb1a1 2003-11-23 devnull else if(cmd == 'd')
253 bc7cb1a1 2003-11-23 devnull from2++;
254 bc7cb1a1 2003-11-23 devnull to1++; /* make half-open intervals */
256 bc7cb1a1 2003-11-23 devnull if(interactive){
257 bc7cb1a1 2003-11-23 devnull p[Blinelen(bdiff)-1] = '\0';
258 bc7cb1a1 2003-11-23 devnull fprint(2, "%s\n", p);
259 bc7cb1a1 2003-11-23 devnull p[Blinelen(bdiff)-1] = '\n';
260 bc7cb1a1 2003-11-23 devnull copylines(bdiff, namediff, &berr, "<stderr>", n);
261 bc7cb1a1 2003-11-23 devnull Bflush(&berr);
263 bc7cb1a1 2003-11-23 devnull skiplines(bdiff, namediff, n);
265 bc7cb1a1 2003-11-23 devnull if(interactive){
266 bc7cb1a1 2003-11-23 devnull fprint(2, "? ");
267 bc7cb1a1 2003-11-23 devnull memset(buf, 0, sizeof buf);
268 bc7cb1a1 2003-11-23 devnull if(read(0, buf, sizeof buf - 1) < 0)
269 bc7cb1a1 2003-11-23 devnull sysfatal("read console: %r");
271 bc7cb1a1 2003-11-23 devnull buf[0] = defaultanswer;
273 bc7cb1a1 2003-11-23 devnull switch(buf[0]){
274 bc7cb1a1 2003-11-23 devnull case '>':
275 bc7cb1a1 2003-11-23 devnull copylines(b1, name1, bout, nameout, from1-nf1);
276 bc7cb1a1 2003-11-23 devnull skiplines(b1, name1, to1-from1);
277 bc7cb1a1 2003-11-23 devnull skiplines(b2, name2, from2-nf2);
278 bc7cb1a1 2003-11-23 devnull copylines(b2, name2, bout, nameout, to2-from2);
280 bc7cb1a1 2003-11-23 devnull case '<':
281 bc7cb1a1 2003-11-23 devnull copylines(b1, name1, bout, nameout, to1-nf1);
282 bc7cb1a1 2003-11-23 devnull skiplines(b2, name2, to2-nf2);
284 bc7cb1a1 2003-11-23 devnull case '=':
285 bc7cb1a1 2003-11-23 devnull copylines(b1, name1, bout, nameout, from1-nf1);
286 bc7cb1a1 2003-11-23 devnull skiplines(b1, name1, to1-from1);
287 bc7cb1a1 2003-11-23 devnull skiplines(b2, name2, to2-nf2);
288 bc7cb1a1 2003-11-23 devnull if(Bseek(bdiff, diffoffset, 0) != diffoffset)
289 bc7cb1a1 2003-11-23 devnull sysfatal("seek in diff output: %r");
290 bc7cb1a1 2003-11-23 devnull copylines(bdiff, namediff, bout, nameout, n+1);
292 bc7cb1a1 2003-11-23 devnull case '!':
293 bc7cb1a1 2003-11-23 devnull runcmd(buf+1);
295 bc7cb1a1 2003-11-23 devnull case 'q':
296 bc7cb1a1 2003-11-23 devnull if(buf[1]=='<' || buf[1]=='>' || buf[1]=='='){
297 bc7cb1a1 2003-11-23 devnull interactive = 0;
298 bc7cb1a1 2003-11-23 devnull defaultanswer = buf[1];
300 bc7cb1a1 2003-11-23 devnull fprint(2, "must be q<, q>, or q=\n");
302 bc7cb1a1 2003-11-23 devnull default:
303 bc7cb1a1 2003-11-23 devnull fprint(2, "expect: <, >, =, q<, q>, q=, !cmd\n");
306 bc7cb1a1 2003-11-23 devnull }while(buf[0] != '<' && buf[0] != '>' && buf[0] != '=');
307 bc7cb1a1 2003-11-23 devnull nf1 = to1;
308 bc7cb1a1 2003-11-23 devnull nf2 = to2;
310 bc7cb1a1 2003-11-23 devnull copy(b1, name1, bout, nameout);