Plan 9 from Bell Labs 2005-01-19

acme/wiki/src/wiki.c

@@ -96,15 +96,14 @@ wikiput(Wiki *w)
 		return -1;
 	}
 	seek(fd, 0, 0);
-	if((n = read(fd, buf, 40)) < 0){
+	if((n = read(fd, buf, 300)) < 0){
 		fprint(2, "Wiki readback: %r\n");
 		close(fd);
 		return -1;
 	}
 	close(fd);
 	buf[n] = '\0';
-	n = atoi(buf);
-	sprint(buf, "%d/", n);
+	sprint(buf, "%s/", buf);
 	free(w->arg);
 	w->arg = estrdup(buf);
 	w->isnew = 0;

dist/replica/_plan9.db

@@ -1,11 +1,11 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1100269948 208708
-386/9loaddebug - 775 sys sys 1104122096 306647
+386/9loaddebug - 775 sys sys 1106021711 306647
 386/9loadlite - 775 sys sys 1100269949 132260
 386/9loadlitedebug - 775 sys sys 1104122096 195560
 386/9pc - 775 sys sys 1105161523 1833601
 386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1105161526 1488543
+386/9pccpu - 775 sys sys 1106021714 1488543
 386/9pccpu.gz - 664 sys sys 1077049387 519909
 386/9pcdisk - 775 sys sys 1105161530 2039055
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
@@ -614,7 +614,7 @@ acme/acid/sparc - 20000000775 sys sys 1015011246 0
 acme/bin - 20000000775 sys sys 1017457907 0
 acme/bin/386 - 20000000775 sys sys 1015011570 0
 acme/bin/386/News - 775 sys sys 1104122115 128661
-acme/bin/386/Wiki - 775 sys sys 1104122115 126780
+acme/bin/386/Wiki - 775 sys sys 1106096766 126761
 acme/bin/386/acd - 775 sys sys 1032232412 137068
 acme/bin/386/adict - 775 sys sys 1015011247 99806
 acme/bin/386/mkwnew - 775 sys sys 1104122115 38959
@@ -715,7 +715,7 @@ acme/wiki/src/awiki.h - 664 sys sys 1018288159 2140
 acme/wiki/src/main.c - 664 sys sys 1018387015 848
 acme/wiki/src/mkfile - 664 sys sys 1015011266 138
 acme/wiki/src/util.c - 664 sys sys 1016901956 1176
-acme/wiki/src/wiki.c - 664 sys sys 1018288160 10644
+acme/wiki/src/wiki.c - 664 sys sys 1106096758 10631
 acme/wiki/src/win.c - 664 sys sys 1016901957 5106
 acme/wiki/wiki.diff - 775 sys sys 1015011266 283
 adm - 20000000775 adm adm 1017438729 0
@@ -4806,9 +4806,9 @@ sys/man/1/yacc - 664 sys sys 944959676 3273
 sys/man/1/yesterday - 664 sys sys 1070288431 2348
 sys/man/2 - 20000000775 sys sys 1017423721 0
 sys/man/2/0intro - 664 sys sys 1044724217 11574
-sys/man/2/9p - 664 sys sys 1089084170 15221
+sys/man/2/9p - 664 sys sys 1106072437 15235
 sys/man/2/9pcmdbuf - 664 sys sys 1044430197 2057
-sys/man/2/9pfid - 664 sys sys 1048637158 3626
+sys/man/2/9pfid - 664 sys sys 1106072437 3663
 sys/man/2/9pfile - 664 sys sys 1048637158 4408
 sys/man/2/INDEX - 664 sys sys 1104811679 20487
 sys/man/2/INDEX.html - 664 sys sys 1104736374 27481
@@ -7365,7 +7365,7 @@ sys/src/cmd/dict/world.c - 664 sys sys 944960882 4264
 sys/src/cmd/diff - 20000000775 sys sys 944960882 0
 sys/src/cmd/diff/diff.h - 664 sys sys 1014925333 769
 sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
-sys/src/cmd/diff/diffio.c - 664 sys sys 1014925334 5031
+sys/src/cmd/diff/diffio.c - 664 sys sys 1106063669 5272
 sys/src/cmd/diff/diffreg.c - 664 sys sys 1014925334 8825
 sys/src/cmd/diff/main.c - 664 sys sys 1099755545 4312
 sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
@@ -11436,7 +11436,7 @@ sys/src/libauthsrv/mkfile - 664 sys sys 1035389776 409
 sys/src/libauthsrv/nvcsum.c - 664 sys sys 1015091654 192
 sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1015091654 517
-sys/src/libauthsrv/readnvram.c - 664 sys sys 1055718668 8534
+sys/src/libauthsrv/readnvram.c - 664 sys sys 1106063383 8622
 sys/src/libbin - 20000000775 sys sys 984777332 0
 sys/src/libbin/bin.c - 664 sys sys 1045502972 1811
 sys/src/libbin/mkfile - 664 sys sys 1035389776 197
@@ -12457,5 +12457,15 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/9loaddebug - 775 sys sys 1106021711 306647
-386/9pccpu - 775 sys sys 1106021714 1488543
+386/bin/diff - 775 sys sys 1106107676 84031
+386/bin/auth/aescbc - 775 sys sys 1106107674 133292
+386/bin/auth/convkeys - 775 sys sys 1106107674 87287
+386/bin/auth/convkeys2 - 775 sys sys 1106107674 87338
+386/bin/auth/factotum - 775 sys sys 1106107675 313998
+386/bin/auth/keyfs - 775 sys sys 1106107675 115351
+386/bin/auth/secstore - 775 sys sys 1106107676 189627
+386/bin/auth/wrkey - 775 sys sys 1106107676 75056
+386/bin/disk/kfs - 775 sys sys 1106107677 248770
+386/lib/libauthsrv.a - 664 sys sys 1106107677 33778
+acme/bin/386/Wiki - 775 sys sys 1106107677 126761
+sys/lib/kbmap/jp - 664 sys sys 1106107712 317

dist/replica/plan9.db

@@ -43,21 +43,21 @@
 386/bin/ascii - 775 sys sys 1104121959 64668
 386/bin/astro - 775 sys sys 1104121959 138803
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1104121960 133228
+386/bin/auth/aescbc - 775 sys sys 1106107674 133292
 386/bin/auth/asn12rsa - 775 sys sys 1104121960 119644
 386/bin/auth/authsrv - 775 sys sys 1104121961 165463
 386/bin/auth/changeuser - 775 sys sys 1104121961 97026
-386/bin/auth/convkeys - 775 sys sys 1104121961 87223
-386/bin/auth/convkeys2 - 775 sys sys 1104121962 87274
+386/bin/auth/convkeys - 775 sys sys 1106107674 87287
+386/bin/auth/convkeys2 - 775 sys sys 1106107674 87338
 386/bin/auth/cron - 775 sys sys 1104121962 142890
 386/bin/auth/debug - 775 sys sys 1104121962 101064
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1104121963 313934
+386/bin/auth/factotum - 775 sys sys 1106107675 313998
 386/bin/auth/fgui - 775 sys sys 1104121964 217793
 386/bin/auth/guard.srv - 775 sys sys 1104121964 142850
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1104121965 115287
+386/bin/auth/keyfs - 775 sys sys 1106107675 115351
 386/bin/auth/login - 775 sys sys 1104121965 103362
 386/bin/auth/newns - 775 sys sys 1104121965 87950
 386/bin/auth/none - 775 sys sys 1104121966 87699
@@ -71,13 +71,13 @@
 386/bin/auth/rsafill - 775 sys sys 1104121968 143416
 386/bin/auth/rsagen - 775 sys sys 1104121969 153041
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1104206870 189563
+386/bin/auth/secstore - 775 sys sys 1106107676 189627
 386/bin/auth/secstored - 775 sys sys 1104121970 196626
 386/bin/auth/secuser - 775 sys sys 1104121971 152299
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1104121971 63052
 386/bin/auth/warning - 775 sys sys 1104121971 99559
-386/bin/auth/wrkey - 775 sys sys 1104121971 74992
+386/bin/auth/wrkey - 775 sys sys 1106107676 75056
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/9pcon - 775 sys sys 1104121972 94925
 386/bin/aux/LOCK - 775 sys sys 1104121972 59908
@@ -195,13 +195,13 @@
 386/bin/dial/expect - 775 sys sys 1104122000 60081
 386/bin/dial/pass - 775 sys sys 1104122001 38814
 386/bin/dict - 775 sys sys 1104122001 187459
-386/bin/diff - 775 sys sys 1104122002 83750
+386/bin/diff - 775 sys sys 1106107676 84031
 386/bin/disk - 20000000775 sys sys 984788664 0
 386/bin/disk/dump9660 - 775 sys sys 1104122002 152246
 386/bin/disk/exsort - 775 sys sys 1104122002 60210
 386/bin/disk/fdisk - 775 sys sys 1104122003 103794
 386/bin/disk/format - 775 sys sys 1104122003 89534
-386/bin/disk/kfs - 775 sys sys 1104122004 248706
+386/bin/disk/kfs - 775 sys sys 1106107677 248770
 386/bin/disk/kfscmd - 775 sys sys 1104122004 38222
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1104122004 73689
@@ -528,7 +528,7 @@
 386/lib/lib9p.a - 664 sys sys 1105161535 79300
 386/lib/libString.a - 664 sys sys 1105161535 22184
 386/lib/libauth.a - 664 sys sys 1105161535 56134
-386/lib/libauthsrv.a - 664 sys sys 1105161535 33522
+386/lib/libauthsrv.a - 664 sys sys 1106107677 33778
 386/lib/libbin.a - 664 sys sys 1105161535 2534
 386/lib/libbio.a - 664 sys sys 1105161535 26078
 386/lib/libc.a - 664 sys sys 1105161536 500976
@@ -614,7 +614,7 @@ acme/acid/sparc - 20000000775 sys sys 1015011246 0
 acme/bin - 20000000775 sys sys 1017457907 0
 acme/bin/386 - 20000000775 sys sys 1015011570 0
 acme/bin/386/News - 775 sys sys 1104122115 128661
-acme/bin/386/Wiki - 775 sys sys 1104122115 126780
+acme/bin/386/Wiki - 775 sys sys 1106107677 126761
 acme/bin/386/acd - 775 sys sys 1032232412 137068
 acme/bin/386/adict - 775 sys sys 1015011247 99806
 acme/bin/386/mkwnew - 775 sys sys 1104122115 38959
@@ -715,7 +715,7 @@ acme/wiki/src/awiki.h - 664 sys sys 1018288159 2140
 acme/wiki/src/main.c - 664 sys sys 1018387015 848
 acme/wiki/src/mkfile - 664 sys sys 1015011266 138
 acme/wiki/src/util.c - 664 sys sys 1016901956 1176
-acme/wiki/src/wiki.c - 664 sys sys 1018288160 10644
+acme/wiki/src/wiki.c - 664 sys sys 1106096758 10631
 acme/wiki/src/win.c - 664 sys sys 1016901957 5106
 acme/wiki/wiki.diff - 775 sys sys 1015011266 283
 adm - 20000000775 adm adm 1017438729 0
@@ -3908,7 +3908,7 @@ sys/lib/kbmap/de - 664 sys sys 1100894012 6265
 sys/lib/kbmap/ee - 644 sys sys 1080222237 429
 sys/lib/kbmap/es - 664 sys sys 1079535430 1360
 sys/lib/kbmap/fi - 664 sys sys 1079617317 369
-sys/lib/kbmap/jp - 664 sys sys 1088002290 317
+sys/lib/kbmap/jp - 664 sys sys 1106107712 317
 sys/lib/kbmap/uk - 664 sys sys 1079473812 55
 sys/lib/kbmap/us - 664 sys sys 1082221421 6248
 sys/lib/lex - 20000000775 sys sys 945136651 0
@@ -4806,9 +4806,9 @@ sys/man/1/yacc - 664 sys sys 944959676 3273
 sys/man/1/yesterday - 664 sys sys 1070288431 2348
 sys/man/2 - 20000000775 sys sys 1017423721 0
 sys/man/2/0intro - 664 sys sys 1044724217 11574
-sys/man/2/9p - 664 sys sys 1089084170 15221
+sys/man/2/9p - 664 sys sys 1106072437 15235
 sys/man/2/9pcmdbuf - 664 sys sys 1044430197 2057
-sys/man/2/9pfid - 664 sys sys 1048637158 3626
+sys/man/2/9pfid - 664 sys sys 1106072437 3663
 sys/man/2/9pfile - 664 sys sys 1048637158 4408
 sys/man/2/INDEX - 664 sys sys 1104811679 20487
 sys/man/2/INDEX.html - 664 sys sys 1104736374 27481
@@ -7365,7 +7365,7 @@ sys/src/cmd/dict/world.c - 664 sys sys 944960882 4264
 sys/src/cmd/diff - 20000000775 sys sys 944960882 0
 sys/src/cmd/diff/diff.h - 664 sys sys 1014925333 769
 sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
-sys/src/cmd/diff/diffio.c - 664 sys sys 1014925334 5031
+sys/src/cmd/diff/diffio.c - 664 sys sys 1106063669 5272
 sys/src/cmd/diff/diffreg.c - 664 sys sys 1014925334 8825
 sys/src/cmd/diff/main.c - 664 sys sys 1099755545 4312
 sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
@@ -11436,7 +11436,7 @@ sys/src/libauthsrv/mkfile - 664 sys sys 1035389776 409
 sys/src/libauthsrv/nvcsum.c - 664 sys sys 1015091654 192
 sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1015091654 517
-sys/src/libauthsrv/readnvram.c - 664 sys sys 1055718668 8534
+sys/src/libauthsrv/readnvram.c - 664 sys sys 1106063383 8622
 sys/src/libbin - 20000000775 sys sys 984777332 0
 sys/src/libbin/bin.c - 664 sys sys 1045502972 1811
 sys/src/libbin/mkfile - 664 sys sys 1035389776 197

dist/replica/plan9.log

@@ -13241,3 +13241,21 @@
 1106019101 0 c sys/src/boot/pc/ether8169.c - 664 sys sys 1106018997 18687
 1106022702 0 c 386/9loaddebug - 775 sys sys 1106021711 306647
 1106022702 1 c 386/9pccpu - 775 sys sys 1106021714 1488543
+1106064110 0 c sys/src/cmd/diff/diffio.c - 664 sys sys 1106063669 5272
+1106064110 1 c sys/src/libauthsrv/readnvram.c - 664 sys sys 1106063383 8622
+1106073112 0 c sys/man/2/9p - 664 sys sys 1106072437 15235
+1106073112 1 c sys/man/2/9pfid - 664 sys sys 1106072437 3663
+1106098317 0 c acme/bin/386/Wiki - 775 sys sys 1106096766 126761
+1106098317 1 c acme/wiki/src/wiki.c - 664 sys sys 1106096758 10631
+1106109119 0 c 386/bin/diff - 775 sys sys 1106107676 84031
+1106109119 1 c 386/bin/auth/aescbc - 775 sys sys 1106107674 133292
+1106109119 2 c 386/bin/auth/convkeys - 775 sys sys 1106107674 87287
+1106109119 3 c 386/bin/auth/convkeys2 - 775 sys sys 1106107674 87338
+1106109119 4 c 386/bin/auth/factotum - 775 sys sys 1106107675 313998
+1106109119 5 c 386/bin/auth/keyfs - 775 sys sys 1106107675 115351
+1106109119 6 c 386/bin/auth/secstore - 775 sys sys 1106107676 189627
+1106109119 7 c 386/bin/auth/wrkey - 775 sys sys 1106107676 75056
+1106109119 8 c 386/bin/disk/kfs - 775 sys sys 1106107677 248770
+1106109119 9 c 386/lib/libauthsrv.a - 664 sys sys 1106107677 33778
+1106109119 10 c acme/bin/386/Wiki - 775 sys sys 1106107677 126761
+1106109119 11 c sys/lib/kbmap/jp - 664 sys sys 1106107712 317

sys/lib/kbmap/jp

@@ -9,7 +9,7 @@
 0	0x79	'
 0	0x7b	'
 0	0x7d	'¥
-1	0x3	''
+1	0x3	'"
 1	0x7	'&
 1	0x8	''
 1	0x9	'(

sys/man/2/9p

@@ -319,10 +319,10 @@ If authentication is desired,
 the
 .I auth
 function should record that
-.I afid
+.IB r -> afid
 is the new authentication fid and
 set 
-.I afid->qid
+.IB r -> afid -> qid
 and
 .IR ofcall.qid .
 .I Auth

sys/man/2/9pfid

@@ -37,6 +37,9 @@ typedef struct Req
 	Fcall	ofcall;
 	Req	*oldreq;
 	void	*aux;
+	Fid	*fid;
+	Fid	*afid;
+	Fid	*newfid;
 	\fI...\fP
 } Req;
 .fi

