Browse Source

Plan 9 from Bell Labs 2008-10-21

David du Colombier 12 years ago
parent
commit
c45c004838

+ 26 - 5
dist/replica/_plan9.db

@@ -57,7 +57,7 @@
 386/bin/auth/dsa2ssh - 775 sys sys 1209614091 143115
 386/bin/auth/dsagen - 775 sys sys 1210392464 155832
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1210392472 322145
+386/bin/auth/factotum - 775 sys sys 1224528457 322145
 386/bin/auth/fgui - 775 sys sys 1210392478 219396
 386/bin/auth/guard.srv - 775 sys sys 1210392481 146174
 386/bin/auth/keyfs - 775 sys sys 1203712999 116640
@@ -9189,7 +9189,7 @@ sys/src/boot/pc/bootp.c - 664 sys sys 1218660611 12678
 sys/src/boot/pc/cga.c - 664 sys sys 1015007948 1362
 sys/src/boot/pc/cis.c - 664 sys sys 1144961189 9232
 sys/src/boot/pc/clock.c - 664 sys sys 1212010463 6825
-sys/src/boot/pc/conf.c - 664 sys sys 1094674484 10217
+sys/src/boot/pc/conf.c - 664 sys sys 1224519174 10218
 sys/src/boot/pc/console.c - 664 sys sys 1219793776 3965
 sys/src/boot/pc/dat.h - 664 sys sys 1216753913 3653
 sys/src/boot/pc/devbios.c - 664 sys sys 1212010497 9431
@@ -9203,7 +9203,7 @@ sys/src/boot/pc/dosboot.c - 664 sys sys 1212010488 11337
 sys/src/boot/pc/dosfs.h - 664 sys sys 1032215924 1467
 sys/src/boot/pc/eoffs - 664 sys sys 1015007950 0
 sys/src/boot/pc/error.h - 664 sys sys 1015007950 3081
-sys/src/boot/pc/ether.c - 664 sys sys 1194025450 5440
+sys/src/boot/pc/ether.c - 664 sys sys 1224519174 5509
 sys/src/boot/pc/ether2000.c - 664 sys sys 1015007950 2609
 sys/src/boot/pc/ether2114x.c - 664 sys sys 1212010443 38026
 sys/src/boot/pc/ether589.c - 664 sys sys 1144961189 4624
@@ -9668,7 +9668,7 @@ sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1200684904 3482
 sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1140272941 14955
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1210356198 18450
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1224516368 18451
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1172776773 2873
 sys/src/cmd/auth/keyfs.c - 664 sys sys 1191007186 19129
@@ -10458,7 +10458,7 @@ sys/src/cmd/fossil/fns.h - 664 sys sys 1189552875 3262
 sys/src/cmd/fossil/fossil-acid - 664 sys sys 1199304805 4367
 sys/src/cmd/fossil/fossil.c - 664 sys sys 1224094852 2601
 sys/src/cmd/fossil/fs.c - 664 sys sys 1177432004 21598
-sys/src/cmd/fossil/fs.h - 664 sys sys 1189552775 1606
+sys/src/cmd/fossil/fs.h - 664 sys sys 1224543979 1634
 sys/src/cmd/fossil/history - 664 sys sys 1055703793 1400
 sys/src/cmd/fossil/invariants - 664 sys sys 1189552808 4073
 sys/src/cmd/fossil/last.c - 664 sys sys 1087005593 812
@@ -15885,3 +15885,24 @@ 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 1020896385 0
+386/bin/venti/buildindex - 775 sys sys 1224558578 259426
+386/bin/venti/checkarenas - 775 sys sys 1224558579 261213
+386/bin/venti/checkindex - 775 sys sys 1224558579 256635
+386/bin/venti/clumpstats - 775 sys sys 1224558579 245571
+386/bin/venti/findscore - 775 sys sys 1224558579 247599
+386/bin/venti/fixarenas - 775 sys sys 1224558580 212878
+386/bin/venti/fmtarenas - 775 sys sys 1224558580 247840
+386/bin/venti/fmtbloom - 775 sys sys 1224558580 168579
+386/bin/venti/fmtindex - 775 sys sys 1224558580 245838
+386/bin/venti/fmtisect - 775 sys sys 1224558580 246190
+386/bin/venti/mirrorarenas - 775 sys sys 1224558581 255298
+386/bin/venti/printarena - 775 sys sys 1224558581 257879
+386/bin/venti/printarenapart - 775 sys sys 1224558581 258873
+386/bin/venti/rdarena - 775 sys sys 1224558581 247311
+386/bin/venti/syncindex - 775 sys sys 1224558582 267225
+386/bin/venti/venti - 775 sys sys 1224558582 707542
+386/bin/venti/verifyarena - 775 sys sys 1224558582 167043
+386/bin/venti/wrarena - 775 sys sys 1224558583 284230
+386/bin/fossil/flchk - 775 sys sys 1224558578 238953
+386/bin/fossil/flfmt - 775 sys sys 1224558578 246950
+386/bin/fossil/fossil - 775 sys sys 1224558578 370414

