Small tweaks to make things build again.

17 files changed, 36 insertions, 40 deletions

diff --git a/src/cmd/9p.c b/src/cmd/9p.c
index e9481746..16fa2027 100644
--- a/src/cmd/9p.c
+++ b/src/cmd/9p.c
@@ -2,6 +2,7 @@
 #include <libc.h>
 #include <fcall.h>
 #include <fs.h>
+#include <thread.h>
 
 char *addr;
 
@@ -40,7 +41,7 @@ struct {
 };
 
 void
-main(int argc, char **argv)
+threadmain(int argc, char **argv)
 {
 	char *cmd;
 	int i;
@@ -60,7 +61,7 @@ main(int argc, char **argv)
 	for(i=0; i<nelem(cmds); i++){
 		if(strcmp(cmds[i].s, cmd) == 0){
 			cmds[i].f(argc, argv);
-			exits(0);
+			threadexitsall(0);
 		}
 	}
 	usage();	
diff --git a/src/cmd/9pserve.c b/src/cmd/9pserve.c
index 16fca61e..4263f035 100644
--- a/src/cmd/9pserve.c
+++ b/src/cmd/9pserve.c
@@ -750,7 +750,7 @@ inputthread(void *arg)
 			sendq(m->c->outq, m);
 	}
 	closeioproc(io);
-	fprint(2, "input eof\n");
+	//fprint(2, "input eof\n");
 	threadexitsall(0);
 }
 
diff --git a/src/cmd/9term/mkfile b/src/cmd/9term/mkfile
index 2706dda6..b39d2367 100644
--- a/src/cmd/9term/mkfile
+++ b/src/cmd/9term/mkfile
@@ -9,5 +9,5 @@ OFILES=\
 
 <$PLAN9/src/mkone
 
-LDFLAGS=-lframe -ldraw -lplumb -lfs -lmux -lthread -l9 -lfmt -lutf -L$X11/lib -lX11 -lutil
+LDFLAGS=-lframe -ldraw -lplumb -lfs -lmux -lthread -l9 -L$X11/lib -lX11 -lutil
 
diff --git a/src/cmd/dict/mkfile b/src/cmd/dict/mkfile
index 62b28be2..f5b9e1a2 100644
--- a/src/cmd/dict/mkfile
+++ b/src/cmd/dict/mkfile
@@ -11,7 +11,7 @@ OFILES=dict.$O\
 
 HFILES=dict.h kuten.h
 
-LDFLAGS=$LDFLAGS -lbio -l9 -lregexp9 -lfmt -lutf
+LDFLAGS=$LDFLAGS -lbio -lregexp9 -l9
 <$PLAN9/src/mkone
 
 mkindex: mkindex.$O $LFILES utils.$O
diff --git a/src/cmd/diff/mkfile b/src/cmd/diff/mkfile
index 316bdbdb..042bd7a0 100644
--- a/src/cmd/diff/mkfile
+++ b/src/cmd/diff/mkfile
@@ -12,4 +12,4 @@ HFILES=diff.h
 
 <$PLAN9/src/mkone
 
-LDFLAGS=$LDFLAGS -lbio -l9 -lfmt -lutf
+LDFLAGS=$LDFLAGS -lbio -l9
diff --git a/src/cmd/hoc/mkfile b/src/cmd/hoc/mkfile
index 60560033..a226a5e8 100644
--- a/src/cmd/hoc/mkfile
+++ b/src/cmd/hoc/mkfile
@@ -17,4 +17,4 @@ YFILES=hoc.y\
 
 <$PLAN9/src/mkone
 
-LDFLAGS=$LDFLAGS -lbio -l9 -lfmt -lutf
+LDFLAGS=$LDFLAGS -lbio -l9
diff --git a/src/cmd/mk/mkfile b/src/cmd/mk/mkfile
index e755629b..dca7c9d4 100644
--- a/src/cmd/mk/mkfile
+++ b/src/cmd/mk/mkfile
@@ -31,7 +31,7 @@ HFILES=\
 	mk.h\
 	fns.h\
 
