Plan 9 from Bell Labs 2004-12-29

dist/replica/_plan9.db

@@ -71,7 +71,7 @@
 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 1104121969 189231
+386/bin/auth/secstore - 775 sys sys 1104206870 189563
 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
@@ -5493,7 +5493,7 @@ sys/src/9/port/devroot.c - 664 sys sys 1067722764 4254
 sys/src/9/port/devsd.c - 664 sys sys 1071245428 28564
 sys/src/9/port/devsdp.c - 664 sys sys 1057323393 44800
 sys/src/9/port/devsegment.c - 664 sys sys 1017679394 9600
-sys/src/9/port/devsrv.c - 664 sys sys 1086406908 5198
+sys/src/9/port/devsrv.c - 664 sys sys 1104243965 5149
 sys/src/9/port/devssl.c - 664 sys sys 1045063590 26100
 sys/src/9/port/devtinyfs.c - 664 sys sys 1015278339 15347
 sys/src/9/port/devtls.c - 664 sys sys 1086406907 45225
@@ -12449,4 +12449,6 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 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/bin/auth/secstore - 775 sys sys 1104206870 189563
+386/9pc - 775 sys sys 1104294668 1833476
+386/9pccpu - 775 sys sys 1104294673 1488469
+386/9pcdisk - 775 sys sys 1104294683 1908736

dist/replica/plan9.db

@@ -3,11 +3,11 @@
 386/9loaddebug - 775 sys sys 1104122096 306647
 386/9loadlite - 775 sys sys 1100269949 132260
 386/9loadlitedebug - 775 sys sys 1104122096 195560
-386/9pc - 775 sys sys 1104122101 1833519
+386/9pc - 775 sys sys 1104294668 1833476
 386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1104122104 1488512
+386/9pccpu - 775 sys sys 1104294673 1488469
 386/9pccpu.gz - 664 sys sys 1077049387 519909
-386/9pcdisk - 775 sys sys 1104122109 2038973
+386/9pcdisk - 775 sys sys 1104294683 1908736
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
 386/9pcf - 775 sys sys 1104122114 2372064
 386/9pcf.gz - 664 sys sys 1077049490 872650
@@ -5493,7 +5493,7 @@ sys/src/9/port/devroot.c - 664 sys sys 1067722764 4254
 sys/src/9/port/devsd.c - 664 sys sys 1071245428 28564
 sys/src/9/port/devsdp.c - 664 sys sys 1057323393 44800
 sys/src/9/port/devsegment.c - 664 sys sys 1017679394 9600
-sys/src/9/port/devsrv.c - 664 sys sys 1086406908 5198
+sys/src/9/port/devsrv.c - 664 sys sys 1104243965 5149
 sys/src/9/port/devssl.c - 664 sys sys 1045063590 26100
 sys/src/9/port/devtinyfs.c - 664 sys sys 1015278339 15347
 sys/src/9/port/devtls.c - 664 sys sys 1086406907 45225

dist/replica/plan9.log

@@ -18182,3 +18182,7 @@
 1104123642 407 c acme/mail/386/Mail - 775 sys sys 1104122116 178712
 1104177652 0 c sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1104176417 12526
 1104208257 0 c 386/bin/auth/secstore - 775 sys sys 1104206870 189563
+1104244265 0 c sys/src/9/port/devsrv.c - 664 sys sys 1104243965 5149
+1104294674 0 c 386/9pc - 775 sys sys 1104294668 1833476
+1104294674 1 c 386/9pccpu - 775 sys sys 1104294673 1488469
+1104294674 2 c 386/9pcdisk - 775 sys sys 1104294683 1908736

sys/src/9/port/devsrv.c

@@ -147,7 +147,7 @@ srvcreate(Chan *c, char *name, int omode, ulong perm)
 	if(omode & OCEXEC)	/* can't happen */
 		panic("someone broke namec");
 
-	sp = malloc(sizeof(Srv));
+	sp = malloc(sizeof(Srv)+strlen(name)+1);
 	if(sp == 0)
 		error(Enomem);
 
@@ -162,14 +162,14 @@ srvcreate(Chan *c, char *name, int omode, ulong perm)
 
 	sp->path = qidpath++;
 	sp->link = srv;
+	sp->name = (char*)(sp+1);
+	strcpy(sp->name, name);
 	c->qid.type = QTFILE;
 	c->qid.path = sp->path;
 	srv = sp;
 	qunlock(&srvlk);
 	poperror();
 
-	sp->name = smalloc(strlen(name)+1);
-	strcpy(sp->name, name);
 	kstrdup(&sp->owner, up->user);
 	sp->perm = perm&0777;
 
@@ -209,10 +209,6 @@ srvremove(Chan *c)
 
 	if(sp->chan)
 		cclose(sp->chan);
-	if(sp->name){
-		free(sp->name);
-		sp->name = nil;
-	}
 	free(sp);
 }