+ 26 - 25
dist/replica/plan9.db

@@ -57,7 +57,7 @@
 386/bin/auth/dsa2ssh - 775 sys sys 1209614091 143115
 386/bin/auth/dsagen - 775 sys sys 1210392464 155832
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1210392472 322145
+386/bin/auth/factotum - 775 sys sys 1224528457 322145
 386/bin/auth/fgui - 775 sys sys 1210392478 219396
 386/bin/auth/guard.srv - 775 sys sys 1210392481 146174
 386/bin/auth/keyfs - 775 sys sys 1203712999 116640
@@ -240,9 +240,9 @@
 386/bin/fortune - 775 sys sys 1209614281 67297
 386/bin/fossil - 20000000775 sys sys 1087009456 0
 386/bin/fossil/conf - 775 sys sys 1085077052 1506
-386/bin/fossil/flchk - 775 sys sys 1209614286 238876
-386/bin/fossil/flfmt - 775 sys sys 1210392695 246873
-386/bin/fossil/fossil - 775 sys sys 1204292481 366315
+386/bin/fossil/flchk - 775 sys sys 1224558578 238953
+386/bin/fossil/flfmt - 775 sys sys 1224558578 246950
+386/bin/fossil/fossil - 775 sys sys 1224558578 370414
 386/bin/fossil/last - 775 sys sys 1168402310 63550
 386/bin/freq - 775 sys sys 1209614292 61981
 386/bin/fs - 20000000775 sys sys 1097900278 0
@@ -502,28 +502,29 @@
 386/bin/vac - 775 sys sys 1218136581 229446
 386/bin/vacfs - 775 sys sys 1223579346 243644
 386/bin/venti - 20000000775 sys sys 1191273719 0
-386/bin/venti/buildindex - 775 sys sys 1214510186 259348
-386/bin/venti/checkarenas - 775 sys sys 1214510193 261127
-386/bin/venti/checkindex - 775 sys sys 1214510199 256557
-386/bin/venti/clumpstats - 775 sys sys 1214510204 245493
+386/bin/venti/buildindex - 775 sys sys 1224558578 259426
+386/bin/venti/checkarenas - 775 sys sys 1224558579 261213
+386/bin/venti/checkindex - 775 sys sys 1224558579 256635
+386/bin/venti/clumpstats - 775 sys sys 1224558579 245571
 386/bin/venti/conf - 775 sys sys 1189362423 1505
 386/bin/venti/copy - 775 sys sys 1214510208 138019
-386/bin/venti/findscore - 775 sys sys 1214510214 247521
-386/bin/venti/fixarenas - 775 sys sys 1214510219 212830
-386/bin/venti/fmtarenas - 775 sys sys 1214510223 247762
-386/bin/venti/fmtbloom - 775 sys sys 1214510227 168531
-386/bin/venti/fmtindex - 775 sys sys 1214510232 245760
-386/bin/venti/fmtisect - 775 sys sys 1214510237 246112
-386/bin/venti/mirrorarenas - 775 sys sys 1214510241 255220
-386/bin/venti/printarena - 775 sys sys 1214510246 257801
-386/bin/venti/rdarena - 775 sys sys 1214510252 247233
+386/bin/venti/findscore - 775 sys sys 1224558579 247599
+386/bin/venti/fixarenas - 775 sys sys 1224558580 212878
+386/bin/venti/fmtarenas - 775 sys sys 1224558580 247840
+386/bin/venti/fmtbloom - 775 sys sys 1224558580 168579
+386/bin/venti/fmtindex - 775 sys sys 1224558580 245838
+386/bin/venti/fmtisect - 775 sys sys 1224558580 246190
+386/bin/venti/mirrorarenas - 775 sys sys 1224558581 255298
+386/bin/venti/printarena - 775 sys sys 1224558581 257879
+386/bin/venti/printarenapart - 775 sys sys 1224558581 258873
+386/bin/venti/rdarena - 775 sys sys 1224558581 247311
 386/bin/venti/read - 775 sys sys 1214510255 151391
 386/bin/venti/ro - 775 sys sys 1214510259 158285
 386/bin/venti/sync - 775 sys sys 1214510262 150263
-386/bin/venti/syncindex - 775 sys sys 1214510268 267147
-386/bin/venti/venti - 775 sys sys 1214510282 705880
-386/bin/venti/verifyarena - 775 sys sys 1214510285 166995
-386/bin/venti/wrarena - 775 sys sys 1218252955 284152
+386/bin/venti/syncindex - 775 sys sys 1224558582 267225
+386/bin/venti/venti - 775 sys sys 1224558582 707542
+386/bin/venti/verifyarena - 775 sys sys 1224558582 167043
+386/bin/venti/wrarena - 775 sys sys 1224558583 284230
 386/bin/venti/write - 775 sys sys 1214510295 151806
 386/bin/vncs - 775 sys sys 1210393170 473332
 386/bin/vncv - 775 sys sys 1210393181 520757
@@ -9189,7 +9190,7 @@ sys/src/boot/pc/bootp.c - 664 sys sys 1218660611 12678
 sys/src/boot/pc/cga.c - 664 sys sys 1015007948 1362
 sys/src/boot/pc/cis.c - 664 sys sys 1144961189 9232
 sys/src/boot/pc/clock.c - 664 sys sys 1212010463 6825
-sys/src/boot/pc/conf.c - 664 sys sys 1094674484 10217
+sys/src/boot/pc/conf.c - 664 sys sys 1224519174 10218
 sys/src/boot/pc/console.c - 664 sys sys 1219793776 3965
 sys/src/boot/pc/dat.h - 664 sys sys 1216753913 3653
 sys/src/boot/pc/devbios.c - 664 sys sys 1212010497 9431
@@ -9203,7 +9204,7 @@ sys/src/boot/pc/dosboot.c - 664 sys sys 1212010488 11337
 sys/src/boot/pc/dosfs.h - 664 sys sys 1032215924 1467
 sys/src/boot/pc/eoffs - 664 sys sys 1015007950 0
 sys/src/boot/pc/error.h - 664 sys sys 1015007950 3081
-sys/src/boot/pc/ether.c - 664 sys sys 1194025450 5440
+sys/src/boot/pc/ether.c - 664 sys sys 1224519174 5509
 sys/src/boot/pc/ether2000.c - 664 sys sys 1015007950 2609
 sys/src/boot/pc/ether2114x.c - 664 sys sys 1212010443 38026
 sys/src/boot/pc/ether589.c - 664 sys sys 1144961189 4624
@@ -9668,7 +9669,7 @@ sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1200684904 3482
 sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1140272941 14955
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1210356198 18450
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1224516368 18451
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1172776773 2873
 sys/src/cmd/auth/keyfs.c - 664 sys sys 1191007186 19129
@@ -10458,7 +10459,7 @@ sys/src/cmd/fossil/fns.h - 664 sys sys 1189552875 3262
 sys/src/cmd/fossil/fossil-acid - 664 sys sys 1199304805 4367
 sys/src/cmd/fossil/fossil.c - 664 sys sys 1224094852 2601
 sys/src/cmd/fossil/fs.c - 664 sys sys 1177432004 21598
-sys/src/cmd/fossil/fs.h - 664 sys sys 1189552775 1606
+sys/src/cmd/fossil/fs.h - 664 sys sys 1224543979 1634
 sys/src/cmd/fossil/history - 664 sys sys 1055703793 1400
 sys/src/cmd/fossil/invariants - 664 sys sys 1189552808 4073
 sys/src/cmd/fossil/last.c - 664 sys sys 1087005593 812

+ 26 - 0
dist/replica/plan9.log

@@ -36203,3 +36203,29 @@
 1224117004 0 c adm/timezone/Australia_NSW - 664 adm adm 1224116005 1483
 1224117004 1 c adm/timezone/Australia_Victoria - 664 adm adm 1224116005 1483
 1224117004 2 c sys/man/8/venti-fmt - 664 sys sys 1224116733 8678