-LDFLAGS=$LDFLAGS -lregexp9 -lbio -lfmt -lutf
+LDFLAGS=$LDFLAGS -lregexp9 -lbio -l9
 
 <$PLAN9/src/mkone
 
diff --git a/src/cmd/mkfile b/src/cmd/mkfile
index 6e4c218b..dbdc1ed4 100644
--- a/src/cmd/mkfile
+++ b/src/cmd/mkfile
@@ -2,7 +2,7 @@ PLAN9=../..
 <$PLAN9/src/mkhdr
 
 TARG=`ls *.c | sed 's/\.c//'`
-LDFLAGS=$LDFLAGS -lthread -lsec -lfs -lmux -lregexp9 -lbio -l9
+LDFLAGS=$LDFLAGS -lsec -lfs -lmux -lregexp9 -lthread -lbio -l9
 
 <$PLAN9/src/mkmany
 
diff --git a/src/cmd/plumb/fsys.c b/src/cmd/plumb/fsys.c
index 912e5ca0..4776d127 100644
--- a/src/cmd/plumb/fsys.c
+++ b/src/cmd/plumb/fsys.c
@@ -195,7 +195,7 @@ startfsys(void)
 	if(post9pservice(p[1], "plumb") < 0)
 		sysfatal("post9pservice plumb: %r");
 	close(p[1]);
-	proccreate(fsysproc, nil, Stack);
+	threadcreate(fsysproc, nil, Stack);
 }
 
 static void
@@ -213,14 +213,14 @@ fsysproc(void *v)
 		if(buf == nil)
 			error("malloc failed: %r");
 		qlock(&readlock);
-		n = read9pmsg(srvfd, buf, messagesize);
+		n = threadread9pmsg(srvfd, buf, messagesize);
 		if(n <= 0){
 			if(n < 0)
 				error("i/o error on server channel");
 			threadexitsall("unmounted");
 		}
 		if(readlock.head == nil)	/* no other processes waiting to read; start one */
-			proccreate(fsysproc, nil, Stack);
+			threadcreate(fsysproc, nil, Stack);
 		qunlock(&readlock);
 		if(t == nil)
 			t = emalloc(sizeof(Fcall));
diff --git a/src/cmd/plumb/match.c b/src/cmd/plumb/match.c
index dc1abbb1..5a4cd88c 100644
--- a/src/cmd/plumb/match.c
+++ b/src/cmd/plumb/match.c
@@ -431,7 +431,7 @@ execproc(void *v)
 	av = v;
 	stackargv(av, args, argc);
 	free(av);
-	procexec(nil, fd, args[0], args);
+	threadexec(nil, fd, args[0], args);
 	threadexits("can't exec");
 }
 
@@ -458,6 +458,6 @@ Found:
 	argv = buildargv(rs->act[i]->arg, e);
 	if(argv[0] == nil)
 		return "empty argument list";
-	proccreate(execproc, argv, EXECSTACK);
+	threadcreate(execproc, argv, EXECSTACK);
 	return nil;
 }
diff --git a/src/cmd/plumb/mkfile b/src/cmd/plumb/mkfile
index 6550387f..81494416 100644
--- a/src/cmd/plumb/mkfile
+++ b/src/cmd/plumb/mkfile
@@ -14,4 +14,4 @@ $PLUMB:		$HFILES
 $O.plumb:	$PLUMB
 $O.plumber:	$PLUMBER
 
-LDFLAGS=$LDFLAGS -lplumb -lfs -lmux -lthread -lregexp9 -l9 -lbio -lfmt -lutf
+LDFLAGS=$LDFLAGS -lplumb -lfs -lmux -lthread -lregexp9 -lbio -l9
diff --git a/src/cmd/plumb/plumb.c b/src/cmd/plumb/plumb.c
index e0cff912..a10f2c37 100644
--- a/src/cmd/plumb/plumb.c
+++ b/src/cmd/plumb/plumb.c
@@ -1,6 +1,7 @@
 #include <u.h>
 #include <libc.h>
 #include <plumb.h>
+#include <thread.h>
 
 char *plumbfile = nil;
 Plumbmsg m;
