Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-23 08:53:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

dll: fuse3: testing

Browse Source
This commit is contained in:
Bill Zissimopoulos 2018-07-25 10:28:33 -07:00
parent 4a653a8bc0
commit 0d819eb800
No known key found for this signature in database
GPG Key ID: 3D4F95D52C7B3EA3
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dll/fuse/fuse_intf.c
View File

@ -1427,7 +1427,8 @@ static NTSTATUS fsp_fuse_intf_SetFileSize(FSP_FILE_SYSTEM *FileSystem,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int fsp_fuse_intf_CanDeleteAddDirInfo(void *buf, const char *name, /* !static: used by fuse2to3 */
int fsp_fuse_intf_CanDeleteAddDirInfo(void *buf, const char *name,
const struct fuse_stat *stbuf, fuse_off_t off) const struct fuse_stat *stbuf, fuse_off_t off)
{ {
struct fuse_dirhandle *dh = buf; struct fuse_dirhandle *dh = buf;

2
src/dll/fuse/library.h
View File

@ -90,6 +90,8 @@ NTSTATUS fsp_fuse_op_enter(FSP_FILE_SYSTEM *FileSystem,
NTSTATUS fsp_fuse_op_leave(FSP_FILE_SYSTEM *FileSystem, NTSTATUS fsp_fuse_op_leave(FSP_FILE_SYSTEM *FileSystem,
FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response); FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_RSP *Response);
int fsp_fuse_intf_CanDeleteAddDirInfo(void *buf, const char *name,
const struct fuse_stat *stbuf, fuse_off_t off);
int fsp_fuse_intf_AddDirInfo(void *buf, const char *name, int fsp_fuse_intf_AddDirInfo(void *buf, const char *name,
const struct fuse_stat *stbuf, fuse_off_t off); const struct fuse_stat *stbuf, fuse_off_t off);

18
src/dll/fuse3/fuse2to3.c
View File

@ -235,6 +235,13 @@ static int fuse2to3_opendir(const char *path, struct fuse_file_info *fi)
return res; return res;
} }
static int fuse2to3_candel_filldir(void *buf, const char *name,
const struct fuse_stat *stbuf, fuse_off_t off,
enum fuse3_fill_dir_flags flags)
{
return fsp_fuse_intf_CanDeleteAddDirInfo(buf, name, 0, off);
}
static int fuse2to3_filldir(void *buf, const char *name, static int fuse2to3_filldir(void *buf, const char *name,
const struct fuse_stat *stbuf, fuse_off_t off, const struct fuse_stat *stbuf, fuse_off_t off,
enum fuse3_fill_dir_flags flags) enum fuse3_fill_dir_flags flags)
@ -251,8 +258,17 @@ static int fuse2to3_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
struct fuse_dirhandle *dh = buf; struct fuse_dirhandle *dh = buf;
struct fuse3_file_info fi3; struct fuse3_file_info fi3;
fuse2to3_fi3from2(&fi3, fi); fuse2to3_fi3from2(&fi3, fi);
int res = f3->ops.readdir(path, buf, &fuse2to3_filldir, off, &fi3, int res;
if (fsp_fuse_intf_CanDeleteAddDirInfo == filler)
res = f3->ops.readdir(path, buf, &fuse2to3_candel_filldir, off, &fi3, 0);
else if (fsp_fuse_intf_AddDirInfo == filler)
res = f3->ops.readdir(path, buf, &fuse2to3_filldir, off, &fi3,
dh->ReaddirPlus ? FUSE_READDIR_PLUS : 0); dh->ReaddirPlus ? FUSE_READDIR_PLUS : 0);
else
{
FspDebugLog("fuse2to3_readdir = -ENOSYS (internal error: unknown filler)\n");
res = -ENOSYS_(f3->fuse->env);
}
fuse2to3_fi2from3(fi, &fi3); fuse2to3_fi2from3(fi, &fi3);
return res; return res;
} }