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

break from readdir properly (Lou Kamenov)

Browse source
This commit is contained in:
rsc 2006-08-01 14:38:30 +00:00
parent be8b4b397a
commit ca6a2d95ac
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -825,24 +825,26 @@ fusereaddir(FuseMsg *m)
p = buf; p = buf;
ep = buf + n; ep = buf + n;
for(;;){ for(;;){
if(ff->nd == 0){ while(ff->nd > 0){
free(ff->d0); if(!canpack(ff->d, ff->off, &p, ep))
ff->d0 = nil; goto out;
ff->d = nil;
if((ff->nd = fsdirread(ff->fid, &ff->d0)) < 0){
replyfuseerrstr(m);
return;
}
if(ff->nd == 0)
break;
ff->d = ff->d0;
}
while(ff->nd > 0 && canpack(ff->d, ff->off, &p, ep)){
ff->off++; ff->off++;
ff->d++; ff->d++;
ff->nd--; ff->nd--;
} }
free(ff->d0);
ff->d0 = nil;
ff->d = nil;
if((ff->nd = fsdirread(ff->fid, &ff->d0)) < 0){
replyfuseerrstr(m);
free(buf);
return;
}
if(ff->nd == 0)
break;
ff->d = ff->d0;
} }
out:
replyfuse(m, buf, p - buf); replyfuse(m, buf, p - buf);
free(buf); free(buf);
} }