Commit b992657e authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

argv-array: add detach function

The usual pattern for an argv array is to initialize it,
push in some strings, and then clear it when done. Very
occasionally, though, we must do other exotic things with
the memory, like freeing the list but keeping the strings.
Let's provide a detach function so that callers can make use
of our API to build up the array, and then take ownership of
Signed-off-by: 's avatarJeff King <>
Signed-off-by: 's avatarJunio C Hamano <>
parent 36895391
......@@ -56,3 +56,10 @@ Functions
Free all memory associated with the array and return it to the
initial, empty state.
Disconnect the `argv` member from the `argv_array` struct and
return it. The caller is responsible for freeing the memory used
by the array, and by the strings it references. After detaching,
the `argv_array` is in a reinitialized state and can be pushed
into again.
......@@ -74,3 +74,14 @@ void argv_array_clear(struct argv_array *array)
const char **argv_array_detach(struct argv_array *array)
if (array->argv == empty_argv)
return xcalloc(1, sizeof(const char *));
else {
const char **ret = array->argv;
return ret;
......@@ -20,5 +20,6 @@ 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 *);
const char **argv_array_detach(struct argv_array *);
#endif /* ARGV_ARRAY_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment