Plan 9 from Bell Labs Fourth Edition 2005-01-29

David du Colombier committed 21 years ago

Commit 27e10911 parent 1b13ae89 files · +62 −26Browse files

Unified · Split

9 files

dist/replica/_plan9.db +9 −6
dist/replica/plan9.db +9 −9
dist/replica/plan9.log +10 −0
sys/lib/kbmap/bg +0 −0
sys/man/1/diff +4 −1
sys/src/cmd/diff/diffio.c +22 −6
sys/src/cmd/diff/main.c +1 −0
sys/src/cmd/disk/kfs/main.c +3 −0
sys/src/cmd/ip/tftpd.c +4 −4

@@ -3903,7 +3903,7 @@ sys/lib/httpd.rewrite - 664 sys sys 954262980 825 · 3902 unmodified lines
3903	3903	sys/lib/kbmap - 20000000775 sys sys 1079535430 0
3904	3904	sys/lib/kbmap/ascii - 664 sys sys 1082221421 6248
3905	3905	sys/lib/kbmap/azerty - 644 sys sys 1079473812 735
3906		−sys/lib/kbmap/bgmap - 664 sys sys 1079475826 561
	3906	+sys/lib/kbmap/bg - 664 sys sys 1106924292 561
3907	3907	sys/lib/kbmap/de - 664 sys sys 1100894012 6265
3908	3908	sys/lib/kbmap/ee - 644 sys sys 1080222237 429
3909	3909	sys/lib/kbmap/es - 664 sys sys 1079535430 1360
@@ -4687,7 +4687,7 @@ sys/man/1/db - 664 sys sys 1015024738 17862 · 777 unmodified lines
4687	4687	sys/man/1/dc - 664 sys sys 944959674 4834
4688	4688	sys/man/1/dd - 664 sys sys 1055693436 3346
4689	4689	sys/man/1/deroff - 664 sys sys 1017423524 1826
4690		−sys/man/1/diff - 664 sys sys 1106723601 2907
	4690	+sys/man/1/diff - 664 sys sys 1106938097 2960
4691	4691	sys/man/1/doc2txt - 664 sys sys 1105020018 2077
4692	4692	sys/man/1/doctype - 664 sys sys 944959673 849
4693	4693	sys/man/1/du - 664 sys sys 1017166323 1410
@@ -7364,9 +7364,9 @@ sys/src/cmd/dict/world.c - 664 sys sys 944960882 4264 · 2670 unmodified lines
7364	7364	sys/src/cmd/diff - 20000000775 sys sys 944960882 0
7365	7365	sys/src/cmd/diff/diff.h - 664 sys sys 1106723609 794
7366	7366	sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
7367		−sys/src/cmd/diff/diffio.c - 664 sys sys 1106723609 6378
	7367	+sys/src/cmd/diff/diffio.c - 664 sys sys 1106938096 6599
7368	7368	sys/src/cmd/diff/diffreg.c - 664 sys sys 1106723609 8842
7369		−sys/src/cmd/diff/main.c - 664 sys sys 1106151067 4325
	7369	+sys/src/cmd/diff/main.c - 664 sys sys 1106938096 4338
7370	7370	sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
7371	7371	sys/src/cmd/disk - 20000000775 sys sys 1018468546 0
7372	7372	sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 0
@@ -7411,7 +7411,7 @@ sys/src/cmd/disk/kfs/errno.h - 664 sys sys 1015009189 1317 · 38 unmodified lines
7411	7411	sys/src/cmd/disk/kfs/fns.h - 664 sys sys 1019058719 1010
7412	7412	sys/src/cmd/disk/kfs/ialloc.c - 664 sys sys 944960883 103
7413	7413	sys/src/cmd/disk/kfs/iobuf.c - 664 sys sys 1015009189 3769
7414		−sys/src/cmd/disk/kfs/main.c - 664 sys sys 1022112155 9420
	7414	+sys/src/cmd/disk/kfs/main.c - 664 sys sys 1106924274 9515
7415	7415	sys/src/cmd/disk/kfs/misc.c - 664 sys sys 1015009189 1182
7416	7416	sys/src/cmd/disk/kfs/mkfile - 664 sys sys 1065916865 717
7417	7417	sys/src/cmd/disk/kfs/ofcallfmt.c - 664 sys sys 1015009189 4674
@@ -9547,7 +9547,7 @@ sys/src/cmd/ip/snoopy/udp.c - 664 sys sys 1089299190 1990 · 2129 unmodified lines
9547	9547	sys/src/cmd/ip/telnet.c - 664 sys sys 1080058033 8535
9548	9548	sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
9549	9549	sys/src/cmd/ip/telnetd.c - 664 sys sys 1032060109 11731
9550		−sys/src/cmd/ip/tftpd.c - 664 sys sys 1106624712 7642
	9550	+sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
