tstupid sun - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 0dc9950215f761f20a7c45e20ac14ce5e0a4ae10
(DIR) parent 2b3b1e8984849541761d0272ba1ad376f5f5a82b
(HTM) Author: rsc <devnull@localhost>
Date: Fri, 14 Jan 2005 18:21:12 +0000
stupid sun
Diffstat:
M bin/9 | 7 +++++--
M src/cmd/comm.c | 1 -
M src/cmd/ed.c | 1 -
M src/cmd/import.c | 2 +-
M src/libventi/client.c | 2 +-
M src/libventi/file.c | 5 +----
M src/libventi/packet.c | 1 -
7 files changed, 8 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/bin/9 b/bin/9
t@@ -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
(DIR) diff --git a/src/cmd/comm.c b/src/cmd/comm.c
t@@ -93,7 +93,6 @@ main(int argc, char *argv[])
continue;
}
}
- exits(0);
}
int
(DIR) diff --git a/src/cmd/ed.c b/src/cmd/ed.c
t@@ -758,7 +758,6 @@ gety(void)
if(p >= &linebuf[LBSIZE-2])
error(Q);
}
- return 0;
}
int
(DIR) diff --git a/src/cmd/import.c b/src/cmd/import.c
t@@ -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);
(DIR) diff --git a/src/libventi/client.c b/src/libventi/client.c
t@@ -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);
}
(DIR) diff --git a/src/libventi/file.c b/src/libventi/file.c
t@@ -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";
(DIR) diff --git a/src/libventi/packet.c b/src/libventi/packet.c
t@@ -752,7 +752,6 @@ packetcmp(Packet *pkt0, Packet *pkt1)
n1 = FRAGSIZE(f1);
}
}
- return 0; /* for ken */
}