aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/vac
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2010-12-07 13:34:11 -0500
committerRuss Cox <rsc@swtch.com>2010-12-07 13:34:11 -0500
commit74dd0321756f968c595487f694fbe74ad00f0624 (patch)
treee551d8fbc2c00f8670c0073c1d794dda19cd2ac7 /src/cmd/vac
parentd10a7ed9a899c17d142021298dd45b4ea9ae6b84 (diff)
downloadplan9port-74dd0321756f968c595487f694fbe74ad00f0624.tar.gz
plan9port-74dd0321756f968c595487f694fbe74ad00f0624.tar.bz2
plan9port-74dd0321756f968c595487f694fbe74ad00f0624.zip
delete 9P2000.u
thanks to Erik Quanstrom R=rsc http://codereview.appspot.com/3469042
Diffstat (limited to 'src/cmd/vac')
-rw-r--r--src/cmd/vac/vacfs.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/cmd/vac/vacfs.c b/src/cmd/vac/vacfs.c
index 3edb63bd..231c4164 100644
--- a/src/cmd/vac/vacfs.c
+++ b/src/cmd/vac/vacfs.c
@@ -2,13 +2,6 @@
#include <fcall.h>
#include "vac.h"
-#ifndef PLAN9PORT
-#define convM2Su(a, b, c, d) convM2S(a, b, c)
-#define convS2Mu(a, b, c, d) convS2M(a, b, c)
-#define convM2Du(a, b, c, d) convM2D(a, b, c)
-#define convD2Mu(a, b, c, d) convD2M(a, b, c)
-#endif
-
typedef struct Fid Fid;
enum
@@ -50,7 +43,6 @@ Fcall thdr;
VacFs *fs;
VtConn *conn;
int noperm;
-int dotu;
char *defmnt;
Fid * newfid(int);
@@ -306,10 +298,6 @@ rversion(Fid *unused)
if(strncmp(rhdr.version, "9P2000", 6) != 0)
return vtstrdup("unrecognized 9P version");
thdr.version = "9P2000";
- if(strncmp(rhdr.version, "9P2000.u", 8) == 0){
- dotu = 1;
- thdr.version = "9P2000.u";
- }
return nil;
}
@@ -719,7 +707,7 @@ vacstat(VacFile *parent, VacDir *vd, uchar *p, int np)
dir.gidnum = atoi(vd->gid);
#endif
- ret = convD2Mu(&dir, p, np, dotu);
+ ret = convD2M(&dir, p, np);
#ifdef PLAN9PORT
free(ext);
#endif
@@ -796,7 +784,7 @@ io(void)
n = read9pmsg(mfd[0], mdata, sizeof mdata);
if(n <= 0)
break;
- if(convM2Su(mdata, n, &rhdr, dotu) != n)
+ if(convM2S(mdata, n, &rhdr) != n)
sysfatal("convM2S conversion error");
if(dflag)
@@ -820,9 +808,9 @@ io(void)
thdr.tag = rhdr.tag;
if(dflag)
fprint(2, "vacfs:->%F\n", &thdr);
- n = convS2Mu(&thdr, mdata, messagesize, dotu);
+ n = convS2M(&thdr, mdata, messagesize);
if(n <= BIT16SZ)
- sysfatal("convS2Mu conversion error");
+ sysfatal("convS2M conversion error");
if(err)
vtfree(err);