9551	9551	sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
9552	9552	sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
9553	9553	sys/src/cmd/join.c - 664 sys sys 944961364 7488
@@ -12456,3 +12456,6 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890 · 2902 unmodified lines
12456	12456	usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
12457	12457	usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
12458	12458	usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
	12459	+386/bin/diff - 775 sys sys 1106971478 85101
	12460	+386/bin/disk/kfs - 775 sys sys 1106971479 248849
	12461	+386/bin/ip/tftpd - 775 sys sys 1106971479 129489

dist/replica/plan9.db+9−9

@@ -195,13 +195,13 @@ · 194 unmodified lines
195	195	386/bin/dial/expect - 775 sys sys 1104122000 60081
196	196	386/bin/dial/pass - 775 sys sys 1104122001 38814
197	197	386/bin/dict - 775 sys sys 1104122001 187459
198		−386/bin/diff - 775 sys sys 1106799173 84923
	198	+386/bin/diff - 775 sys sys 1106971478 85101
199	199	386/bin/disk - 20000000775 sys sys 984788664 0
200	200	386/bin/disk/dump9660 - 775 sys sys 1104122002 152246
201	201	386/bin/disk/exsort - 775 sys sys 1104122002 60210
202	202	386/bin/disk/fdisk - 775 sys sys 1104122003 103794
203	203	386/bin/disk/format - 775 sys sys 1104122003 89534
204		−386/bin/disk/kfs - 775 sys sys 1106107677 248770
	204	+386/bin/disk/kfs - 775 sys sys 1106971479 248849
205	205	386/bin/disk/kfscmd - 775 sys sys 1104122004 38222
206	206	386/bin/disk/ksync - 775 sys sys 1020319074 302
207	207	386/bin/disk/mbr - 775 sys sys 1104122004 73689
@@ -297,7 +297,7 @@ · 89 unmodified lines
297	297	386/bin/ip/rip - 775 sys sys 1104122029 91232
298	298	386/bin/ip/rlogind - 775 sys sys 1104122029 67402
299	299	386/bin/ip/telnetd - 775 sys sys 1104122030 121992
300		−386/bin/ip/tftpd - 775 sys sys 1106799176 129444
	300	+386/bin/ip/tftpd - 775 sys sys 1106971479 129489
301	301	386/bin/ip/traceroute - 775 sys sys 1104122030 73497
302	302	386/bin/ip/udpecho - 775 sys sys 1104122030 43159
303	303	386/bin/join - 775 sys sys 1104122031 116241
@@ -3903,7 +3903,7 @@ sys/lib/httpd.rewrite - 664 sys sys 954262980 825 · 3599 unmodified lines
3903	3903	sys/lib/kbmap - 20000000775 sys sys 1079535430 0
3904	3904	sys/lib/kbmap/ascii - 664 sys sys 1082221421 6248
3905	3905	sys/lib/kbmap/azerty - 644 sys sys 1079473812 735
3906		−sys/lib/kbmap/bgmap - 664 sys sys 1079475826 561
	3906	+sys/lib/kbmap/bg - 664 sys sys 1106924292 561
3907	3907	sys/lib/kbmap/de - 664 sys sys 1100894012 6265
3908	3908	sys/lib/kbmap/ee - 644 sys sys 1080222237 429
3909	3909	sys/lib/kbmap/es - 664 sys sys 1079535430 1360
@@ -4687,7 +4687,7 @@ sys/man/1/db - 664 sys sys 1015024738 17862 · 777 unmodified lines
4687	4687	sys/man/1/dc - 664 sys sys 944959674 4834
4688	4688	sys/man/1/dd - 664 sys sys 1055693436 3346
4689	4689	sys/man/1/deroff - 664 sys sys 1017423524 1826
4690		−sys/man/1/diff - 664 sys sys 1106723601 2907
	4690	+sys/man/1/diff - 664 sys sys 1106938097 2960
4691	4691	sys/man/1/doc2txt - 664 sys sys 1105020018 2077
4692	4692	sys/man/1/doctype - 664 sys sys 944959673 849
4693	4693	sys/man/1/du - 664 sys sys 1017166323 1410
@@ -7364,9 +7364,9 @@ sys/src/cmd/dict/world.c - 664 sys sys 944960882 4264 · 2670 unmodified lines
7364	7364	sys/src/cmd/diff - 20000000775 sys sys 944960882 0
7365	7365	sys/src/cmd/diff/diff.h - 664 sys sys 1106723609 794
7366	7366	sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
7367		−sys/src/cmd/diff/diffio.c - 664 sys sys 1106723609 6378
	7367	+sys/src/cmd/diff/diffio.c - 664 sys sys 1106938096 6599
