mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
df7428eca4
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 <florian.achleitner.2.6.31@gmail.com> Acked-by: David Michael Barr <b@rr-dav.id.au> Signed-off-by: Junio C Hamano <gitster@pobox.com>
82 lines
1.6 KiB
C
82 lines
1.6 KiB
C
#include "cache.h"
|
|
#include "argv-array.h"
|
|
#include "strbuf.h"
|
|
|
|
const char *empty_argv[] = { NULL };
|
|
|
|
void argv_array_init(struct argv_array *array)
|
|
{
|
|
array->argv = empty_argv;
|
|
array->argc = 0;
|
|
array->alloc = 0;
|
|
}
|
|
|
|
static void argv_array_push_nodup(struct argv_array *array, const char *value)
|
|
{
|
|
if (array->argv == empty_argv)
|
|
array->argv = NULL;
|
|
|
|
ALLOC_GROW(array->argv, array->argc + 2, array->alloc);
|
|
array->argv[array->argc++] = value;
|
|
array->argv[array->argc] = NULL;
|
|
}
|
|
|
|
void argv_array_push(struct argv_array *array, const char *value)
|
|
{
|
|
argv_array_push_nodup(array, xstrdup(value));
|
|
}
|
|
|
|
void argv_array_pushf(struct argv_array *array, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
struct strbuf v = STRBUF_INIT;
|
|
|
|
va_start(ap, fmt);
|
|
strbuf_vaddf(&v, fmt, ap);
|
|
va_end(ap);
|
|
|
|
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) {
|
|
int i;
|
|
for (i = 0; i < array->argc; i++)
|
|
free((char **)array->argv[i]);
|
|
free(array->argv);
|
|
}
|
|
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);
|
|
}
|
|
}
|