Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-23 17:03:12 -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 15:56:19 -07:00
parent 4850056bf6
commit e14a26b540
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,36 +283,34 @@ 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 *arg0, const char *argend0, const char *arg1, const char *arg, const char *argend, const char *nextarg,
int is_opt, int is_opt,
struct fuse_args *outargs, struct fuse_args *outargs,
FSP_FUSE_MEMFN_P) FSP_FUSE_MEMFN_P)
{ {
const struct fuse_opt *opt; const struct fuse_opt *opt;
const char *spec, *arg, *argend; const char *spec, *argl, *argendl;
int processed = 0; int processed = 0;
arg = arg0, argend = argend0; argl = arg;
opt = opts; opt = opts;
while (0 != (opt = fsp_fuse_opt_find(opt, &spec, &arg, argend))) while (0 != (opt = fsp_fuse_opt_find(opt, &spec, &argl, argend)))
{ {
if (fsp_fuse_opt_match_exact == arg) if (fsp_fuse_opt_match_exact == argl)
argl = arg, argendl = argend;
else if (fsp_fuse_opt_match_next == argl)
{ {
arg = 0, argend = 0; if (0 == nextarg)
}
else if (fsp_fuse_opt_match_next == arg)
{
if (0 == arg1)
return -1; /* missing argument for option */ return -1; /* missing argument for option */
arg = arg1, argend = 0; argl = nextarg, argendl = 0;
} }
if (-1 == fsp_fuse_opt_process_arg(data, opt, proc, spec, arg, argend, is_opt, outargs, if (-1 == fsp_fuse_opt_process_arg(data, opt, proc, spec, argl, argendl, is_opt, outargs,
FSP_FUSE_MEMFN_A)) FSP_FUSE_MEMFN_A))
return -1; return -1;
processed++; processed++;
arg = arg0, argend = argend0; argl = arg;
opt++; opt++;
} }