7368	7368	sys/src/cmd/diff/diffreg.c - 664 sys sys 1106723609 8842
7369		−sys/src/cmd/diff/main.c - 664 sys sys 1106151067 4325
	7369	+sys/src/cmd/diff/main.c - 664 sys sys 1106938096 4338
7370	7370	sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
7371	7371	sys/src/cmd/disk - 20000000775 sys sys 1018468546 0
7372	7372	sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 0
@@ -7411,7 +7411,7 @@ sys/src/cmd/disk/kfs/errno.h - 664 sys sys 1015009189 1317 · 38 unmodified lines
7411	7411	sys/src/cmd/disk/kfs/fns.h - 664 sys sys 1019058719 1010
7412	7412	sys/src/cmd/disk/kfs/ialloc.c - 664 sys sys 944960883 103
7413	7413	sys/src/cmd/disk/kfs/iobuf.c - 664 sys sys 1015009189 3769
7414		−sys/src/cmd/disk/kfs/main.c - 664 sys sys 1022112155 9420
	7414	+sys/src/cmd/disk/kfs/main.c - 664 sys sys 1106924274 9515
7415	7415	sys/src/cmd/disk/kfs/misc.c - 664 sys sys 1015009189 1182
7416	7416	sys/src/cmd/disk/kfs/mkfile - 664 sys sys 1065916865 717
7417	7417	sys/src/cmd/disk/kfs/ofcallfmt.c - 664 sys sys 1015009189 4674
@@ -9547,7 +9547,7 @@ sys/src/cmd/ip/snoopy/udp.c - 664 sys sys 1089299190 1990 · 2129 unmodified lines
9547	9547	sys/src/cmd/ip/telnet.c - 664 sys sys 1080058033 8535
9548	9548	sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
9549	9549	sys/src/cmd/ip/telnetd.c - 664 sys sys 1032060109 11731
9550		−sys/src/cmd/ip/tftpd.c - 664 sys sys 1106624712 7642
	9550	+sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
9551	9551	sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
9552	9552	sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
9553	9553	sys/src/cmd/join.c - 664 sys sys 944961364 7488

dist/replica/plan9.log+10−0

@@ -13334,3 +13334,13 @@ · 13333 unmodified lines
13334	13334	1106800218 26 c 386/bin/vt - 775 sys sys 1106799182 172859
13335	13335	1106800218 27 c 386/lib/ape/libdraw.a - 664 sys sys 1106799183 573884
13336	13336	1106800218 28 c 386/lib/libdraw.a - 664 sys sys 1106799185 373548
	13337	+1106924442 0 a sys/lib/kbmap/bg - 664 sys sys 1106924292 561
	13338	+1106924442 1 c sys/src/cmd/disk/kfs/main.c - 664 sys sys 1106924274 9515
	13339	+1106924442 2 d sys/lib/kbmap/bgmap - 664 sys sys 1079475826 0
	13340	+1106938845 0 c sys/man/1/diff - 664 sys sys 1106938097 2960
	13341	+1106938845 1 c sys/src/cmd/diff/diffio.c - 664 sys sys 1106938096 6599
	13342	+1106938845 2 c sys/src/cmd/diff/main.c - 664 sys sys 1106938096 4338
	13343	+1106944246 0 c sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
	13344	+1106973052 0 c 386/bin/diff - 775 sys sys 1106971478 85101
	13345	+1106973052 1 c 386/bin/disk/kfs - 775 sys sys 1106971479 248849
	13346	+1106973052 2 c 386/bin/ip/tftpd - 775 sys sys 1106971479 129489

sys/lib/kbmap/bgrenamed from sys/lib/kbmap/bgmap+0−0

File renamed without changes.

sys/man/1/diff+4−1

@@ -4,7 +4,7 @@ diff \- differential file comparator · 3 unmodified lines
4	4	.SH SYNOPSIS
5	5	.B diff
6	6	[
7		−.B -cefmnbwr
	7	+.B -acefmnbwr
8	8	] file1 ... file2
9	9	.SH DESCRIPTION
10	10	.I Diff
@@ -127,6 +127,9 @@ The · 116 unmodified lines
127	127	.B -c
128	128	option includes three lines of context around each
129	129	change, merging changes whose contexts overlap.
	130	+The
	131	+.B -a
	132	+flag displays the entire file as context.
130	133	.PP
131	134	Except in rare circumstances,
132	135	.I diff

sys/src/cmd/diff/diffio.c+22−6

