diff options
| author | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-06-06 04:56:50 +0000 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@centraldogma> | 2011-06-06 04:56:50 +0000 |
| commit | 9310110448087364729bafc9c54a553f55395be3 (patch) | |
| tree | 4a4adf8d8eb657d4e953f82cfd86fbed8a6fda88 /sys/src/cmd/9660srv/9660srv.c | |
| parent | 0fda67822715f6b0bfaf257153995048b84a89d2 (diff) | |
fix real cause of iso name truncation
Diffstat (limited to 'sys/src/cmd/9660srv/9660srv.c')
| -rw-r--r-- | sys/src/cmd/9660srv/9660srv.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sys/src/cmd/9660srv/9660srv.c b/sys/src/cmd/9660srv/9660srv.c index 5d4d0309b..37dbd444b 100644 --- a/sys/src/cmd/9660srv/9660srv.c +++ b/sys/src/cmd/9660srv/9660srv.c @@ -569,7 +569,6 @@ rzdir(Xfs *fs, Dir *d, int fmt, Drec *dp) char buf[Maxname+UTFmax+1]; uchar *q; Rune r; - enum { ONAMELEN = 28 }; /* old Plan 9 directory name length */ have = 0; flags = 0; @@ -622,23 +621,23 @@ rzdir(Xfs *fs, Dir *d, int fmt, Drec *dp) * from plan9 directory extension */ nl = *s; - if(nl >= ONAMELEN) - nl = ONAMELEN-1; + if(nl >= Maxname) + nl = Maxname-1; if(nl) { - memset(d->name, 0, ONAMELEN); + memset(d->name, 0, Maxname); memmove(d->name, s+1, nl); } s += 1 + *s; nl = *s; - if(nl >= ONAMELEN) - nl = ONAMELEN-1; - memset(d->uid, 0, ONAMELEN); + if(nl >= Maxname) + nl = Maxname-1; + memset(d->uid, 0, Maxname); memmove(d->uid, s+1, nl); s += 1 + *s; nl = *s; - if(nl >= ONAMELEN) - nl = ONAMELEN-1; - memset(d->gid, 0, ONAMELEN); + if(nl >= Maxname) + nl = Maxname-1; + memset(d->gid, 0, Maxname); memmove(d->gid, s+1, nl); s += 1 + *s; if(((uintptr)s) & 1) |