Plan 9 from Bell Labs 2003-01-08

dist/replica/plan9.db

@@ -59,9 +59,9 @@
 386/bin/auth/login - 775 sys sys 1039758534 99385
 386/bin/auth/printnetkey - 775 sys sys 1039758534 40969
 386/bin/auth/secretpem - 775 sys sys 1039758534 118523
-386/bin/auth/secstore - 775 sys sys 1041890054 185946
-386/bin/auth/secstored - 775 sys sys 1041890055 192691
-386/bin/auth/secuser - 775 sys sys 1041890056 149092
+386/bin/auth/secstore - 775 sys sys 1041971507 186269
+386/bin/auth/secstored - 775 sys sys 1041971507 193006
+386/bin/auth/secuser - 775 sys sys 1041971508 149458
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1039758536 61773
 386/bin/auth/warning - 775 sys sys 1039758536 97723
@@ -207,7 +207,7 @@
 386/bin/fs/tpfs - 775 sys sys 1039758561 94691
 386/bin/fs/v10fs - 775 sys sys 1039758561 96202
 386/bin/fs/v6fs - 775 sys sys 1039758562 96121
-386/bin/ftpfs - 775 sys sys 1039758562 148301
+386/bin/ftpfs - 775 sys sys 1041971509 148902
 386/bin/getmap - 775 sys sys 1039758562 63678
 386/bin/gif - 775 sys sys 1039758562 155652
 386/bin/grap - 775 sys sys 1038443129 278447
@@ -607,7 +607,7 @@ acme/bin/source/win/win.c - 664 sys sys 1015011255 4240
 acme/bin/unind - 755 sys sys 1015011256 27
 acme/mail - 20000000775 sys sys 1015011265 0
 acme/mail/386 - 20000000775 sys sys 1015011538 0
-acme/mail/386/Mail - 775 sys sys 1041481688 175845
+acme/mail/386/Mail - 775 sys sys 1041971510 175845
 acme/mail/Mail - 775 sys sys 1015011264 202
 acme/mail/alpha - 20000000775 sys sys 1015011521 0
 acme/mail/arm - 20000000775 sys sys 1015011525 0
@@ -4378,7 +4378,7 @@ sys/man/1/0intro - 664 sys sys 958249499 9623
 sys/man/1/2a - 664 sys sys 944959673 1032
 sys/man/1/2c - 664 sys sys 1016731553 7349
 sys/man/1/2l - 664 sys sys 944959675 4074
-sys/man/1/INDEX - 664 sys sys 1041446629 2895
+sys/man/1/INDEX - 664 sys sys 1041971548 2895
 sys/man/1/INDEX.html - 664 sys sys 1026845791 15882
 sys/man/1/aan - 664 sys sys 1019856818 1622
 sys/man/1/acid - 664 sys sys 1016833872 9422
@@ -4524,7 +4524,7 @@ sys/man/2/0intro - 664 sys sys 958249500 11777
 sys/man/2/9p - 664 sys sys 1032632905 14553
 sys/man/2/9pfid - 664 sys sys 1030451710 3644
 sys/man/2/9pfile - 664 sys sys 1017423719 4426
-sys/man/2/INDEX - 664 sys sys 1041446630 20120
+sys/man/2/INDEX - 664 sys sys 1041971549 20120
 sys/man/2/INDEX.html - 664 sys sys 1019918562 26387
 sys/man/2/abort - 664 sys sys 944959693 331
 sys/man/2/abs - 664 sys sys 944959693 461
@@ -4665,7 +4665,7 @@ sys/man/2/wait - 664 sys sys 1015091528 2481
 sys/man/2/window - 664 sys sys 950593499 5522
 sys/man/3 - 20000000775 sys sys 1017251174 0
 sys/man/3/0intro - 664 sys sys 984709634 1873
-sys/man/3/INDEX - 664 sys sys 1041446630 369
+sys/man/3/INDEX - 664 sys sys 1041971549 369
 sys/man/3/INDEX.html - 664 sys sys 1019918563 3519
 sys/man/3/apm - 664 sys sys 984709634 1625
 sys/man/3/arch - 664 sys sys 958419692 1425
@@ -4701,7 +4701,7 @@ sys/man/3/usb - 664 sys sys 1019866708 6648
 sys/man/3/vga - 664 sys sys 1020356225 4827
 sys/man/4 - 20000000775 sys sys 1018581459 0
 sys/man/4/0intro - 664 sys sys 944959699 472
