From fd93d2e60ea66fc3796904ff53ead3ef4755b137 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 18 Apr 2012 14:08:49 -0700 Subject: argv-array: refactor empty_argv initialization An empty argv-array is initialized to point to a static empty NULL-terminated array. The original implementation separates the actual storage of the NULL-terminator from the pointer to the list. This makes the exposed type a "const char **", which nicely matches the type stored by the argv-array. However, this indirection means that one cannot use empty_argv to initialize a static variable, since it is not a constant. Instead, we can expose empty_argv directly, as an array of pointers. The only place we use it is in the ARGV_ARRAY_INIT initializer, and it decays to a pointer appropriately there. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- argv-array.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'argv-array.c') diff --git a/argv-array.c b/argv-array.c index a4e04201e6..110a61b93a 100644 --- a/argv-array.c +++ b/argv-array.c @@ -2,8 +2,7 @@ #include "argv-array.h" #include "strbuf.h" -static const char *empty_argv_storage = NULL; -const char **empty_argv = &empty_argv_storage; +const char *empty_argv[] = { NULL }; void argv_array_init(struct argv_array *array) { -- cgit v1.2.1 From d15bbe1379a12e2d9a5f18f7dc96b38afafc6c5d Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 18 Apr 2012 14:10:05 -0700 Subject: argv-array: add a new "pushl" method It can be convenient to push many strings in a single line (e.g., if you are initializing an array with defaults). This patch provides a convenience wrapper to allow this. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- argv-array.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'argv-array.c') diff --git a/argv-array.c b/argv-array.c index 110a61b93a..0b5f8898a1 100644 --- a/argv-array.c +++ b/argv-array.c @@ -38,6 +38,17 @@ void argv_array_pushf(struct argv_array *array, const char *fmt, ...) argv_array_push_nodup(array, strbuf_detach(&v, NULL)); } +void argv_array_pushl(struct argv_array *array, ...) +{ + va_list ap; + const char *arg; + + va_start(ap, array); + while((arg = va_arg(ap, const char *))) + argv_array_push(array, arg); + va_end(ap); +} + void argv_array_clear(struct argv_array *array) { if (array->argv != empty_argv) { -- cgit v1.2.1 From fe4a0a288842e225f99254b3e6ce14ff98875501 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 1 Sep 2012 07:25:27 -0400 Subject: argv-array: add pop function Sometimes we build a set of similar command lines, differing only in the final arguments (e.g., "fetch --multiple"). To use argv_array for this, you have to either push the same set of elements repeatedly, or break the abstraction by manually manipulating the array's internal members. Instead, let's provide a sanctioned "pop" function to remove elements from the end. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- argv-array.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'argv-array.c') diff --git a/argv-array.c b/argv-array.c index 0b5f8898a1..55e8443ff9 100644 --- a/argv-array.c +++ b/argv-array.c @@ -49,6 +49,15 @@ void argv_array_pushl(struct argv_array *array, ...) va_end(ap); } +void argv_array_pop(struct argv_array *array) +{ + if (!array->argc) + return; + free((char *)array->argv[array->argc - 1]); + array->argv[array->argc - 1] = NULL; + array->argc--; +} + void argv_array_clear(struct argv_array *array) { if (array->argv != empty_argv) { -- cgit v1.2.1 From ba4d1c7b1623b2c7ec198aee08036acf779375e6 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 1 Sep 2012 07:34:09 -0400 Subject: argv-array: fix bogus cast when freeing array Since the array struct stores a "const char **" argv member (for compatibility with most of our argv-taking functions), we have to cast away the const-ness when freeing its elements. However, we used the wrong type when doing so. It doesn't make a difference since free() take a void pointer anyway, but it can be slightly confusing to a reader. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- argv-array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'argv-array.c') diff --git a/argv-array.c b/argv-array.c index 55e8443ff9..256741d226 100644 --- a/argv-array.c +++ b/argv-array.c @@ -63,7 +63,7 @@ void argv_array_clear(struct argv_array *array) if (array->argv != empty_argv) { int i; for (i = 0; i < array->argc; i++) - free((char **)array->argv[i]); + free((char *)array->argv[i]); free(array->argv); } argv_array_init(array); -- cgit v1.2.1 From df7428eca46ec25df5ef14bc7e90120bdc267328 Mon Sep 17 00:00:00 2001 From: Florian Achleitner Date: Wed, 19 Sep 2012 17:21:18 +0200 Subject: Add argv_array_detach and argv_array_free_detached Allow detaching of ownership of the argv_array's contents and add a function to free those detached argv_arrays later. This makes it possible to use argv_array efficiently with the exiting struct child_process which only contains a member char **argv. Add to documentation. Signed-off-by: Florian Achleitner Acked-by: David Michael Barr Signed-off-by: Junio C Hamano --- argv-array.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'argv-array.c') diff --git a/argv-array.c b/argv-array.c index 0b5f8898a1..aab50d6a97 100644 --- a/argv-array.c +++ b/argv-array.c @@ -59,3 +59,23 @@ void argv_array_clear(struct argv_array *array) } argv_array_init(array); } + +const char **argv_array_detach(struct argv_array *array, int *argc) +{ + const char **argv = + array->argv == empty_argv || array->argc == 0 ? NULL : array->argv; + if (argc) + *argc = array->argc; + argv_array_init(array); + return argv; +} + +void argv_array_free_detached(const char **argv) +{ + if (argv) { + int i; + for (i = 0; argv[i]; i++) + free((char **)argv[i]); + free(argv); + } +} -- cgit v1.2.1