t9p: can go back to using write - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit a380a0033d4d5abda7d74d4ae437c806b57412bf
DIR parent cab935a0ba34797d8b75fe1cfb7624a33d25e671
HTML Author: Russ Cox <rsc@swtch.com>
Date: Fri, 4 Jul 2008 12:38:40 -0400
9p: can go back to using write
Diffstat:
M src/cmd/9p.c | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
---
DIR diff --git a/src/cmd/9p.c b/src/cmd/9p.c
t@@ -25,26 +25,6 @@ usage(void)
threadexitsall("usage");
}
-int
-writen(int fd, void *buf, int n)
-{
- int m, tot;
-
- if(n < 0){
- werrstr("bad count");
- return -1;
- }
- if(n == 0)
- return 0;
-
- tot = 0;
- while((m = write(fd, (char*)buf+tot, n-tot)) > 0)
- tot += m;
- if(tot < n)
- return -1;
- return n;
-}
-
CFsys *(*nsmnt)(char*, char*) = nsamount;
CFsys *(*fsmnt)(int, char*) = fsamount;
t@@ -183,7 +163,7 @@ xread(int argc, char **argv)
fid = xopen(argv[0], OREAD);
while((n = fsread(fid, buf, sizeof buf)) > 0)
- if(writen(1, buf, n) < 0)
+ if(write(1, buf, n) < 0)
sysfatal("write error: %r");
fsclose(fid);
if(n < 0)
t@@ -208,7 +188,7 @@ xreadfd(int argc, char **argv)
fd = xopenfd(argv[0], OREAD);
while((n = read(fd, buf, sizeof buf)) > 0)
- if(writen(1, buf, n) < 0)
+ if(write(1, buf, n) < 0)
sysfatal("write error: %r");
if(n < 0)
sysfatal("read error: %r");
t@@ -286,7 +266,7 @@ xwritefd(int argc, char **argv)
fd = xopenfd(argv[0], OWRITE|OTRUNC);
while((n = read(0, buf, sizeof buf)) > 0)
- if(writen(fd, buf, n) != n)
+ if(write(fd, buf, n) != n)
sysfatal("write error: %r");
if(n < 0)
sysfatal("read error: %r");
t@@ -339,7 +319,7 @@ xrdwr(int argc, char **argv)
if((n = fsread(fid, buf, sizeof buf)) < 0)
fprint(2, "read: %r\n");
else{
- if(writen(1, buf, n) < 0 || writen(1, "\n", 1) < 0)
+ if(write(1, buf, n) < 0 || write(1, "\n", 1) < 0)
sysfatal("write error: %r");
}
n = read(0, buf, sizeof buf);