cwfs: fix race between cmd_exec("users") and serve processes, cleanup portfns.h

3 files changed, 7 insertions, 12 deletions

diff --git a/sys/src/cmd/cwfs/con.c b/sys/src/cmd/cwfs/con.c
index 41fe43142..a58b0b52e 100644
--- a/sys/src/cmd/cwfs/con.c
+++ b/sys/src/cmd/cwfs/con.c
@@ -6,7 +6,6 @@ static	char	statsdef[20];	/* default stats list */
 static	int	whoflag;
 
 static	void	consserve1(void *);
-static	void	installcmds(void);
 
 void
 consserve(void)
@@ -14,12 +13,7 @@ consserve(void)
 	int i;
 
 	strncpy(cons.chan->whochan, "console", sizeof(cons.chan->whochan));
-	installcmds();
 	con_session();
-	cmd_exec("cfs");
-	cmd_exec("users");
-	cmd_exec("version");
-
 	for(i = 0; command[i].arg0; i++)
 		if(strcmp("cwcmd", command[i].arg0) == 0){
 			cmd_exec("cwcmd touchsb");
@@ -750,7 +744,7 @@ cmd_chatty(int argc, char *argv[])
 	chatty = atoi(argv[1]);
 }
 
-static void
+void
 installcmds(void)
 {
 	cmd_install("allow", "-- disable permission checking", cmd_allow);
diff --git a/sys/src/cmd/cwfs/main.c b/sys/src/cmd/cwfs/main.c
index de545a71b..3d37a5467 100644
--- a/sys/src/cmd/cwfs/main.c
+++ b/sys/src/cmd/cwfs/main.c
@@ -373,6 +373,11 @@ main(int argc, char **argv)
 	sysinit();
 	srvinit();
 
+	installcmds();
+	cmd_exec("cfs");
+	cmd_exec("users");
+	cmd_exec("version");
+
 	/*
 	 * post filedescriptors to /srv
 	 */
diff --git a/sys/src/cmd/cwfs/portfns.h b/sys/src/cmd/cwfs/portfns.h
index 5f5cda257..0df246584 100644
--- a/sys/src/cmd/cwfs/portfns.h
+++ b/sys/src/cmd/cwfs/portfns.h
@@ -9,7 +9,6 @@ int	authwrite(File*, uchar*, int);
 void	cdiag(char*, int);
 int	cnumb(void);
 Device*	config(void);
-int	rawchar(int);
 Off	bufalloc(Device*, int, long, int);
 void	buffree(Device*, Off, int, Truncstate *);
 int	byuid(void*, void*);
@@ -30,9 +29,7 @@ int	cksum(void*, int, int);
 int	cksum0(int, int);
 void	cyclstart(void);
 void	dotrace(int);
-int	conschar(void);
-void	consinit(void (*)(char*, int));
-void	consstart(int);
+void	installcmds(void);
 void	consserve(void);
 int	conslock(void);
 int	con_attach(int, char*, char*);
@@ -92,7 +89,6 @@ void	fwormream(Device*);
 void	fworminit(Device*);
 int	fwormread(Device*, Off, void*);
 int	fwormwrite(Device*, Off, void*);
-char*	getauthlist(void);
 Iobuf*	getbuf(Device*, Off, int);
 char*	getwrd(char*, char*);
 int	getc(void);