From: Christian Couder Date: Sat, 06 Mar 2010 20:34:40 GMT Subject: [PATCH v4 1/7] parse-options: add parse_options_concat() to concat options Message-ID: <20100306203447.2960.38015.chriscool@tuxfamily.org> In-Reply-To: <20100306203250.2960.30309.chriscool@tuxfamily.org> From: Junio C Hamano Signed-off-by: Christian Couder --- parse-options.c | 15 +++++++++++++++ parse-options.h | 1 + 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/parse-options.c b/parse-options.c index c83035d..8546d85 100644 --- a/parse-options.c +++ b/parse-options.c @@ -659,3 +659,18 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset) *target = unset ? 2 : 1; return 0; } + +int parse_options_concat(struct option *dst, size_t dst_size, struct option *src) +{ + int i, j; + + for (i = 0; i < dst_size; i++) + if (dst[i].type == OPTION_END) + break; + for (j = 0; i < dst_size; i++, j++) { + dst[i] = src[j]; + if (src[j].type == OPTION_END) + return 0; + } + return -1; +} diff --git a/parse-options.h b/parse-options.h index 9429f7e..7581e93 100644 --- a/parse-options.h +++ b/parse-options.h @@ -187,6 +187,7 @@ extern int parse_options_step(struct parse_opt_ctx_t *ctx, extern int parse_options_end(struct parse_opt_ctx_t *ctx); +extern int parse_options_concat(struct option *dst, size_t, struct option *src); /*----- some often used options -----*/ extern int parse_opt_abbrev_cb(const struct option *, const char *, int); -- 1.7.0.1.307.g861f4