argv-array.con commit argv-array: return the pushed string from argv_push*() (342c513)
   1#include "cache.h"
   2#include "argv-array.h"
   3#include "strbuf.h"
   4
   5const char *empty_argv[] = { NULL };
   6
   7void argv_array_init(struct argv_array *array)
   8{
   9        array->argv = empty_argv;
  10        array->argc = 0;
  11        array->alloc = 0;
  12}
  13
  14static void argv_array_push_nodup(struct argv_array *array, const char *value)
  15{
  16        if (array->argv == empty_argv)
  17                array->argv = NULL;
  18
  19        ALLOC_GROW(array->argv, array->argc + 2, array->alloc);
  20        array->argv[array->argc++] = value;
  21        array->argv[array->argc] = NULL;
  22}
  23
  24const char *argv_array_push(struct argv_array *array, const char *value)
  25{
  26        argv_array_push_nodup(array, xstrdup(value));
  27        return array->argv[array->argc - 1];
  28}
  29
  30const char *argv_array_pushf(struct argv_array *array, const char *fmt, ...)
  31{
  32        va_list ap;
  33        struct strbuf v = STRBUF_INIT;
  34
  35        va_start(ap, fmt);
  36        strbuf_vaddf(&v, fmt, ap);
  37        va_end(ap);
  38
  39        argv_array_push_nodup(array, strbuf_detach(&v, NULL));
  40        return array->argv[array->argc - 1];
  41}
  42
  43void argv_array_pushl(struct argv_array *array, ...)
  44{
  45        va_list ap;
  46        const char *arg;
  47
  48        va_start(ap, array);
  49        while((arg = va_arg(ap, const char *)))
  50                argv_array_push(array, arg);
  51        va_end(ap);
  52}
  53
  54void argv_array_pushv(struct argv_array *array, const char **argv)
  55{
  56        for (; *argv; argv++)
  57                argv_array_push(array, *argv);
  58}
  59
  60void argv_array_pop(struct argv_array *array)
  61{
  62        if (!array->argc)
  63                return;
  64        free((char *)array->argv[array->argc - 1]);
  65        array->argv[array->argc - 1] = NULL;
  66        array->argc--;
  67}
  68
  69void argv_array_clear(struct argv_array *array)
  70{
  71        if (array->argv != empty_argv) {
  72                int i;
  73                for (i = 0; i < array->argc; i++)
  74                        free((char *)array->argv[i]);
  75                free(array->argv);
  76        }
  77        argv_array_init(array);
  78}
  79
  80const char **argv_array_detach(struct argv_array *array)
  81{
  82        if (array->argv == empty_argv)
  83                return xcalloc(1, sizeof(const char *));
  84        else {
  85                const char **ret = array->argv;
  86                argv_array_init(array);
  87                return ret;
  88        }
  89}