@@ -36,7 +37,7 @@ gather(void)
 }
 
 void
-main(int argc, char *argv[])
+threadmain(int argc, char *argv[])
 {
 	char buf[1024], *p;
 	int fd, i, input;
@@ -115,5 +116,5 @@ main(int argc, char *argv[])
 			exits("error");
 		}
 	}
-	exits(nil);
+	threadexitsall(nil);
 }
diff --git a/src/cmd/plumb/plumber.c b/src/cmd/plumb/plumber.c
index 424469f2..ae45f933 100644
--- a/src/cmd/plumb/plumber.c
+++ b/src/cmd/plumb/plumber.c
@@ -26,23 +26,10 @@ makeports(Ruleset *rules[])
 }
 
 void
-mainproc(void *v)
-{
-	Channel *c;
-
-	c = v;
-	printerrors = 0;
-	makeports(rules);
-	startfsys();
-	sendp(c, nil);
-}
-
-void
 threadmain(int argc, char *argv[])
 {
 	char buf[512];
 	int fd;
-	Channel *c;
 
 	progname = "plumber";
 
@@ -79,11 +66,18 @@ threadmain(int argc, char *argv[])
 	 * Start all processes and threads from other proc
 	 * so we (main pid) can return to user.
 	 */
-	c = chancreate(sizeof(void*), 0);
-	proccreate(mainproc, c, 8192);
-	recvp(c);
-	chanfree(c);
-	threadexits(nil);
+	switch(fork()){
+	case -1:
+		sysfatal("fork: %r");
+	case 0:
+		break;
+	default:
+		_exit(0);
+	}
+
+	printerrors = 0;
+	makeports(rules);
+	startfsys();
 }
 
 void
diff --git a/src/cmd/rc/mkfile b/src/cmd/rc/mkfile
index cc476973..38b84404 100644
--- a/src/cmd/rc/mkfile
+++ b/src/cmd/rc/mkfile
@@ -31,7 +31,7 @@ HFILES=\
 
 YFILES=syn.y
 
-LDFLAGS=$LDFLAGS -l9 -lfmt -lutf
+LDFLAGS=$LDFLAGS -l9
 
 <$PLAN9/src/mkone
 
diff --git a/src/cmd/rc/syn.y b/src/cmd/rc/syn.y
index 38a01036..c7de3531 100644
--- a/src/cmd/rc/syn.y
+++ b/src/cmd/rc/syn.y
@@ -7,7 +7,7 @@
 %left BANG SUBSHELL
 %left PIPE
 %left '^'
-%right '$' COUNT '\"'
+%right '$' COUNT '"'
 %left SUB
 %{
 #include "rc.h"
diff --git a/src/cmd/sam/mkfile b/src/cmd/sam/mkfile
index 280edee1..febebc5e 100644
--- a/src/cmd/sam/mkfile
+++ b/src/cmd/sam/mkfile
@@ -28,6 +28,6 @@ HFILES=sam.h\
 	errors.h\
 	mesg.h\
 
-LDFLAGS=$LDFLAGS -l9 -lfmt -lutf
+LDFLAGS=$LDFLAGS -l9
 
 <$PLAN9/src/mkone
diff --git a/src/cmd/samterm/mkfile b/src/cmd/samterm/mkfile
index ba64daf0..9aea7a98 100644
--- a/src/cmd/samterm/mkfile
+++ b/src/cmd/samterm/mkfile
@@ -22,8 +22,8 @@ HFILES=\
 	$PLAN9/include/draw.h\
 
 CFLAGS=$CFLAGS -I../sam
-LDFLAGS=$LDFLAGS -lframe -ldraw -lthread -l9 -lregexp9 \
-	-lbio -lfmt -lutf -L$X11/lib -lX11 -lm
+LDFLAGS=$LDFLAGS -lframe -ldraw -lthread -lregexp9 \
+	-lbio -l9 -L$X11/lib -lX11 -lm
 
 o.samterm: $PLAN9/lib/libframe.a $PLAN9/lib/libdraw.a $PLAN9/lib/libthread.a