diff options
Diffstat (limited to 'lib/fuse.c')
| -rw-r--r-- | lib/fuse.c | 26 |
1 files changed, 15 insertions, 11 deletions
@@ -3455,6 +3455,11 @@ static int fill_dir(void *dh_, const char *name, const struct stat *statp, if (off) { size_t newlen; + if (dh->filled) { + dh->error = -EIO; + return 1; + } + if (dh->first) { dh->error = -EIO; return 1; @@ -3463,7 +3468,6 @@ static int fill_dir(void *dh_, const char *name, const struct stat *statp, if (extend_contents(dh, dh->needlen) == -1) return 1; - dh->filled = 0; newlen = dh->len + fuse_add_direntry(dh->req, dh->contents + dh->len, dh->needlen - dh->len, name, @@ -3473,10 +3477,8 @@ static int fill_dir(void *dh_, const char *name, const struct stat *statp, dh->len = newlen; } else { - if (!dh->filled) { - dh->error = -EIO; - return 1; - } + dh->filled = 1; + if (fuse_add_direntry_to_dh(dh, name, &stbuf) == -1) return 1; } @@ -3526,6 +3528,11 @@ static int fill_dir_plus(void *dh_, const char *name, const struct stat *statp, if (off) { size_t newlen; + if (dh->filled) { + dh->error = -EIO; + return 1; + } + if (dh->first) { dh->error = -EIO; return 1; @@ -3533,7 +3540,6 @@ static int fill_dir_plus(void *dh_, const char *name, const struct stat *statp, if (extend_contents(dh, dh->needlen) == -1) return 1; - dh->filled = 0; newlen = dh->len + fuse_add_direntry_plus(dh->req, dh->contents + dh->len, dh->needlen - dh->len, name, @@ -3542,10 +3548,8 @@ static int fill_dir_plus(void *dh_, const char *name, const struct stat *statp, return 1; dh->len = newlen; } else { - if (!dh->filled) { - dh->error = -EIO; - return 1; - } + dh->filled = 1; + if (fuse_add_direntry_to_dh(dh, name, &e.attr) == -1) return 1; } @@ -3588,7 +3592,7 @@ static int readdir_fill(struct fuse *f, fuse_req_t req, fuse_ino_t ino, dh->len = 0; dh->error = 0; dh->needlen = size; - dh->filled = 1; + dh->filled = 0; dh->req = req; fuse_prepare_interrupt(f, req, &d); err = fuse_fs_readdir(f->fs, path, dh, filler, off, fi, flags); |