sys/src/cmd/diff/diffio.c

@@ -227,10 +227,12 @@ fetch(long *f, int a, int b, Biobuf *bp, char *s)
 {
 	char buf[MAXLINELEN];
 
+	if(a < 1)
+		a = 1;
 	Bseek(bp, f[a-1], 0);
 	while (a++ <= b) {
-		readline(bp, buf);
-		Bprint(&stdout, "%s%s\n", s, buf);
+		if(readline(bp, buf) >= 0)
+			Bprint(&stdout, "%s%s\n", s, buf);
 	}
 }
 
@@ -266,6 +268,7 @@ change(int a, int b, int c, int d)
 		Bputc(&stdout, verb);
 		range(c, d, ",");
 		break;
+	case 'c':
 	case 'n':
 		Bprint(&stdout, "%s:", file1);
 		range(a, b, ",");
@@ -279,13 +282,20 @@ change(int a, int b, int c, int d)
 		break;
 	}
 	Bputc(&stdout, '\n');
-	if (mode == 0 || mode == 'n') {
+	if (mode == 'c') {
+		fetch(ixold, a-4, a-1, input[0], "  ");
 		fetch(ixold, a, b, input[0], "< ");
-		if (a <= b && c <= d)
-			Bprint(&stdout, "---\n");
+		fetch(ixnew, c, d, input[1], "> ");
+		fetch(ixnew, d+1, d+4, input[1], "  ");
+	} else {
+		if (mode == 0 || mode == 'n') {
+			fetch(ixold, a, b, input[0], "< ");
+			if (a <= b && c <= d)
+				Bprint(&stdout, "---\n");
+		}
+		fetch(ixnew, c, d, input[1], mode == 0 || mode == 'n' ? "> ": "");
+		if (mode != 0 && mode != 'n' && c <= d)
+			Bprint(&stdout, ".\n");
 	}
-	fetch(ixnew, c, d, input[1], mode == 0 || mode == 'n' ? "> ": "");
-	if (mode != 0 && mode != 'n' && c <= d)
-		Bprint(&stdout, ".\n");
 }
 

sys/src/libauthsrv/readnvram.c

@@ -29,6 +29,8 @@ static struct {
 	"pc", "#S/sdC0/9fat", -1, sizeof(Nvrsafe),
 	"pc", "#S/sdC1/nvram", 0, sizeof(Nvrsafe),
 	"pc", "#S/sdC1/9fat", -1, sizeof(Nvrsafe),
+	"pc", "#S/sdD0/nvram", 0, sizeof(Nvrsafe),
+	"pc", "#S/sdD0/9fat", -1, sizeof(Nvrsafe),
 	"pc", "#S/sd00/nvram", 0, sizeof(Nvrsafe),
 	"pc", "#S/sd00/9fat", -1, sizeof(Nvrsafe),
 	"pc", "#S/sd01/nvram", 0, sizeof(Nvrsafe),