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

dll: fuse: implementation checkpoint

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-06-02 13:24:44 -07:00
parent 7e1906bad5
commit 6910b67982
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dll/fuse/fuse.c
View File

@ -35,7 +35,6 @@ struct fsp_fuse_core_opt_data
set_uid, uid, set_uid, uid,
set_gid, gid, set_gid, gid,
set_attr_timeout, attr_timeout; set_attr_timeout, attr_timeout;
FILETIME VolumeCreationTime;
int set_FileInfoTimeout; int set_FileInfoTimeout;
int CaseInsensitiveSearch, PersistentAcls, int CaseInsensitiveSearch, PersistentAcls,
ReparsePoints, NamedStreams, ReparsePoints, NamedStreams,
@ -80,9 +79,7 @@ static struct fuse_opt fsp_fuse_core_opts[] =
FSP_FUSE_CORE_OPT("SectorSize=%hu", VolumeParams.SectorSize, 4096), FSP_FUSE_CORE_OPT("SectorSize=%hu", VolumeParams.SectorSize, 4096),
FSP_FUSE_CORE_OPT("SectorsPerAllocationUnit=%hu", VolumeParams.SectorsPerAllocationUnit, 1), FSP_FUSE_CORE_OPT("SectorsPerAllocationUnit=%hu", VolumeParams.SectorsPerAllocationUnit, 1),
FSP_FUSE_CORE_OPT("MaxComponentLength=%hu", VolumeParams.MaxComponentLength, 0), FSP_FUSE_CORE_OPT("MaxComponentLength=%hu", VolumeParams.MaxComponentLength, 0),
FSP_FUSE_CORE_OPT("VolumeCreationTime=%llx", VolumeCreationTime, 0), FSP_FUSE_CORE_OPT("VolumeCreationTime=%lli", VolumeParams.VolumeCreationTime, 0),
FSP_FUSE_CORE_OPT("VolumeCreationTimeLo=%x", VolumeCreationTime.dwLowDateTime, 0),
FSP_FUSE_CORE_OPT("VolumeCreationTimeHi=%x", VolumeCreationTime.dwHighDateTime, 0),
FSP_FUSE_CORE_OPT("VolumeSerialNumber=%lx", VolumeParams.VolumeSerialNumber, 0), FSP_FUSE_CORE_OPT("VolumeSerialNumber=%lx", VolumeParams.VolumeSerialNumber, 0),
FSP_FUSE_CORE_OPT("TransactTimeout=%u", VolumeParams.TransactTimeout, 0), FSP_FUSE_CORE_OPT("TransactTimeout=%u", VolumeParams.TransactTimeout, 0),
FSP_FUSE_CORE_OPT("IrpTimeout=%u", VolumeParams.IrpTimeout, 0), FSP_FUSE_CORE_OPT("IrpTimeout=%u", VolumeParams.IrpTimeout, 0),
@ -281,7 +278,8 @@ static NTSTATUS fsp_fuse_svcstart(FSP_SERVICE *Service, ULONG argc, PWSTR *argv)
fsp_fuse_get_stat_buf(f->env, &buf, &fspbuf); fsp_fuse_get_stat_buf(f->env, &buf, &fspbuf);
if (0 == f->VolumeParams.VolumeCreationTime) if (0 == f->VolumeParams.VolumeCreationTime)
f->VolumeParams.VolumeCreationTime = 0; f->VolumeParams.VolumeCreationTime =
Int32x32To64(fspbuf.st_birthtim.tv_sec, 10000000) + 116444736000000000;
} }
/* the FSD does not currently limit these VolumeParams fields; do so here! */ /* the FSD does not currently limit these VolumeParams fields; do so here! */
@ -467,7 +465,6 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
if (opt_data.help) if (opt_data.help)
return 0; return 0;
opt_data.VolumeParams.VolumeCreationTime = *(PUINT64)&opt_data.VolumeCreationTime;
if (!opt_data.set_FileInfoTimeout && opt_data.set_attr_timeout) if (!opt_data.set_FileInfoTimeout && opt_data.set_attr_timeout)
opt_data.VolumeParams.FileInfoTimeout = opt_data.set_attr_timeout * 1000; opt_data.VolumeParams.FileInfoTimeout = opt_data.set_attr_timeout * 1000;
opt_data.VolumeParams.CaseSensitiveSearch = !opt_data.CaseInsensitiveSearch; opt_data.VolumeParams.CaseSensitiveSearch = !opt_data.CaseInsensitiveSearch;

11
src/dll/fuse/fuse_opt.c
View File

@ -26,16 +26,9 @@
#define fsp_fuse_opt_match_exact ((const char *)1) /* exact option match */ #define fsp_fuse_opt_match_exact ((const char *)1) /* exact option match */
#define fsp_fuse_opt_match_next ((const char *)2) /* option match, value is next arg */ #define fsp_fuse_opt_match_next ((const char *)2) /* option match, value is next arg */
#if defined(_WIN64) static long long strtoint(const char *p, int base, int is_signed)
typedef long long strtoint_result_t;
#else
/* cannot use long long in 32-bit builds because we are missing symbol __allmul */
typedef long strtoint_result_t;
#endif
static strtoint_result_t strtoint(const char *p, int base, int is_signed)
{ {
strtoint_result_t v; long long v;
int maxdig, maxalp, sign = +1; int maxdig, maxalp, sign = +1;
if (is_signed) if (is_signed)

4
tst/winfsp-tests/fuse-opt-test.c
View File

@ -312,11 +312,7 @@ void fuse_opt_parse_test(void)
ASSERT(0 == strcmp("WwWw", data.w)); ASSERT(0 == strcmp("WwWw", data.w));
ASSERT(1 == data.x); ASSERT(1 == data.x);
ASSERT((long)040000000001 == data.y); ASSERT((long)040000000001 == data.y);
#if defined(_WIN64)
ASSERT((long long)0x100000001 == data.z); ASSERT((long long)0x100000001 == data.z);
#else
ASSERT(((long long)0x100000001 & 0xffffffff) == data.z);
#endif
ASSERT(+1234567890 == data.dec); ASSERT(+1234567890 == data.dec);
ASSERT(-1234567890 == data.neg); ASSERT(-1234567890 == data.neg);
ASSERT(0xABCDEF == data.hex); ASSERT(0xABCDEF == data.hex);