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

fuse_opt: implementation checkpoint

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-05-29 23:05:54 -07:00
parent a40e7d8c56
commit 74a943d8d7
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,12 +63,12 @@ static long long strtoint(const char *p, const char *endp, int base, int is_sign
int c = *p; int c = *p;
if ('0' <= c && c <= maxdig) if ('0' <= c && c <= maxdig)
v = 10 * v + (c - '0'); v = base * v + (c - '0');
else else
{ {
c |= 0x20; c |= 0x20;
if ('a' <= c && c <= maxalp) if ('a' <= c && c <= maxalp)
v = 10 * v + (c - 'a'); v = base * v + (c - 'a');
else else
break; break;
} }
@ -139,24 +139,38 @@ static const struct fuse_opt *fsp_fuse_opt_find(
static int fsp_fuse_opt_call_proc(void *data, static int fsp_fuse_opt_call_proc(void *data,
fuse_opt_proc_t proc, fuse_opt_proc_t proc,
const char *arg, const char *argend, const char *arg, const char *argend, const char *argl,
int key, int is_opt, int key, int is_opt,
struct fuse_args *outargs, struct fuse_args *outargs,
FSP_FUSE_MEMFN_P) FSP_FUSE_MEMFN_P)
{ {
int result; int result, len0, len1;
char *fullarg = 0;
if (FUSE_OPT_KEY_DISCARD == key) if (FUSE_OPT_KEY_DISCARD == key)
return 0; return 0;
if (0 != argend) if (0 != argend)
len0 = (int)(argend - arg);
else
len0 = lstrlenA(arg);
if (0 != argend || (0 != argl && !(arg <= argl && argl < arg + len0)))
{ {
char *argcopy = memalloc(argend - arg + 1); if (0 != argl && !(arg <= argl && argl < arg + len0))
if (0 == argcopy) len1 = lstrlenA(argl);
else
len1 = 0;
fullarg = memalloc(len0 + len1 + 1);
if (0 == fullarg)
return -1; return -1;
memcpy(argcopy, arg, argend - arg);
argcopy[argend - arg] = '\0'; memcpy(fullarg, arg, len0);
arg = argcopy; memcpy(fullarg + len0, argl, len1);
fullarg[len0 + len1] = '\0';
arg = fullarg;
} }
if (FUSE_OPT_KEY_KEEP != key && 0 != proc) if (FUSE_OPT_KEY_KEEP != key && 0 != proc)
@ -192,8 +206,8 @@ static int fsp_fuse_opt_call_proc(void *data,
} }
exit: exit:
if (0 != argend) if (0 != fullarg)
memfree((void *)arg); /* argcopy */ memfree(fullarg);
return 0; return 0;
} }
@ -209,7 +223,7 @@ static int fsp_fuse_opt_process_arg(void *data,
#define VAR(data, opt, type) *(type *)((char *)(data) + (opt)->offset) #define VAR(data, opt, type) *(type *)((char *)(data) + (opt)->offset)
if (-1L == opt->offset) if (-1L == opt->offset)
return fsp_fuse_opt_call_proc(data, proc, arg, argend, opt->value, is_opt, outargs, return fsp_fuse_opt_call_proc(data, proc, arg, argend, argl, opt->value, is_opt, outargs,
FSP_FUSE_MEMFN_A); FSP_FUSE_MEMFN_A);
else else
{ {
@ -310,7 +324,7 @@ static int fsp_fuse_opt_process_arg(void *data,
static int fsp_fuse_opt_parse_arg(void *data, static int fsp_fuse_opt_parse_arg(void *data,
const struct fuse_opt opts[], fuse_opt_proc_t proc, const struct fuse_opt opts[], fuse_opt_proc_t proc,
const char *arg, const char *argend, const char *nextarg, const char *arg, const char *argend, const char *nextarg, int *pconsumed_nextarg,
int is_opt, int is_opt,
struct fuse_args *outargs, struct fuse_args *outargs,
FSP_FUSE_MEMFN_P) FSP_FUSE_MEMFN_P)
@ -330,6 +344,7 @@ static int fsp_fuse_opt_parse_arg(void *data,
if (0 == nextarg) if (0 == nextarg)
return -1; /* missing argument for option */ return -1; /* missing argument for option */
argl = nextarg; argl = nextarg;
*pconsumed_nextarg = 1;
} }
if (-1 == fsp_fuse_opt_process_arg(data, opt, proc, spec, arg, argend, argl, if (-1 == fsp_fuse_opt_process_arg(data, opt, proc, spec, arg, argend, argl,
@ -344,7 +359,7 @@ static int fsp_fuse_opt_parse_arg(void *data,
if (0 != processed) if (0 != processed)
return 0; return 0;
return fsp_fuse_opt_call_proc(data, proc, arg, argend, FUSE_OPT_KEY_OPT, is_opt, outargs, return fsp_fuse_opt_call_proc(data, proc, arg, argend, arg, FUSE_OPT_KEY_OPT, is_opt, outargs,
FSP_FUSE_MEMFN_A); FSP_FUSE_MEMFN_A);
} }
@ -362,7 +377,7 @@ FSP_FUSE_API int fsp_fuse_opt_parse(struct fuse_args *args, void *data,
static struct fuse_opt opts0[1] = { FUSE_OPT_END }; static struct fuse_opt opts0[1] = { FUSE_OPT_END };
struct fuse_args outargs = FUSE_ARGS_INIT(0, 0); struct fuse_args outargs = FUSE_ARGS_INIT(0, 0);
const char *arg, *argend; const char *arg, *argend;
int dashdash = 0; int dashdash = 0, consumed_nextarg;
if (0 == args) if (0 == args)
args = &args0; args = &args0;
@ -395,7 +410,7 @@ FSP_FUSE_API int fsp_fuse_opt_parse(struct fuse_args *args, void *data,
if ('\0' == *argend || ',' == *argend) if ('\0' == *argend || ',' == *argend)
{ {
if (-1 == fsp_fuse_opt_parse_arg(data, opts, proc, if (-1 == fsp_fuse_opt_parse_arg(data, opts, proc,
arg, argend, 0, 1, &outargs, FSP_FUSE_MEMFN_A)) arg, argend, 0, 0, 1, &outargs, FSP_FUSE_MEMFN_A))
goto fail; goto fail;
arg = '\0' == *argend ? argend : argend + 1; arg = '\0' == *argend ? argend : argend + 1;
@ -414,14 +429,18 @@ FSP_FUSE_API int fsp_fuse_opt_parse(struct fuse_args *args, void *data,
} }
/* fall through */ /* fall through */
default: default:
consumed_nextarg = 0;
if (-1 == fsp_fuse_opt_parse_arg(data, opts, proc, if (-1 == fsp_fuse_opt_parse_arg(data, opts, proc,
arg, 0, args->argv[argi + 1], 0, &outargs, FSP_FUSE_MEMFN_A)) arg, 0, args->argv[argi + 1], &consumed_nextarg,
0, &outargs, FSP_FUSE_MEMFN_A))
goto fail; goto fail;
if (consumed_nextarg)
argi++;
break; break;
} }
} }
else else
if (-1 == fsp_fuse_opt_call_proc(data, proc, arg, 0, FUSE_OPT_KEY_NONOPT, 0, &outargs, if (-1 == fsp_fuse_opt_call_proc(data, proc, arg, 0, arg, FUSE_OPT_KEY_NONOPT, 0, &outargs,
FSP_FUSE_MEMFN_A)) FSP_FUSE_MEMFN_A))
goto fail; goto fail;
} }
@ -436,6 +455,9 @@ FSP_FUSE_API int fsp_fuse_opt_parse(struct fuse_args *args, void *data,
outargs.argv[outargs.argc] = 0; outargs.argv[outargs.argc] = 0;
} }
fsp_fuse_opt_free_args(args, FSP_FUSE_MEMFN_A);
memcpy(args, &outargs, sizeof outargs);
return 0; return 0;
fail: fail: