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

9p2000.u

Browse source
This commit is contained in:
rsc 2006-01-27 03:46:07 +00:00
parent 8d5a7808a3
commit 90c892d867
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib9p/dirread.c
View file

@ -25,7 +25,7 @@ dirread9p(Req *r, Dirgen *gen, void *aux)
memset(&d, 0, sizeof d); memset(&d, 0, sizeof d);
if((*gen)(start, &d, aux) < 0) if((*gen)(start, &d, aux) < 0)
break; break;
rv = convD2M(&d, p, ep-p); rv = convD2M(&d, p, ep-p, r->srv->dotu);
free(d.name); free(d.name);
free(d.muid); free(d.muid);
free(d.uid); free(d.uid);

22
src/lib9p/srv.c
View file

@ -68,7 +68,7 @@ getreq(Srv *s)
memmove(buf, s->rbuf, n); memmove(buf, s->rbuf, n);
qunlock(&s->rlock); qunlock(&s->rlock);
if(convM2S(buf, n, &f) != n){ if(convM2Su(buf, n, &f, s->dotu) != n){
free(buf); free(buf);
return nil; return nil;
} }
@ -173,7 +173,13 @@ sversion(Srv *srv, Req *r)
return; return;
} }
r->ofcall.version = "9P2000"; if(strncmp(r->ifcall.version, "9P2000.u", 8) == 0){
r->ofcall.version = "9P2000.u";
srv->dotu = 1;
}else{
r->ofcall.version = "9P2000";
srv->dotu = 0;
}
r->ofcall.msize = r->ifcall.msize; r->ofcall.msize = r->ifcall.msize;
respond(r, nil); respond(r, nil);
} }
@ -624,8 +630,8 @@ rstat(Req *r, char *error)
if(error) if(error)
return; return;
if(convD2M(&r->d, tmp, BIT16SZ) != BIT16SZ){ if(convD2Mu(&r->d, tmp, BIT16SZ, r->srv->dotu) != BIT16SZ){
r->error = "convD2M(_,_,BIT16SZ) did not return BIT16SZ"; r->error = "convD2Mu(_,_,BIT16SZ,_) did not return BIT16SZ";
return; return;
} }
n = GBIT16(tmp)+BIT16SZ; n = GBIT16(tmp)+BIT16SZ;
@ -634,10 +640,10 @@ rstat(Req *r, char *error)
r->error = "out of memory"; r->error = "out of memory";
return; return;
} }
r->ofcall.nstat = convD2M(&r->d, statbuf, n); r->ofcall.nstat = convD2Mu(&r->d, statbuf, n, r->srv->dotu);
r->ofcall.stat = statbuf; /* freed in closereq */ r->ofcall.stat = statbuf; /* freed in closereq */
if(r->ofcall.nstat <= BIT16SZ){ if(r->ofcall.nstat <= BIT16SZ){
r->error = "convD2M fails"; r->error = "convD2Mu fails";
free(statbuf); free(statbuf);
return; return;
} }
@ -654,7 +660,7 @@ swstat(Srv *srv, Req *r)
respond(r, Enowstat); respond(r, Enowstat);
return; return;
} }
if(convM2D(r->ifcall.stat, r->ifcall.nstat, &r->d, (char*)r->ifcall.stat) != r->ifcall.nstat){ if(convM2Du(r->ifcall.stat, r->ifcall.nstat, &r->d, (char*)r->ifcall.stat, srv->dotu) != r->ifcall.nstat){
respond(r, Ebaddir); respond(r, Ebaddir);
return; return;
} }
@ -787,7 +793,7 @@ if(chatty9p)
fprint(2, "-%d-> %F\n", srv->outfd, &r->ofcall); fprint(2, "-%d-> %F\n", srv->outfd, &r->ofcall);
qlock(&srv->wlock); qlock(&srv->wlock);
n = convS2M(&r->ofcall, srv->wbuf, srv->msize); n = convS2Mu(&r->ofcall, srv->wbuf, srv->msize, srv->dotu);
if(n <= 0){ if(n <= 0){
fprint(2, "n = %d %F\n", n, &r->ofcall); fprint(2, "n = %d %F\n", n, &r->ofcall);
abort(); abort();