o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

delete 9P2000.u

Browse source 
thanks to Erik Quanstrom

R=rsc
http://codereview.appspot.com/3469042
This commit is contained in:
Russ Cox 2010-12-07 13:34:11 -05:00
parent d10a7ed9a8
commit 74dd032175
15 changed files with 64 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib9pclient/dirread.c
View file

@ -7,7 +7,7 @@
#include "fsimpl.h"
static long
dirpackage(uchar *buf, long ts, Dir **d, int dotu)
dirpackage(uchar *buf, long ts, Dir **d)
{
char *s;
long ss, i, n, nn, m;
@ -23,7 +23,7 @@ dirpackage(uchar *buf, long ts, Dir **d, int dotu)
n = 0;
for(i = 0; i < ts; i += m){
m = BIT16SZ + GBIT16(&buf[i]);
if(statchecku(&buf[i], m, dotu) < 0)
if(statcheck(&buf[i], m) < 0)
break;
ss += m;
n++;
@ -43,7 +43,7 @@ dirpackage(uchar *buf, long ts, Dir **d, int dotu)
nn = 0;
for(i = 0; i < ts; i += m){
m = BIT16SZ + GBIT16((uchar*)&buf[i]);
if(nn >= n || convM2Du(&buf[i], m, *d + nn, s, dotu) != m){
if(nn >= n || convM2D(&buf[i], m, *d + nn, s) != m){
free(*d);
*d = nil;
return -1;
@ -66,7 +66,7 @@ fsdirread(CFid *fid, Dir **d)
return -1;
ts = fsread(fid, buf, DIRMAX);
if(ts >= 0)
ts = dirpackage(buf, ts, d, fid->fs->dotu);
ts = dirpackage(buf, ts, d);
free(buf);
return ts;
}
@ -92,9 +92,9 @@ fsdirreadall(CFid *fid, Dir **d)
ts += n;
}
if(ts >= 0){
ts = dirpackage(buf, ts, d, fid->fs->dotu);
ts = dirpackage(buf, ts, d);
if(ts < 0)
werrstr("malformed directory contents [dotu=%d]", fid->fs->dotu);
werrstr("malformed directory contents");
}
free(buf);
if(ts == 0 && n < 0)

10
src/lib9pclient/fs.c
View file

@ -49,14 +49,12 @@ fsinit(int fd)
fs->iosend = ioproc();
muxinit(&fs->mux);
strcpy(fs->version, "9P2000.u");
strcpy(fs->version, "9P2000");
if((n = fsversion(fs, 8192, fs->version, sizeof fs->version)) < 0){
werrstr("fsversion: %r");
_fsunmount(fs);
return nil;
}
if(strcmp(fs->version, "9P2000.u") == 0)
fs->dotu = 1;
fs->msize = n;
return fs;
}
@ -208,7 +206,7 @@ _fsrpc(CFsys *fs, Fcall *tx, Fcall *rx, void **freep)
int n, nn;
void *tpkt, *rpkt;
n = sizeS2Mu(tx, fs->dotu);
n = sizeS2M(tx);
tpkt = malloc(n);
if(freep)
*freep = nil;
@ -217,7 +215,7 @@ _fsrpc(CFsys *fs, Fcall *tx, Fcall *rx, void **freep)
tx->tag = 0;
if(chatty9pclient)
fprint(2, "<- %F\n", tx);
nn = convS2Mu(tx, tpkt, n, fs->dotu);
nn = convS2M(tx, tpkt, n);
if(nn != n){
free(tpkt);
werrstr("lib9pclient: sizeS2M convS2M mismatch");
@ -231,7 +229,7 @@ _fsrpc(CFsys *fs, Fcall *tx, Fcall *rx, void **freep)
return -1;
}
n = GBIT32((uchar*)rpkt);
nn = convM2Su(rpkt, n, rx, fs->dotu);
nn = convM2S(rpkt, n, rx);
if(nn != n){
free(rpkt);
werrstr("lib9pclient: convM2S packet size mismatch %d %d", n, nn);

1
src/lib9pclient/fsimpl.h
View file

@ -14,7 +14,6 @@ void *_fsnbqrecv(Queue*);
struct CFsys
{
char version[20];
int dotu;
int msize;
QLock lk;
int fd;

2
src/lib9pclient/stat.c
View file

@ -42,7 +42,7 @@ fsdirfstat(CFid *fid)
free(freep);
return nil;
}
n = convM2Du(rx.stat, rx.nstat, d, (char*)&d[1], fs->dotu);
n = convM2D(rx.stat, rx.nstat, d, (char*)&d[1]);
free(freep);
if(n != rx.nstat){
free(d);

4
src/lib9pclient/wstat.c
View file

@ -28,11 +28,11 @@ fsdirfwstat(CFid *fid, Dir *d)
int n, nn;
Fcall tx, rx;
n = sizeD2Mu(d, fid->fs->dotu);
n = sizeD2M(d);
a = malloc(n);
if(a == nil)
return -1;
nn = convD2Mu(d, a, n, fid->fs->dotu);
nn = convD2M(d, a, n);
if(n != nn){
werrstr("convD2M and sizeD2M disagree");
free(a);