1 bc7cb1a1 2003-11-23 devnull /*
  2 bc7cb1a1 2003-11-23 devnull  * interactive diff, inspired/stolen from
  3 bc7cb1a1 2003-11-23 devnull  * kernighan and pike, _unix programming environment_.
  4 bc7cb1a1 2003-11-23 devnull  */
  5 bc7cb1a1 2003-11-23 devnull 
  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>
  9 bc7cb1a1 2003-11-23 devnull 
 10 bc7cb1a1 2003-11-23 devnull int diffbflag;
 11 bc7cb1a1 2003-11-23 devnull int diffwflag;
 12 bc7cb1a1 2003-11-23 devnull 
 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 int opentemp(char*, int, long);
 16 bc7cb1a1 2003-11-23 devnull void rundiff(char*, char*, int);
 17 bc7cb1a1 2003-11-23 devnull 
 18 bc7cb1a1 2003-11-23 devnull void
 19 bc7cb1a1 2003-11-23 devnull usage(void)
 20 bc7cb1a1 2003-11-23 devnull {
 21 bc7cb1a1 2003-11-23 devnull 	fprint(2, "usage: idiff [-bw] file1 file2\n");
 22 bc7cb1a1 2003-11-23 devnull 	exits("usage");
 23 bc7cb1a1 2003-11-23 devnull }
 24 bc7cb1a1 2003-11-23 devnull 
 25 bc7cb1a1 2003-11-23 devnull void
 26 bc7cb1a1 2003-11-23 devnull main(int argc, char **argv)
 27 bc7cb1a1 2003-11-23 devnull {
 28 bc7cb1a1 2003-11-23 devnull 	int fd, ofd;
 29 bc7cb1a1 2003-11-23 devnull 	char diffout[40], idiffout[40];
 30 bc7cb1a1 2003-11-23 devnull 	Biobuf *b1, *b2, bdiff, bout, bstdout;
 31 bc7cb1a1 2003-11-23 devnull 	Dir *d;
 32 bc7cb1a1 2003-11-23 devnull 
 33 bc7cb1a1 2003-11-23 devnull 	ARGBEGIN{
 34 bc7cb1a1 2003-11-23 devnull 	default:
 35 bc7cb1a1 2003-11-23 devnull 		usage();
 36 bc7cb1a1 2003-11-23 devnull 	case 'b':
 37 bc7cb1a1 2003-11-23 devnull 		diffbflag++;
 38 bc7cb1a1 2003-11-23 devnull 		break;
 39 bc7cb1a1 2003-11-23 devnull 	case 'w':
 40 bc7cb1a1 2003-11-23 devnull 		diffwflag++;
 41 bc7cb1a1 2003-11-23 devnull 		break;
 42 bc7cb1a1 2003-11-23 devnull 	}ARGEND
 43 bc7cb1a1 2003-11-23 devnull 
 44 bc7cb1a1 2003-11-23 devnull 	if(argc != 2)
 45 bc7cb1a1 2003-11-23 devnull 		usage();
 46 bc7cb1a1 2003-11-23 devnull 
 47 bc7cb1a1 2003-11-23 devnull 	if((d = dirstat(argv[0])) == nil)
 48 bc7cb1a1 2003-11-23 devnull 		sysfatal("stat %s: %r", argv[0]);
 49 bc7cb1a1 2003-11-23 devnull 	if(d->mode&DMDIR)
 50 bc7cb1a1 2003-11-23 devnull 		sysfatal("%s is a directory", argv[0]);
 51 bc7cb1a1 2003-11-23 devnull 	free(d);
 52 bc7cb1a1 2003-11-23 devnull 	if((d = dirstat(argv[1])) == nil)
 53 bc7cb1a1 2003-11-23 devnull 		sysfatal("stat %s: %r", argv[1]);
 54 bc7cb1a1 2003-11-23 devnull 	if(d->mode&DMDIR)
 55 bc7cb1a1 2003-11-23 devnull 		sysfatal("%s is a directory", argv[1]);
 56 bc7cb1a1 2003-11-23 devnull 	free(d);
 57 bc7cb1a1 2003-11-23 devnull 
 58 bc7cb1a1 2003-11-23 devnull 	if((b1 = Bopen(argv[0], OREAD)) == nil)
 59 bc7cb1a1 2003-11-23 devnull 		sysfatal("open %s: %r", argv[0]);
 60 bc7cb1a1 2003-11-23 devnull 	if((b2 = Bopen(argv[1], OREAD)) == nil)
 61 bc7cb1a1 2003-11-23 devnull 		sysfatal("open %s: %r", argv[1]);
 62 bc7cb1a1 2003-11-23 devnull 
 63 bc7cb1a1 2003-11-23 devnull 	strcpy(diffout, "/tmp/idiff.XXXXXX");
 64 bc7cb1a1 2003-11-23 devnull 	fd = opentemp(diffout, ORDWR|ORCLOSE, 0);
 65 bc7cb1a1 2003-11-23 devnull 	strcpy(idiffout, "/tmp/idiff.XXXXXX");
 66 bc7cb1a1 2003-11-23 devnull 	ofd = opentemp(idiffout, ORDWR|ORCLOSE, 0);
 67 bc7cb1a1 2003-11-23 devnull 	rundiff(argv[0], argv[1], fd);
 68 bc7cb1a1 2003-11-23 devnull 	seek(fd, 0, 0);
 69 bc7cb1a1 2003-11-23 devnull 	Binit(&bdiff, fd, OREAD);
 70 bc7cb1a1 2003-11-23 devnull 	Binit(&bout, ofd, OWRITE);
 71 bc7cb1a1 2003-11-23 devnull 	idiff(b1, argv[0], b2, argv[1], &bdiff, diffout, &bout, idiffout);
 72 bc7cb1a1 2003-11-23 devnull 	Bterm(&bdiff);
 73 bc7cb1a1 2003-11-23 devnull 	Bflush(&bout);
 74 bc7cb1a1 2003-11-23 devnull 	seek(ofd, 0, 0);
 75 bc7cb1a1 2003-11-23 devnull 	Binit(&bout, ofd, OREAD);
 76 bc7cb1a1 2003-11-23 devnull 	Binit(&bstdout, 1, OWRITE);
 77 bc7cb1a1 2003-11-23 devnull 	copy(&bout, idiffout, &bstdout, "<stdout>");
 78 bc7cb1a1 2003-11-23 devnull 	exits(nil);
 79 bc7cb1a1 2003-11-23 devnull }
 80 bc7cb1a1 2003-11-23 devnull 
 81 bc7cb1a1 2003-11-23 devnull int
 82 bc7cb1a1 2003-11-23 devnull opentemp(char *template, int mode, long perm)
 83 bc7cb1a1 2003-11-23 devnull {
 84 d2c4ee9e 2003-11-24 devnull 	int fd;
 85 f7012583 2003-11-25 devnull 	Dir d;
 86 bc7cb1a1 2003-11-23 devnull 
 87 d2c4ee9e 2003-11-24 devnull 	fd = mkstemp(template);
 88 bc7cb1a1 2003-11-23 devnull 	if(fd < 0)
 89 bc7cb1a1 2003-11-23 devnull 		sysfatal("could not create temporary file");
 90 f7012583 2003-11-25 devnull 	nulldir(&d);
 91 f7012583 2003-11-25 devnull 	d.mode = perm;
 92 f7012583 2003-11-25 devnull 	dirfwstat(fd, &d);
 93 bc7cb1a1 2003-11-23 devnull 
 94 bc7cb1a1 2003-11-23 devnull 	return fd;
 95 bc7cb1a1 2003-11-23 devnull }
 96 bc7cb1a1 2003-11-23 devnull 
 97 bc7cb1a1 2003-11-23 devnull void
 98 bc7cb1a1 2003-11-23 devnull rundiff(char *arg1, char *arg2, int outfd)
 99 bc7cb1a1 2003-11-23 devnull {
100 bc7cb1a1 2003-11-23 devnull 	char *arg[10], *p;
101 bc7cb1a1 2003-11-23 devnull 	int narg, pid;
102 bc7cb1a1 2003-11-23 devnull 	Waitmsg *w;
103 bc7cb1a1 2003-11-23 devnull 
104 bc7cb1a1 2003-11-23 devnull 	narg = 0;
105 bc7cb1a1 2003-11-23 devnull 	arg[narg++] = "/bin/diff";
106 bc7cb1a1 2003-11-23 devnull 	arg[narg++] = "-n";
107 bc7cb1a1 2003-11-23 devnull 	if(diffbflag)
108 bc7cb1a1 2003-11-23 devnull 		arg[narg++] = "-b";
109 bc7cb1a1 2003-11-23 devnull 	if(diffwflag)
110 bc7cb1a1 2003-11-23 devnull 		arg[narg++] = "-w";
111 bc7cb1a1 2003-11-23 devnull 	arg[narg++] = arg1;
112 bc7cb1a1 2003-11-23 devnull 	arg[narg++] = arg2;
113 bc7cb1a1 2003-11-23 devnull 	arg[narg] = nil;
114 bc7cb1a1 2003-11-23 devnull 
115 bc7cb1a1 2003-11-23 devnull 	switch(pid = fork()){
116 bc7cb1a1 2003-11-23 devnull 	case -1:
117 bc7cb1a1 2003-11-23 devnull 		sysfatal("fork: %r");
118 bc7cb1a1 2003-11-23 devnull 
119 bc7cb1a1 2003-11-23 devnull 	case 0:
120 bc7cb1a1 2003-11-23 devnull 		dup(outfd, 1);
121 bc7cb1a1 2003-11-23 devnull 		close(0);
122 bc7cb1a1 2003-11-23 devnull 		exec("/bin/diff", arg);
123 bc7cb1a1 2003-11-23 devnull 		sysfatal("exec: %r");
124 bc7cb1a1 2003-11-23 devnull 
125 bc7cb1a1 2003-11-23 devnull 	default:
126 bc7cb1a1 2003-11-23 devnull 		w = wait();
127 bc7cb1a1 2003-11-23 devnull 		if(w==nil)
128 bc7cb1a1 2003-11-23 devnull 			sysfatal("wait: %r");
129 bc7cb1a1 2003-11-23 devnull 		if(w->pid != pid)
130 bc7cb1a1 2003-11-23 devnull 			sysfatal("wait got unexpected pid %d", w->pid);
131 bc7cb1a1 2003-11-23 devnull 		if((p = strchr(w->msg, ':')) && strcmp(p, ": some") != 0)
132 bc7cb1a1 2003-11-23 devnull 			sysfatal("%s", w->msg);
133 bc7cb1a1 2003-11-23 devnull 		free(w);
134 bc7cb1a1 2003-11-23 devnull 	}
135 bc7cb1a1 2003-11-23 devnull }
136 bc7cb1a1 2003-11-23 devnull 
137 bc7cb1a1 2003-11-23 devnull void
138 bc7cb1a1 2003-11-23 devnull runcmd(char *cmd)
139 bc7cb1a1 2003-11-23 devnull {
140 bc7cb1a1 2003-11-23 devnull 	char *arg[10];
141 bc7cb1a1 2003-11-23 devnull 	int narg, pid, wpid;
142 bc7cb1a1 2003-11-23 devnull 
143 bc7cb1a1 2003-11-23 devnull 	narg = 0;
144 bc7cb1a1 2003-11-23 devnull 	arg[narg++] = "/bin/rc";
145 bc7cb1a1 2003-11-23 devnull 	arg[narg++] = "-c";
146 bc7cb1a1 2003-11-23 devnull 	arg[narg++] = cmd;
147 bc7cb1a1 2003-11-23 devnull 	arg[narg] = nil;
148 bc7cb1a1 2003-11-23 devnull 
149 bc7cb1a1 2003-11-23 devnull 	switch(pid = fork()){
150 bc7cb1a1 2003-11-23 devnull 	case -1:
151 bc7cb1a1 2003-11-23 devnull 		sysfatal("fork: %r");
152 bc7cb1a1 2003-11-23 devnull 
153 bc7cb1a1 2003-11-23 devnull 	case 0:
154 bc7cb1a1 2003-11-23 devnull 		exec("/bin/rc", arg);
155 bc7cb1a1 2003-11-23 devnull 		sysfatal("exec: %r");
156 bc7cb1a1 2003-11-23 devnull 
157 bc7cb1a1 2003-11-23 devnull 	default:
158 bc7cb1a1 2003-11-23 devnull 		wpid = waitpid();
159 bc7cb1a1 2003-11-23 devnull 		if(wpid < 0)
160 bc7cb1a1 2003-11-23 devnull 			sysfatal("wait: %r");
161 bc7cb1a1 2003-11-23 devnull 		if(wpid != pid)
162 bc7cb1a1 2003-11-23 devnull 			sysfatal("wait got unexpected pid %d", wpid);
163 bc7cb1a1 2003-11-23 devnull 	}
164 bc7cb1a1 2003-11-23 devnull }
165 bc7cb1a1 2003-11-23 devnull 
166 bc7cb1a1 2003-11-23 devnull void
167 bc7cb1a1 2003-11-23 devnull parse(char *s, int *pfrom1, int *pto1, int *pcmd, int *pfrom2, int *pto2)
168 bc7cb1a1 2003-11-23 devnull {
169 bc7cb1a1 2003-11-23 devnull 	*pfrom1 = *pto1 = *pfrom2 = *pto2 = 0;
170 bc7cb1a1 2003-11-23 devnull 
171 bc7cb1a1 2003-11-23 devnull 	s = strchr(s, ':');
172 bc7cb1a1 2003-11-23 devnull 	if(s == nil)
173 bc7cb1a1 2003-11-23 devnull 		sysfatal("bad diff output0");
174 bc7cb1a1 2003-11-23 devnull 	s++;
175 bc7cb1a1 2003-11-23 devnull 	*pfrom1 = strtol(s, &s, 10);
176 bc7cb1a1 2003-11-23 devnull 	if(*s == ','){
177 bc7cb1a1 2003-11-23 devnull 		s++;
178 bc7cb1a1 2003-11-23 devnull 		*pto1 = strtol(s, &s, 10);
179 bc7cb1a1 2003-11-23 devnull 	}else
180 bc7cb1a1 2003-11-23 devnull 		*pto1 = *pfrom1;
181 bc7cb1a1 2003-11-23 devnull 	if(*s++ != ' ')
182 bc7cb1a1 2003-11-23 devnull 		sysfatal("bad diff output1");
183 bc7cb1a1 2003-11-23 devnull 	*pcmd = *s++;
184 bc7cb1a1 2003-11-23 devnull 	if(*s++ != ' ')
185 bc7cb1a1 2003-11-23 devnull 		sysfatal("bad diff output2");
186 bc7cb1a1 2003-11-23 devnull 	s = strchr(s, ':');
187 bc7cb1a1 2003-11-23 devnull 	if(s == nil)
188 bc7cb1a1 2003-11-23 devnull 		sysfatal("bad diff output3");
189 bc7cb1a1 2003-11-23 devnull 	s++;
190 bc7cb1a1 2003-11-23 devnull 	*pfrom2 = strtol(s, &s, 10);
191 bc7cb1a1 2003-11-23 devnull 	if(*s == ','){
192 bc7cb1a1 2003-11-23 devnull 		s++;
193 bc7cb1a1 2003-11-23 devnull 		*pto2 = strtol(s, &s, 10);
194 bc7cb1a1 2003-11-23 devnull 	}else
195 bc7cb1a1 2003-11-23 devnull 		*pto2 = *pfrom2;
196 bc7cb1a1 2003-11-23 devnull }
197 bc7cb1a1 2003-11-23 devnull 
198 bc7cb1a1 2003-11-23 devnull void
199 bc7cb1a1 2003-11-23 devnull skiplines(Biobuf *b, char *name, int n)
200 bc7cb1a1 2003-11-23 devnull {
201 bc7cb1a1 2003-11-23 devnull 	int i;
202 bc7cb1a1 2003-11-23 devnull 
203 bc7cb1a1 2003-11-23 devnull 	for(i=0; i<n; i++){
204 bc7cb1a1 2003-11-23 devnull 		while(Brdline(b, '\n')==nil){
205 bc7cb1a1 2003-11-23 devnull 			if(Blinelen(b) <= 0)
206 bc7cb1a1 2003-11-23 devnull 				sysfatal("early end of file on %s", name);
207 bc7cb1a1 2003-11-23 devnull 			Bseek(b, Blinelen(b), 1);
208 bc7cb1a1 2003-11-23 devnull 		}
209 bc7cb1a1 2003-11-23 devnull 	}
210 bc7cb1a1 2003-11-23 devnull }
211 bc7cb1a1 2003-11-23 devnull 
212 bc7cb1a1 2003-11-23 devnull void
213 bc7cb1a1 2003-11-23 devnull copylines(Biobuf *bin, char *nin, Biobuf *bout, char *nout, int n)
214 bc7cb1a1 2003-11-23 devnull {
215 bc7cb1a1 2003-11-23 devnull 	char buf[4096], *p;
216 bc7cb1a1 2003-11-23 devnull 	int i, m;
217 bc7cb1a1 2003-11-23 devnull 
218 bc7cb1a1 2003-11-23 devnull 	for(i=0; i<n; i++){
219 bc7cb1a1 2003-11-23 devnull 		while((p=Brdline(bin, '\n'))==nil){
220 bc7cb1a1 2003-11-23 devnull 			if(Blinelen(bin) <= 0)
221 bc7cb1a1 2003-11-23 devnull 				sysfatal("early end of file on %s", nin);
222 bc7cb1a1 2003-11-23 devnull 			m = Blinelen(bin);
223 bc7cb1a1 2003-11-23 devnull 			if(m > sizeof buf)
224 bc7cb1a1 2003-11-23 devnull 				m = sizeof buf;
225 bc7cb1a1 2003-11-23 devnull 			m = Bread(bin, buf, m);
226 bc7cb1a1 2003-11-23 devnull 			if(Bwrite(bout, buf, m) != m)
227 bc7cb1a1 2003-11-23 devnull 				sysfatal("error writing %s: %r", nout);
228 bc7cb1a1 2003-11-23 devnull 		}
229 bc7cb1a1 2003-11-23 devnull 		if(Bwrite(bout, p, Blinelen(bin)) != Blinelen(bin))
230 bc7cb1a1 2003-11-23 devnull 			sysfatal("error writing %s: %r", nout);
231 bc7cb1a1 2003-11-23 devnull 	}
232 bc7cb1a1 2003-11-23 devnull }
233 bc7cb1a1 2003-11-23 devnull 
234 bc7cb1a1 2003-11-23 devnull void
235 bc7cb1a1 2003-11-23 devnull copy(Biobuf *bin, char *nin, Biobuf *bout, char *nout)
236 bc7cb1a1 2003-11-23 devnull {
237 bc7cb1a1 2003-11-23 devnull 	char buf[4096];
238 bc7cb1a1 2003-11-23 devnull 	int m;
239 bc7cb1a1 2003-11-23 devnull 
240 bc7cb1a1 2003-11-23 devnull 	USED(nin);
241 bc7cb1a1 2003-11-23 devnull 	while((m = Bread(bin, buf, sizeof buf)) > 0)
242 bc7cb1a1 2003-11-23 devnull 		if(Bwrite(bout, buf, m) != m)
243 bc7cb1a1 2003-11-23 devnull 			sysfatal("error writing %s: %r", nout);
244 bc7cb1a1 2003-11-23 devnull }
245 bc7cb1a1 2003-11-23 devnull 
246 bc7cb1a1 2003-11-23 devnull void
247 bc7cb1a1 2003-11-23 devnull idiff(Biobuf *b1, char *name1, Biobuf *b2, char *name2, Biobuf *bdiff, char *namediff, Biobuf *bout, char *nameout)
248 bc7cb1a1 2003-11-23 devnull {
249 bc7cb1a1 2003-11-23 devnull 	char buf[256], *p;
250 bc7cb1a1 2003-11-23 devnull 	int interactive, defaultanswer, cmd, diffoffset;
251 bc7cb1a1 2003-11-23 devnull 	int n, from1, to1, from2, to2, nf1, nf2;
252 bc7cb1a1 2003-11-23 devnull 	Biobuf berr;
253 bc7cb1a1 2003-11-23 devnull 
254 bc7cb1a1 2003-11-23 devnull 	nf1 = 1;
255 bc7cb1a1 2003-11-23 devnull 	nf2 = 1;
256 bc7cb1a1 2003-11-23 devnull 	interactive = 1;
257 bc7cb1a1 2003-11-23 devnull 	defaultanswer = 0;
258 bc7cb1a1 2003-11-23 devnull 	Binit(&berr, 2, OWRITE);
259 bc7cb1a1 2003-11-23 devnull 	while(diffoffset = Boffset(bdiff), p = Brdline(bdiff, '\n')){
260 bc7cb1a1 2003-11-23 devnull 		p[Blinelen(bdiff)-1] = '\0';
261 bc7cb1a1 2003-11-23 devnull 		parse(p, &from1, &to1, &cmd, &from2, &to2);
262 bc7cb1a1 2003-11-23 devnull 		p[Blinelen(bdiff)-1] = '\n';
263 bc7cb1a1 2003-11-23 devnull 		n = to1-from1 + to2-from2 + 1;	/* #lines from diff */
264 bc7cb1a1 2003-11-23 devnull 		if(cmd == 'c')
265 bc7cb1a1 2003-11-23 devnull 			n += 2;
266 bc7cb1a1 2003-11-23 devnull 		else if(cmd == 'a')
267 bc7cb1a1 2003-11-23 devnull 			from1++;
268 bc7cb1a1 2003-11-23 devnull 		else if(cmd == 'd')
269 bc7cb1a1 2003-11-23 devnull 			from2++;
270 bc7cb1a1 2003-11-23 devnull 		to1++;	/* make half-open intervals */
271 bc7cb1a1 2003-11-23 devnull 		to2++;
272 bc7cb1a1 2003-11-23 devnull 		if(interactive){
273 bc7cb1a1 2003-11-23 devnull 			p[Blinelen(bdiff)-1] = '\0';
274 bc7cb1a1 2003-11-23 devnull 			fprint(2, "%s\n", p);
275 bc7cb1a1 2003-11-23 devnull 			p[Blinelen(bdiff)-1] = '\n';
276 bc7cb1a1 2003-11-23 devnull 			copylines(bdiff, namediff, &berr, "<stderr>", n);
277 bc7cb1a1 2003-11-23 devnull 			Bflush(&berr);
278 bc7cb1a1 2003-11-23 devnull 		}else
279 bc7cb1a1 2003-11-23 devnull 			skiplines(bdiff, namediff, n);
280 bc7cb1a1 2003-11-23 devnull 		do{
281 bc7cb1a1 2003-11-23 devnull 			if(interactive){
282 bc7cb1a1 2003-11-23 devnull 				fprint(2, "? ");
283 bc7cb1a1 2003-11-23 devnull 				memset(buf, 0, sizeof buf);
284 bc7cb1a1 2003-11-23 devnull 				if(read(0, buf, sizeof buf - 1) < 0)
285 bc7cb1a1 2003-11-23 devnull 					sysfatal("read console: %r");
286 bc7cb1a1 2003-11-23 devnull 			}else
287 bc7cb1a1 2003-11-23 devnull 				buf[0] = defaultanswer;
288 bc7cb1a1 2003-11-23 devnull 
289 bc7cb1a1 2003-11-23 devnull 			switch(buf[0]){
290 bc7cb1a1 2003-11-23 devnull 			case '>':
291 bc7cb1a1 2003-11-23 devnull 				copylines(b1, name1, bout, nameout, from1-nf1);
292 bc7cb1a1 2003-11-23 devnull 				skiplines(b1, name1, to1-from1);
293 bc7cb1a1 2003-11-23 devnull 				skiplines(b2, name2, from2-nf2);
294 bc7cb1a1 2003-11-23 devnull 				copylines(b2, name2, bout, nameout, to2-from2);
295 bc7cb1a1 2003-11-23 devnull 				break;
296 bc7cb1a1 2003-11-23 devnull 			case '<':
297 bc7cb1a1 2003-11-23 devnull 				copylines(b1, name1, bout, nameout, to1-nf1);
298 bc7cb1a1 2003-11-23 devnull 				skiplines(b2, name2, to2-nf2);
299 bc7cb1a1 2003-11-23 devnull 				break;
300 bc7cb1a1 2003-11-23 devnull 			case '=':
301 bc7cb1a1 2003-11-23 devnull 				copylines(b1, name1, bout, nameout, from1-nf1);
302 bc7cb1a1 2003-11-23 devnull 				skiplines(b1, name1, to1-from1);
303 bc7cb1a1 2003-11-23 devnull 				skiplines(b2, name2, to2-nf2);
304 bc7cb1a1 2003-11-23 devnull 				if(Bseek(bdiff, diffoffset, 0) != diffoffset)
305 bc7cb1a1 2003-11-23 devnull 					sysfatal("seek in diff output: %r");
306 bc7cb1a1 2003-11-23 devnull 				copylines(bdiff, namediff, bout, nameout, n+1);
307 bc7cb1a1 2003-11-23 devnull 				break;
308 bc7cb1a1 2003-11-23 devnull 			case '!':
309 bc7cb1a1 2003-11-23 devnull 				runcmd(buf+1);
310 bc7cb1a1 2003-11-23 devnull 				break;
311 bc7cb1a1 2003-11-23 devnull 			case 'q':
312 bc7cb1a1 2003-11-23 devnull 				if(buf[1]=='<' || buf[1]=='>' || buf[1]=='='){
313 bc7cb1a1 2003-11-23 devnull 					interactive = 0;
314 bc7cb1a1 2003-11-23 devnull 					defaultanswer = buf[1];
315 bc7cb1a1 2003-11-23 devnull 				}else
316 bc7cb1a1 2003-11-23 devnull 					fprint(2, "must be q<, q>, or q=\n");
317 bc7cb1a1 2003-11-23 devnull 				break;
318 bc7cb1a1 2003-11-23 devnull 			default:
319 bc7cb1a1 2003-11-23 devnull 				fprint(2, "expect: <, >, =, q<, q>, q=, !cmd\n");
320 bc7cb1a1 2003-11-23 devnull 				break;
321 bc7cb1a1 2003-11-23 devnull 			}
322 bc7cb1a1 2003-11-23 devnull 		}while(buf[0] != '<' && buf[0] != '>' && buf[0] != '=');
323 bc7cb1a1 2003-11-23 devnull 		nf1 = to1;
324 bc7cb1a1 2003-11-23 devnull 		nf2 = to2;
325 bc7cb1a1 2003-11-23 devnull 	}
326 bc7cb1a1 2003-11-23 devnull 	copy(b1, name1, bout, nameout);
327 bc7cb1a1 2003-11-23 devnull }