commit - 2b3b1e8984849541761d0272ba1ad376f5f5a82b
commit + 0dc9950215f761f20a7c45e20ac14ce5e0a4ae10
blob - 33b0d89cd0936db4637753f2f37b4e8cb5eb5ed4
blob + 04a942afda369b5b7a9e47d31a90146849bdeb75
--- bin/9
+++ bin/9
@@ -1,11 +1,14 @@
 #!/bin/sh
 
-export PLAN9=${PLAN9:-/usr/local/plan9}
+PLAN9=${PLAN9:-/usr/local/plan9}
+export PLAN9
+
 case "$PATH" in
 $PLAN9/bin:*)
 	;;
 *)
-	export PATH=$PLAN9/bin:$PATH
+	PATH=$PLAN9/bin:$PATH
+	export PATH
 	;;
 esac
 
blob - cce02ffc674af125ddd60e06ba19e3cef05a54a7
blob + 00cc03b53e49e1d9491acf4d75791cb0c9430d87
--- src/cmd/comm.c
+++ src/cmd/comm.c
@@ -93,7 +93,6 @@ main(int argc, char *argv[])
 			continue;
 		}
 	}
-	exits(0);
 }
 
 int
blob - 3af90f6f95c7e10af25808ba296d0be79d7ceea1
blob + 0b4be5906d93029516c9b45d5696366568566259
--- src/cmd/ed.c
+++ src/cmd/ed.c
@@ -758,7 +758,6 @@ gety(void)
 		if(p >= &linebuf[LBSIZE-2])
 			error(Q);
 	}
-	return 0;
 }
 
 int
blob - f084b8e6cc8c8cf9e79234a1fc6bc560553c57da
blob + 456f663dca1bd4b083134ab912fb880649a80aaf
--- src/cmd/import.c
+++ src/cmd/import.c
@@ -243,7 +243,7 @@ shuffle(void *arg)
 			if(tbuf == nil)
 				tbuf = emalloc(BLEN+1);
 			memmove(tbuf, buf, n);	// because convM2S is destructive
-			if(convM2S(tbuf, n, t) != n)
+			if(convM2S((uchar*)tbuf, n, t) != n)
 				fprint(dfd, "%d->%d convert error in convM2S", fd[0], fd[1]);
 			else
 				fprint(dfd, "%d->%d %F\n", fd[0], fd[1], t);
blob - 772b430f0fb7e18c4fe9e423832c30dd46286f95
blob + b06e0fbee81847389cf9cb1551cd1af5c7a7eea8
--- src/libventi/client.c
+++ src/libventi/client.c
@@ -136,7 +136,7 @@ vtwrite(VtConn *z, uchar score[VtScoreSize], uint type
 {
 	Packet *p;
 
-	p = packetforeign(buf, n, nil, nil);
+	p = packetforeign(buf, n, 0, nil);
 	return vtwritepacket(z, score, type, p);
 }
 
blob - ac81c2a392386d98ed6c3e09d0042eedc9eab13b
blob + 6c151859dc5462df83dc8a58f627dd035e95c12c
--- src/libventi/file.c
+++ src/libventi/file.c
@@ -16,10 +16,7 @@
 #include <libc.h>
 #include <venti.h>
 
-enum
-{
-	MaxBlock = (1UL<<31),
-};
+#define MaxBlock (1UL<<31)
 
 static char EBadEntry[] = "bad VtEntry";
 static char ENotDir[] = "walk in non-directory";
blob - 98f697cb07fed7e6cc1dc4621bcd703ed4588121
blob + 3ef1b1dff85e5c8dd51b634f5d23ed1af85bf21e
--- src/libventi/packet.c
+++ src/libventi/packet.c
@@ -752,7 +752,6 @@ packetcmp(Packet *pkt0, Packet *pkt1)
 			n1 = FRAGSIZE(f1);
 		}
 	}
-	return 0; /* for ken */
 }