This way, argv[0] isn't clobbered, to the cost of maybe not having a
resulting NULL terminated argv array.
Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx>
---
parse-options.c | 7 ++++---
parse-options.h | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index ee82cf3..a6b5e04 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -246,7 +246,7 @@ void parse_options_start(struct parse_opt_ctx_t *ctx,
memset(ctx, 0, sizeof(*ctx));
ctx->argc = argc - 1;
ctx->argv = argv + 1;
- ctx->out = argv;
+ ctx->out = argv + ((flags & PARSE_OPT_KEEP_ARGV0) != 0);
ctx->flags = flags;
strbuf_init(&ctx->buf, 0);
}
@@ -327,10 +327,11 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
int parse_options_end(struct parse_opt_ctx_t *ctx)
{
+ int res = ctx->cpidx + ctx->argc;
memmove(ctx->out + ctx->cpidx, ctx->argv, ctx->argc * sizeof(*ctx->out));
- ctx->out[ctx->cpidx + ctx->argc] = NULL;
+ ctx->out[res] = NULL;
strbuf_release(&ctx->buf);
- return ctx->cpidx + ctx->argc;
+ return res + ((ctx->flags & PARSE_OPT_KEEP_ARGV0) != 0);
}
int parse_options(int argc, const char **argv, const struct option *options,
diff --git a/parse-options.h b/parse-options.h
index 14447d5..6745c7d 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -22,6 +22,8 @@ enum parse_opt_type {
enum parse_opt_flags {
PARSE_OPT_KEEP_DASHDASH = 1,
PARSE_OPT_STOP_AT_NON_OPTION = 2,
+ /* using that option, the filtered argv may not be NULL terminated */
+ PARSE_OPT_KEEP_ARGV0 = 4,
};
enum parse_opt_option_flags {
--
1.5.6.110.g736c7.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