+1224516604 0 c sys/src/cmd/auth/factotum/util.c - 664 sys sys 1224516368 18451
+1224520205 0 c sys/src/boot/pc/conf.c - 664 sys sys 1224519174 10218
+1224520205 1 c sys/src/boot/pc/ether.c - 664 sys sys 1224519174 5509
+1224529204 0 c 386/bin/auth/factotum - 775 sys sys 1224528457 322145
+1224545404 0 c sys/src/cmd/fossil/fs.h - 664 sys sys 1224543979 1634
+1224559803 0 c 386/bin/venti/buildindex - 775 sys sys 1224558578 259426
+1224559803 1 c 386/bin/venti/checkarenas - 775 sys sys 1224558579 261213
+1224559803 2 c 386/bin/venti/checkindex - 775 sys sys 1224558579 256635
+1224559803 3 c 386/bin/venti/clumpstats - 775 sys sys 1224558579 245571
+1224559803 4 c 386/bin/venti/findscore - 775 sys sys 1224558579 247599
+1224559803 5 c 386/bin/venti/fixarenas - 775 sys sys 1224558580 212878
+1224559803 6 c 386/bin/venti/fmtarenas - 775 sys sys 1224558580 247840
+1224559803 7 c 386/bin/venti/fmtbloom - 775 sys sys 1224558580 168579
+1224559803 8 c 386/bin/venti/fmtindex - 775 sys sys 1224558580 245838
+1224559803 9 c 386/bin/venti/fmtisect - 775 sys sys 1224558580 246190
+1224559803 10 c 386/bin/venti/mirrorarenas - 775 sys sys 1224558581 255298
+1224559803 11 c 386/bin/venti/printarena - 775 sys sys 1224558581 257879
+1224559803 12 a 386/bin/venti/printarenapart - 775 sys sys 1224558581 258873
+1224559803 13 c 386/bin/venti/rdarena - 775 sys sys 1224558581 247311
+1224559803 14 c 386/bin/venti/syncindex - 775 sys sys 1224558582 267225
+1224559803 15 c 386/bin/venti/venti - 775 sys sys 1224558582 707542
+1224559803 16 c 386/bin/venti/verifyarena - 775 sys sys 1224558582 167043
+1224559803 17 c 386/bin/venti/wrarena - 775 sys sys 1224558583 284230
+1224559803 18 c 386/bin/fossil/flchk - 775 sys sys 1224558578 238953
+1224559803 19 c 386/bin/fossil/flfmt - 775 sys sys 1224558578 246950
+1224559803 20 c 386/bin/fossil/fossil - 775 sys sys 1224558578 370414

+ 2 - 1
sys/src/boot/pc/conf.c

@@ -327,6 +327,8 @@ changeconf(char *fmt, ...)
 	va_start(arg, fmt);
 	vseprint(buf, buf+sizeof buf, fmt, arg);
 	va_end(arg);
+
+	pref[0] = '\n';
 	strncpy(pref+1, buf, 19);
 	pref[19] = '\0';
 	if(p = strchr(pref, '='))
@@ -335,7 +337,6 @@ changeconf(char *fmt, ...)
 		print("warning: did not change %s in plan9.ini\n", buf);
 
 	/* find old line by looking for \nwhat= */
-	pref[0] = '\n';
 	if(strncmp(BOOTARGS, pref+1, strlen(pref+1)) == 0)
 		p = BOOTARGS;
 	else if(p = strstr(BOOTARGS, pref))

+ 1 - 0
sys/src/boot/pc/ether.c

@@ -54,6 +54,7 @@ struct {
 	{ "83815", ether83815reset, 0, },
 	{ "rhine", rhinepnp, 0, },
 	{ "vt6102", rhinepnp, 0, },
+	{ "vt6105m", rhinepnp, 0, },	/* until we have a 6105 boot driver */
 	{ "GA620", ga620pnp, 0, },
 	{ "83820",   dp83820pnp, 0, },
 	{ "dp83820", dp83820pnp, 0, },

+ 1 - 1
sys/src/cmd/auth/factotum/util.c

@@ -275,7 +275,7 @@ failure(Fsstate *s, char *fmt, ...)
 		rerrstr(s->err, sizeof(s->err));
 	else {
 		va_start(arg, fmt);
-		snprint(e, sizeof e, fmt, arg);
+		vsnprint(e, sizeof e, fmt, arg);
 		va_end(arg);
 		strecpy(s->err, s->err+sizeof(s->err), e);
 		werrstr(e);

+ 2 - 0
sys/src/cmd/fossil/fs.h

@@ -14,6 +14,8 @@ enum {
 	OOverWrite,
 };
 
+extern char *currfsysname;
+
 void	fsClose(Fs*);
 int	fsEpochLow(Fs*, u32int);
 File	*fsGetRoot(Fs*);