@@ -302,6 +302,7 @@ change(int a, int b, int c, int d) · 301 unmodified lines
302	302	range(a, b, " ");
303	303	break;
304	304	case 'c':
	305	+ case 'a':
305	306	if(nchanges%1024 == 0)
306	307	changes = erealloc(changes, (nchanges+1024)*sizeof(changes[0]));
307	308	ch = &changes[nchanges++];
@@ -348,24 +349,39 @@ flushchanges(void) · 40 unmodified lines
348	349
349	350	for(i=0; i<nchanges; ){
350	351	j = changeset(i);
351		− a = changes[i].a;
352		− b = changes[j-1].b;
353		− c = changes[i].c;
354		− d = changes[j-1].d;
	352	+ a = changes[i].a-Lines;
	353	+ b = changes[j-1].b+Lines;
	354	+ c = changes[i].c-Lines;
	355	+ d = changes[j-1].d+Lines;
	356	+ if(a < 1)
	357	+ a = 1;
	358	+ if(c < 1)
	359	+ c = 1;
	360	+ if(b > len[0])
	361	+ b = len[0];
	362	+ if(d > len[1])
	363	+ d = len[1];
	364	+ if(mode == 'a'){
	365	+ a = 1;
	366	+ b = len[0];
	367	+ c = 1;
	368	+ d = len[1];
	369	+ j = nchanges;
	370	+ }
355	371	Bprint(&stdout, "%s:", file1);
356	372	range(a, b, ",");
357	373	Bprint(&stdout, " - ");
358	374	Bprint(&stdout, "%s:", file2);
359	375	range(c, d, ",");
360	376	Bputc(&stdout, '\n');
361		− at = a-Lines;
	377	+ at = a;
362	378	for(; i<j; i++){
363	379	fetch(ixold, at, changes[i].a-1, input[0], " ");
364	380	fetch(ixold, changes[i].a, changes[i].b, input[0], "< ");
365	381	fetch(ixnew, changes[i].c, changes[i].d, input[1], "> ");
366	382	at = changes[i].b+1;
367	383	}
368		− fetch(ixold, at, b+Lines, input[0], " ");
	384	+ fetch(ixold, at, b, input[0], " ");
369	385	}
370	386	nchanges = 0;
371	387	}

sys/src/cmd/diff/main.c+1−0

@@ -191,6 +191,7 @@ main(int argc, char *argv[]) · 190 unmodified lines
191	191	case 'f':
192	192	case 'n':
193	193	case 'c':
	194	+ case 'a':
194	195	mode = *p;
195	196	break;
196	197

sys/src/cmd/disk/kfs/main.c+3−0

@@ -97,6 +97,9 @@ main(int argc, char *argv[]) · 96 unmodified lines
97	97
98	98	cmdfd = 2;
99	99
	100	+ if (access(wrenfile, AREAD\|AWRITE) == -1)
	101	+ sysfatal("%s cannot access device\n", wrenfile);
	102	+
100	103	formatinit();
101	104	sublockinit();
102	105

sys/src/cmd/ip/tftpd.c+4−4

@@ -107,7 +107,7 @@ main(int argc, char **argv) · 106 unmodified lines
107	107	if (cfd < 0)
108	108	sysfatal("announcing on %s: %r", buf);
109	109	syslog(dbg, flog, "tftpd started on %s dir %s", buf, adir);
110		−// setuser(); Moved to doserve [sape]
	110	+ setuser();
111	111	for(;;) {
112	112	lcfd = listen(adir, ldir);
113	113	if(lcfd < 0)
@@ -140,7 +140,6 @@ doserve(int fd) · 26 unmodified lines
140	140	char mode, p;
141	141	short op;
142	142
143		− setuser();
144	143	dlen = read(fd, bigbuf, sizeof(bigbuf));
145	144	if(dlen < 0)
146	145	sysfatal("listen read: %r");
@@ -411,11 +410,12 @@ sunkernel(char *name) · 264 unmodified lines
411	410	uchar v6[IPaddrlen];
412	411	char buf[256];
413	412	char ipbuf[128];
	413	+ char *suffix;
414	414
415		− if(strlen(name) != 14 \|\| strncmp(name + 8, ".SUN", 4) != 0)
	415	+ addr = strtoul(name, &suffix, 16);
	416	+ if(suffix-name != 8 \|\| (strcmp(suffix, "") != 0 && strcmp(suffix, ".SUN") != 0))
416	417	return name;
417	418
418		− addr = strtoul(name, 0, 16);
419	419	v4[0] = addr>>24;
420	420	v4[1] = addr>>16;
421	421	v4[2] = addr>>8;