diff options
| -rwxr-xr-x | bin/9 | 7 | ||||
| -rw-r--r-- | src/cmd/comm.c | 1 | ||||
| -rw-r--r-- | src/cmd/ed.c | 1 | ||||
| -rw-r--r-- | src/cmd/import.c | 2 | ||||
| -rw-r--r-- | src/libventi/client.c | 2 | ||||
| -rw-r--r-- | src/libventi/file.c | 5 | ||||
| -rw-r--r-- | src/libventi/packet.c | 1 |
7 files changed, 8 insertions, 11 deletions
@@ -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 diff --git a/src/cmd/comm.c b/src/cmd/comm.c index cce02ffc..00cc03b5 100644 --- a/src/cmd/comm.c +++ b/src/cmd/comm.c @@ -93,7 +93,6 @@ main(int argc, char *argv[]) continue; } } - exits(0); } int diff --git a/src/cmd/ed.c b/src/cmd/ed.c index 3af90f6f..0b4be590 100644 --- a/src/cmd/ed.c +++ b/src/cmd/ed.c @@ -758,7 +758,6 @@ gety(void) if(p >= &linebuf[LBSIZE-2]) error(Q); } - return 0; } int diff --git a/src/cmd/import.c b/src/cmd/import.c index f084b8e6..456f663d 100644 --- a/src/cmd/import.c +++ b/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); diff --git a/src/libventi/client.c b/src/libventi/client.c index 772b430f..b06e0fbe 100644 --- a/src/libventi/client.c +++ b/src/libventi/client.c @@ -136,7 +136,7 @@ vtwrite(VtConn *z, uchar score[VtScoreSize], uint type, uchar *buf, int n) { Packet *p; - p = packetforeign(buf, n, nil, nil); + p = packetforeign(buf, n, 0, nil); return vtwritepacket(z, score, type, p); } diff --git a/src/libventi/file.c b/src/libventi/file.c index ac81c2a3..6c151859 100644 --- a/src/libventi/file.c +++ b/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"; diff --git a/src/libventi/packet.c b/src/libventi/packet.c index 98f697cb..3ef1b1df 100644 --- a/src/libventi/packet.c +++ b/src/libventi/packet.c @@ -752,7 +752,6 @@ packetcmp(Packet *pkt0, Packet *pkt1) n1 = FRAGSIZE(f1); } } - return 0; /* for ken */ } |