commit - b7eed2e0e14b980bed4ced80a357189a981d28bc
commit + fb941e08c52162fb41a14732be1ab70f20b450e3
blob - 5acee7e5c19f947dbab2084fd43532f6d613a9b3
blob + 1f13e23fa3b05b965bbbbbceca69300572c3afcc
--- src/lib9/convD2M.c
+++ src/lib9/convD2M.c
#include <fcall.h>
uint
-sizeD2M(Dir *d)
+sizeD2Mu(Dir *d, int dotu)
{
- char *sv[4];
- int i, ns;
+ char *sv[5];
+ int i, ns, nstr, fixlen;
sv[0] = d->name;
sv[1] = d->uid;
sv[2] = d->gid;
sv[3] = d->muid;
-
+
+ fixlen = STATFIXLEN;
+ nstr = 4;
+ if(dotu){
+ fixlen = STATFIXLENU;
+ sv[4] = d->ext;
+ nstr = 5;
+ }
+
ns = 0;
- for(i = 0; i < 4; i++)
+ for(i = 0; i < nstr; i++)
if(sv[i])
ns += strlen(sv[i]);
- return STATFIXLEN + ns;
+ return fixlen + ns;
}
uint
-convD2M(Dir *d, uchar *buf, uint nbuf)
+sizeD2M(Dir *d)
{
+ return sizeD2Mu(d, 0);
+}
+
+uint
+convD2Mu(Dir *d, uchar *buf, uint nbuf, int dotu)
+{
uchar *p, *ebuf;
- char *sv[4];
- int i, ns, nsv[4], ss;
+ char *sv[5];
+ int i, ns, nsv[4], ss, nstr, fixlen;
if(nbuf < BIT16SZ)
return 0;
sv[2] = d->gid;
sv[3] = d->muid;
+ fixlen = STATFIXLEN;
+ nstr = 4;
+ if(dotu){
+ fixlen = STATFIXLENU;
+ sv[4] = d->ext;
+ nstr = 5;
+ }
+
ns = 0;
- for(i = 0; i < 4; i++){
+ for(i = 0; i < nstr; i++){
if(sv[i])
nsv[i] = strlen(sv[i]);
else
ns += nsv[i];
}
- ss = STATFIXLEN + ns;
+ ss = fixlen + ns;
/* set size befor erroring, so user can know how much is needed */
/* note that length excludes count field itself */
PBIT64(p, d->length);
p += BIT64SZ;
- for(i = 0; i < 4; i++){
+ for(i = 0; i < nstr; i++){
ns = nsv[i];
if(p + ns + BIT16SZ > ebuf)
return 0;
memmove(p, sv[i], ns);
p += ns;
}
+
+ if(dotu){
+ PBIT32(p, d->uidnum);
+ p += BIT32SZ;
+ PBIT32(p, d->gidnum);
+ p += BIT32SZ;
+ PBIT32(p, d->muidnum);
+ p += BIT32SZ;
+ }
if(ss != p - buf)
return 0;
return p - buf;
}
+
+uint
+convD2M(Dir *d, uchar *buf, uint nbuf)
+{
+ return convD2Mu(d, buf, nbuf, 0);
+}
blob - 6f4b4bd935bef68910883fe15680609ff24489f0
blob + ee4914946d4c5379e6a63e83e6f9fc704a990541
--- src/lib9/convM2D.c
+++ src/lib9/convM2D.c
#include <fcall.h>
int
-statcheck(uchar *buf, uint nbuf)
+statchecku(uchar *buf, uint nbuf, int dotu)
{
uchar *ebuf;
- int i;
+ int i, nstr;
ebuf = buf + nbuf;
buf += STATFIXLEN - 4 * BIT16SZ;
- for(i = 0; i < 4; i++){
+ nstr = 4;
+ if(dotu)
+ nstr = 5;
+ for(i = 0; i < nstr; i++){
if(buf + BIT16SZ > ebuf)
return -1;
buf += BIT16SZ + GBIT16(buf);
}
+ if(dotu)
+ buf += 3*BIT32SZ;
+
if(buf != ebuf)
return -1;
static char nullstring[] = "";
uint
-convM2D(uchar *buf, uint nbuf, Dir *d, char *strs)
+convM2Du(uchar *buf, uint nbuf, Dir *d, char *strs, int dotu)
{
uchar *p, *ebuf;
- char *sv[4];
- int i, ns;
+ char *sv[5];
+ int i, ns, nstr;
if(nbuf < STATFIXLEN)
return 0;
d->length = GBIT64(p);
p += BIT64SZ;
- for(i = 0; i < 4; i++){
+ nstr = 4;
+ if(dotu)
+ nstr = 5;
+ for(i = 0; i < nstr; i++){
if(p + BIT16SZ > ebuf)
return 0;
ns = GBIT16(p);
p += ns;
}
+ if(dotu){
+ if(p + BIT32SZ*3 > ebuf)
+ return 0;
+ d->uidnum = GBIT32(p);
+ p += BIT32SZ;
+ d->gidnum = GBIT32(p);
+ p += BIT32SZ;
+ d->muidnum = GBIT32(p);
+ p += BIT32SZ;
+ }
+
if(strs){
d->name = sv[0];
d->uid = sv[1];
d->gid = sv[2];
d->muid = sv[3];
+ d->ext = nullstring;
+ if(dotu)
+ d->ext = sv[4];
}else{
d->name = nullstring;
d->uid = nullstring;
d->gid = nullstring;
d->muid = nullstring;
+ d->ext = nullstring;
}
return p - buf;
}
+
+uint
+convM2D(uchar *buf, uint nbuf, Dir *d, char *strs)
+{
+ return convM2Du(buf, nbuf, d, strs, 0);
+}
blob - 920775ea12606a6f99ea8adf3823349d454cc009
blob + 23b688ab36d98764716f4af4d75828493135e93d
--- src/lib9/convM2S.c
+++ src/lib9/convM2S.c
* to test at end of routine.
*/
uint
-convM2S(uchar *ap, uint nap, Fcall *f)
+convM2Su(uchar *ap, uint nap, Fcall *f, int dotu)
{
uchar *p, *ep;
uint i, size;
case Rerror:
p = gstring(p, ep, &f->ename);
+ f->errornum = 0;
+ if(dotu){
+ if(p+BIT16SZ > ep)
+ return 0;
+ f->errornum = GBIT16(p);
+ p += BIT16SZ;
+ }
break;
case Rflush:
return size;
return 0;
}
+
+uint
+convM2S(uchar *ap, uint nap, Fcall *f)
+{
+ return convM2Su(ap, nap, f, 0);
+}
blob - 6e9d2719270832bb2d985b0475197eacc8939290
blob + c004babc38b3efb8fd550eebb94e0621a1279f79
--- src/lib9/convS2M.c
+++ src/lib9/convS2M.c
}
uint
-sizeS2M(Fcall *f)
+sizeS2Mu(Fcall *f, int dotu)
{
uint n;
int i;
case Rerror:
n += stringsz(f->ename);
+ if(dotu)
+ n += BIT16SZ;
break;
case Rflush:
}
uint
-convS2M(Fcall *f, uchar *ap, uint nap)
+sizeS2M(Fcall *f)
+{
+ return sizeS2Mu(f, 0);
+}
+
+uint
+convS2Mu(Fcall *f, uchar *ap, uint nap, int dotu)
{
uchar *p;
uint i, size;
case Rerror:
p = pstring(p, f->ename);
+ if(dotu){
+ PBIT16(p, f->errornum);
+ p += BIT16SZ;
+ }
break;
case Rflush:
return 0;
return size;
}
+
+uint
+convS2M(Fcall *f, uchar *ap, uint nap)
+{
+ return convS2Mu(f, ap, nap, 0);
+}