From d2a3ed327ecd71bedf9918f729c068b11d81fdc1 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 20 Jan 2006 16:29:23 +0000 Subject: fix --- compat/fuse_opt.c | 55 ++++++++++++++++++++++++++++++------------------------- compat/fuse_opt.h | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 30 deletions(-) (limited to 'compat') diff --git a/compat/fuse_opt.c b/compat/fuse_opt.c index 2ac499c..582c6ad 100644 --- a/compat/fuse_opt.c +++ b/compat/fuse_opt.c @@ -62,6 +62,21 @@ int fuse_opt_add_arg(struct fuse_args *args, const char *arg) return 0; } +int fuse_opt_insert_arg(struct fuse_args *args, int pos, const char *arg) +{ + assert(pos <= args->argc); + if (fuse_opt_add_arg(args, arg) == -1) + return -1; + + if (pos != args->argc - 1) { + char *newarg = args->argv[args->argc - 1]; + memmove(&args->argv[pos + 1], &args->argv[pos], + sizeof(char *) * (args->argc - pos - 1)); + args->argv[pos] = newarg; + } + return 0; +} + static int next_arg(struct fuse_opt_context *ctx, const char *opt) { if (ctx->argctr + 1 >= ctx->argc) { @@ -102,25 +117,13 @@ static int add_opt(struct fuse_opt_context *ctx, const char *opt) return fuse_opt_add_opt(&ctx->opts, opt); } -static int insert_arg(struct fuse_opt_context *ctx, int pos, const char *arg) -{ - assert(pos <= ctx->outargs.argc); - if (add_arg(ctx, arg) == -1) - return -1; - - if (pos != ctx->outargs.argc - 1) { - char *newarg = ctx->outargs.argv[ctx->outargs.argc - 1]; - memmove(&ctx->outargs.argv[pos + 1], &ctx->outargs.argv[pos], - sizeof(char *) * (ctx->outargs.argc - pos - 1)); - ctx->outargs.argv[pos] = newarg; - } - return 0; -} - static int call_proc(struct fuse_opt_context *ctx, const char *arg, int key, int iso) { - if (ctx->proc) { + if (key == FUSE_OPT_KEY_DISCARD) + return 0; + + if (key != FUSE_OPT_KEY_KEEP && ctx->proc) { int res = ctx->proc(ctx->data, arg, key, &ctx->outargs); if (res == -1 || !res) return res; @@ -155,8 +158,8 @@ static int match_template(const char *t, const char *arg, unsigned *sepp) static const struct fuse_opt *find_opt(const struct fuse_opt *opt, const char *arg, unsigned *sepp) { - for (; opt && opt->template; opt++) - if (match_template(opt->template, arg, sepp)) + for (; opt && opt->templ; opt++) + if (match_template(opt->templ, arg, sepp)) return opt; return NULL; } @@ -195,11 +198,11 @@ static int process_opt(struct fuse_opt_context *ctx, return -1; } else { void *var = ctx->data + opt->offset; - if (sep && opt->template[sep + 1]) { + if (sep && opt->templ[sep + 1]) { const char *param = arg + sep; - if (opt->template[sep] == '=') + if (opt->templ[sep] == '=') param ++; - if (process_opt_param(var, opt->template + sep + 1, + if (process_opt_param(var, opt->templ + sep + 1, param, arg) == -1) return -1; } else @@ -239,7 +242,7 @@ static int process_gopt(struct fuse_opt_context *ctx, const char *arg, int iso) if (opt) { for (; opt; opt = find_opt(opt + 1, arg, &sep)) { int res; - if (sep && opt->template[sep] == ' ' && !arg[sep]) + if (sep && opt->templ[sep] == ' ' && !arg[sep]) res = process_opt_sep_arg(ctx, opt, sep, arg, iso); else res = process_opt(ctx, opt, sep, arg, iso); @@ -321,12 +324,14 @@ static int opt_parse(struct fuse_opt_context *ctx) return -1; if (ctx->opts) { - if (insert_arg(ctx, 1, "-o") == -1 || - insert_arg(ctx, 2, ctx->opts) == -1) + if (fuse_opt_insert_arg(&ctx->outargs, 1, "-o") == -1 || + fuse_opt_insert_arg(&ctx->outargs, 2, ctx->opts) == -1) return -1; } - if (ctx->nonopt && ctx->nonopt == ctx->outargs.argc) + if (ctx->nonopt && ctx->nonopt == ctx->outargs.argc) { + free(ctx->outargs.argv[ctx->outargs.argc - 1]); ctx->outargs.argv[--ctx->outargs.argc] = NULL; + } return 0; } diff --git a/compat/fuse_opt.h b/compat/fuse_opt.h index 2ef5d56..9e159d5 100644 --- a/compat/fuse_opt.h +++ b/compat/fuse_opt.h @@ -72,7 +72,7 @@ extern "C" { */ struct fuse_opt { /** Matching template and optional parameter formatting */ - const char *template; + const char *templ; /** * Offset of variable within 'data' parameter of fuse_opt_parse() @@ -82,7 +82,7 @@ struct fuse_opt { /** * Value to set the variable to, or to be passed as 'key' to the - * processing function. Ignored if template a format + * processing function. Ignored if template has a format */ int value; }; @@ -91,13 +91,13 @@ struct fuse_opt { * Key option. In case of a match, the processing function will be * called with the specified key. */ -#define FUSE_OPT_KEY(template, key) { template, -1U, key } +#define FUSE_OPT_KEY(templ, key) { templ, -1U, key } /** * Last option. An array of 'struct fuse_opt' must end with a NULL * template value */ -#define FUSE_OPT_END { .template = NULL } +#define FUSE_OPT_END { .templ = NULL } /** * Argument list @@ -120,7 +120,7 @@ struct fuse_args { /** * Key value passed to the processing function if an option did not - * match any templated + * match any template */ #define FUSE_OPT_KEY_OPT -1 @@ -132,6 +132,22 @@ struct fuse_args { */ #define FUSE_OPT_KEY_NONOPT -2 +/** + * Special key value for options to keep + * + * Argument is not passed to processing function, but behave as if the + * processing function returned 1 + */ +#define FUSE_OPT_KEY_KEEP -3 + +/** + * Special key value for options to discard + * + * Argument is not passed to processing function, but behave as if the + * processing function returned zero + */ +#define FUSE_OPT_KEY_DISCARD -4 + /** * Processing function * @@ -201,6 +217,21 @@ int fuse_opt_add_opt(char **opts, const char *opt); */ int fuse_opt_add_arg(struct fuse_args *args, const char *arg); +/** + * Add an argument at the specified position in a NULL terminated + * argument vector + * + * Adds the argument to the N-th position. This is useful for adding + * options at the beggining of the array which must not come after the + * special '--' option. + * + * @param args is the structure containing the current argument list + * @param pos is the position at which to add the argument + * @param arg is the new argument to add + * @return -1 on allocation error, 0 on success + */ +int fuse_opt_insert_arg(struct fuse_args *args, int pos, const char *arg); + /** * Free the contents of argument list * -- cgit v1.2.3