-sys/man/4/INDEX - 664 sys sys 1041446630 953
+sys/man/4/INDEX - 664 sys sys 1041971550 953
 sys/man/4/INDEX.html - 664 sys sys 1026846913 4513
 sys/man/4/acme - 664 sys sys 1015024813 9642
 sys/man/4/archfs - 664 sys sys 960000712 533
@@ -4743,7 +4743,7 @@ sys/man/4/webfs - 664 sys sys 1019828742 6455
 sys/man/4/wikifs - 664 sys sys 1018581459 7501
 sys/man/5 - 20000000775 sys sys 1015024846 0
 sys/man/5/0intro - 664 sys sys 1027270581 13984
-sys/man/5/INDEX - 664 sys sys 1020375094 193
+sys/man/5/INDEX - 664 sys sys 1041971550 193
 sys/man/5/INDEX.html - 664 sys sys 1019918564 1409
 sys/man/5/attach - 664 sys sys 1017337812 2857
 sys/man/5/clunk - 664 sys sys 1015024830 701
@@ -4757,7 +4757,7 @@ sys/man/5/version - 664 sys sys 1015024830 2657
 sys/man/5/walk - 664 sys sys 1015024830 3622
 sys/man/6 - 20000000775 sys sys 1015092163 0
 sys/man/6/0intro - 664 sys sys 944959678 179
-sys/man/6/INDEX - 664 sys sys 1020375094 410
+sys/man/6/INDEX - 664 sys sys 1041971551 410
 sys/man/6/INDEX.html - 664 sys sys 1019918565 2927
 sys/man/6/a.out - 664 sys sys 1015024888 7155
 sys/man/6/ar - 664 sys sys 944959678 2092
@@ -4786,7 +4786,7 @@ sys/man/6/venti.conf - 664 sys sys 1036468088 1580
 sys/man/6/vgadb - 664 sys sys 960256513 10972
 sys/man/7 - 20000000775 sys sys 1015092163 0
 sys/man/7/0intro - 664 sys sys 944959677 256
-sys/man/7/INDEX - 664 sys sys 1020375094 89
+sys/man/7/INDEX - 664 sys sys 1041971551 89
 sys/man/7/INDEX.html - 664 sys sys 1019918566 806
 sys/man/7/astro - 664 sys sys 964455064 2454
 sys/man/7/dict - 664 sys sys 944959678 3438
@@ -4797,7 +4797,7 @@ sys/man/8 - 20000000775 sys sys 1018384448 0
 sys/man/8/0intro - 664 sys sys 944959679 247
 sys/man/8/9load - 664 sys sys 1015024984 8340
 sys/man/8/9pcon - 664 sys sys 1018973955 2226
-sys/man/8/INDEX - 664 sys sys 1041446630 2472
+sys/man/8/INDEX - 664 sys sys 1041971551 2472
 sys/man/8/INDEX.html - 664 sys sys 1026847121 7728
 sys/man/8/aliasmail - 664 sys sys 1026847121 1203
 sys/man/8/apm - 664 sys sys 1017679308 1811
@@ -5182,7 +5182,7 @@ sys/src/9/port/devcons.c - 664 sys sys 1036812998 20919
 sys/src/9/port/devdraw.c - 664 sys sys 1039753332 41987
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1019762849 6562
-sys/src/9/port/devfs.c - 664 sys sys 1041350175 11171
+sys/src/9/port/devfs.c - 664 sys sys 1041971958 10698
 sys/src/9/port/devkprof.c - 664 sys sys 1014931173 3111
 sys/src/9/port/devloopback.c - 664 sys sys 1018721201 14968
 sys/src/9/port/devmnt.c - 664 sys sys 1041443399 21588

dist/replica/plan9.log

@@ -16899,3 +16899,17 @@
 1041890558 8 c sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1041890054 12213
 1041890558 9 c sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1041890053 841
 1041890558 10 c sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1041890054 4351
+1041971572 0 c 386/bin/ftpfs - 775 sys sys 1041971509 148902
+1041971572 1 c 386/bin/auth/secstore - 775 sys sys 1041971507 186269
+1041971572 2 c 386/bin/auth/secstored - 775 sys sys 1041971507 193006
+1041971572 3 c 386/bin/auth/secuser - 775 sys sys 1041971508 149458
+1041971572 4 c acme/mail/386/Mail - 775 sys sys 1041971510 175845
+1041971572 5 c sys/man/1/INDEX - 664 sys sys 1041971548 2895
+1041971572 6 c sys/man/2/INDEX - 664 sys sys 1041971549 20120
+1041971572 7 c sys/man/3/INDEX - 664 sys sys 1041971549 369
+1041971572 8 c sys/man/4/INDEX - 664 sys sys 1041971550 953
+1041971572 9 c sys/man/5/INDEX - 664 sys sys 1041971550 193
+1041971572 10 c sys/man/6/INDEX - 664 sys sys 1041971551 410
+1041971572 11 c sys/man/7/INDEX - 664 sys sys 1041971551 89
+1041971572 12 c sys/man/8/INDEX - 664 sys sys 1041971551 2472
+1041973373 0 c sys/src/9/port/devfs.c - 664 sys sys 1041971958 10698

sys/src/9/port/devfs.c

@@ -20,7 +20,6 @@ enum {
 	Fcat,		// catenation of others
 	Finter,		// interleaving of others
 	Fpart,		// part of others
-	Fconf,		// configuration command, not a device.
 
 	Blksize	= 8*1024,	// for Finter only
 	Maxconf	= 1024,		// max length for config
@@ -65,12 +64,10 @@ static Cmdtab configs[] = {
 	Fcat,	"cat",		0,
 	Finter,	"inter",	0,
 	Fpart,	"part",		5,
-	Fconf,	"config",	3,
 };
 
 static char	confstr[Maxconf];
 static int	configed;
-static int	bootconfig;	// true while configuring from fscfg
 
 
 static Fsdev*
@@ -163,21 +160,6 @@ mpshut(Fsdev *mp)
 	memset(mp, 0, sizeof(*mp));
 }
 
-static void
-wrconf(Fsdev *mp)
-{
-	Chan	*cc;
-
-	cc = mp->idev[0];
-	if (waserror()){
-		print("#k: can't write config\n");
-		nexterror();
-	}
-	devtab[cc->type]->write(cc, confstr, strlen(confstr)+1, 0);
-	mpshut(mp);
-	poperror();
-}
-
 
 static void
 mconfig(char* a, long n)	// "name idev0 idev1"
@@ -191,8 +173,6 @@ mconfig(char* a, long n)	// "name idev0 idev1"
 	char	*c;
 	vlong	size, start;
 
-	size = 0;
-	start = 0;
 	if (confstr[0] == 0)
 		seprint(confstr, confstr+sizeof(confstr), Cfgstr);
 	mp = nil;
@@ -243,10 +223,7 @@ mconfig(char* a, long n)	// "name idev0 idev1"
 			error(Egreg);
 		mp->ndevs++;
 	}
-	if (ct->index == Fconf && !bootconfig)
-		wrconf(mp);
-	else
-		setdsize(mp);
+	setdsize(mp);
 	poperror();
 	configed = 1;
 	qunlock(&lck);
@@ -264,7 +241,6 @@ rdconf(void)
 	char	*e;
 	Chan	*cc;
 
-	bootconfig = 1;
 	s = getconf("fsconfig");
 	if (s == nil){
 		mustrd = 0;
@@ -274,7 +250,6 @@ rdconf(void)
 	cc = nil;
 	c = nil;
 	if (waserror()){
-		bootconfig = 0;
 		configed = 1;
 		if (cc != nil)
 			cclose(cc);
@@ -300,7 +275,6 @@ rdconf(void)
 		mconfig(p, e - p);
 	}
 	poperror();
-	bootconfig = 0;
 	free(s);	
 }
 
@@ -421,6 +395,7 @@ catio(Fsdev *mp, int isread, void *a, long n, vlong off)
 	int	i;
 	Chan*	mc;
 	long	l, wl, res;
+	char*	s;
 	//print("catio %d %p %ld %lld\n", isread, a, n, off);
 	res = n;
 	for (i = 0; n >= 0 && i < mp->ndevs ; i++){
@@ -434,6 +409,7 @@ catio(Fsdev *mp, int isread, void *a, long n, vlong off)
 		else
 			l = n;
 		//print("\tdev %d %p %ld %lld\n", i, a, l, off);
+		s = a;
 
 		if (isread)
 			wl = devtab[mc->type]->read(mc, a, l, off);