cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

9pfuse: do not fswalk("..")

Browse source 
f is open, so walk will fail.
The comments say we only need one directory anyway.

Fixes #277.
This commit is contained in:
Russ Cox 2020-01-13 17:07:44 -05:00
parent 1c78140d83
commit fa588406f0
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/cmd/9pfuse/main.c
View file

@ -885,7 +885,7 @@ fusereadlink(FuseMsg *m)
* are stored in m->d,nd,d0. * are stored in m->d,nd,d0.
*/ */
int canpack(Dir*, uvlong, uchar**, uchar*); int canpack(Dir*, uvlong, uchar**, uchar*);
Dir *dotdirs(CFid*); Dir *dotdir(CFid*);
void void
fusereaddir(FuseMsg *m) fusereaddir(FuseMsg *m)
{ {
@ -902,8 +902,8 @@ fusereaddir(FuseMsg *m)
if(in->offset == 0){ if(in->offset == 0){
fsseek(ff->fid, 0, 0); fsseek(ff->fid, 0, 0);
free(ff->d0); free(ff->d0);
ff->d0 = ff->d = dotdirs(ff->fid); ff->d0 = ff->d = dotdir(ff->fid);
ff->nd = 2; ff->nd = 1;
} }
n = in->size; n = in->size;
if(n > fusemaxwrite) if(n > fusemaxwrite)
@ -944,20 +944,13 @@ out:
* We could add .. too, but it isn't necessary. * We could add .. too, but it isn't necessary.
*/ */
Dir* Dir*
dotdirs(CFid *f) dotdir(CFid *f)
{ {
Dir *d; Dir *d;
CFid *f1;
d = emalloc(2*sizeof *d); d = emalloc(1*sizeof *d);
d[0].name = "."; d[0].name = ".";
d[0].qid = fsqid(f); d[0].qid = fsqid(f);
d[1].name = "..";
f1 = fswalk(f, "..");
if(f1){
d[1].qid = fsqid(f1);
fsclose(f1);
}
return d; return d;
} }