summaryrefslogtreecommitdiff
path: root/parse-options.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-06 20:34:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-07 07:58:33 (GMT)
commit8b74d75cd26d28d38d2ff88267585fc308b89cef (patch)
treed0b59b21dc4085b72381cb901d361546a5d99853 /parse-options.c
parentbe2fb164ec2ec6837428201390ebe30f6f8798b5 (diff)
downloadgit-8b74d75cd26d28d38d2ff88267585fc308b89cef.zip
git-8b74d75cd26d28d38d2ff88267585fc308b89cef.tar.gz
git-8b74d75cd26d28d38d2ff88267585fc308b89cef.tar.bz2
parse-options: add parse_options_concat() to concat options
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
-rw-r--r--parse-options.c15
1 files changed, 15 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;
+}