[PATCH v4 03/19] argv-array: implement argv_array_pushv()
- From
Paul Tan <pyokagan@gmail.com>
- Date
- Jun 18, 2015, 10:53 UTC
- Message-ID
- <1434624852-6869-4-git-send-email-pyokagan@gmail.com>
- In-Reply-To
- <1434624852-6869-1-git-send-email-pyokagan@gmail.com>
When we have a null-terminated array, it would be useful to convert it or append it to an argv_array for further manipulation.
Implement argv_array_pushv() which will push a null-terminated array of strings on to an argv_array.
Signed-off-by: Paul Tan <pyokagan@gmail.com> --- Documentation/technical/api-argv-array.txt | 3 +++ argv-array.c | 6 ++++++ argv-array.h | 1 + 3 files changed, 10 insertions(+)
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt index 1a79781..8076172 100644 --- a/Documentation/technical/api-argv-array.txt +++ b/Documentation/technical/api-argv-array.txt @@ -46,6 +46,9 @@ Functions Format a string and push it onto the end of the array. This is a convenience wrapper combining `strbuf_addf` and `argv_array_push`. +`argv_array_pushv`:: + Push a null-terminated array of strings onto the end of the array. + `argv_array_pop`:: Remove the final element from the array. If there are no elements in the array, do nothing. diff --git a/argv-array.c b/argv-array.c index 256741d..eaed477 100644 --- a/argv-array.c +++ b/argv-array.c @@ -49,6 +49,12 @@ void argv_array_pushl(struct argv_array *array, ...) va_end(ap); } +void argv_array_pushv(struct argv_array *array, const char **argv) +{ + for (; *argv; argv++) + argv_array_push(array, *argv); +} + void argv_array_pop(struct argv_array *array) { if (!array->argc) diff --git a/argv-array.h b/argv-array.h index c65e6e8..a2fa0aa 100644 --- a/argv-array.h +++ b/argv-array.h @@ -17,6 +17,7 @@ __attribute__((format (printf,2,3))) void argv_array_pushf(struct argv_array *, const char *fmt, ...); LAST_ARG_MUST_BE_NULL void argv_array_pushl(struct argv_array *, ...); +void argv_array_pushv(struct argv_array *, const char **); void argv_array_pop(struct argv_array *); void argv_array_clear(struct argv_array *);
-- 2.1.4