add_packed_git: convert strcpy into xsnprintf

diff --git a/argv-array.c b/argv-array.c
index aab50d6a97c7ca76e38601c3e2438e760322f478..eaed47712b44ed1a5f9e5d35d356d0de4a5a4d54 100644 (file)
--- a/argv-array.c
+++ b/argv-array.c
@@ -49,33 +49,28 @@ void argv_array_pushl(struct argv_array *array, ...)
        va_end(ap);
 }
 
-void argv_array_clear(struct argv_array *array)
+void argv_array_pushv(struct argv_array *array, const char **argv)
 {
-       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);
+       for (; *argv; argv++)
+               argv_array_push(array, *argv);
 }
 
-const char **argv_array_detach(struct argv_array *array, int *argc)
+void argv_array_pop(struct argv_array *array)
 {
-       const char **argv =
-               array->argv == empty_argv || array->argc == 0 ? NULL : array->argv;
-       if (argc)
-               *argc = array->argc;
-       argv_array_init(array);
-       return argv;
+       if (!array->argc)
+               return;
+       free((char *)array->argv[array->argc - 1]);
+       array->argv[array->argc - 1] = NULL;
+       array->argc--;
 }
 
-void argv_array_free_detached(const char **argv)
+void argv_array_clear(struct argv_array *array)
 {
-       if (argv) {
+       if (array->argv != empty_argv) {
                int i;
-               for (i = 0; argv[i]; i++)
-                       free((char **)argv[i]);
-               free(argv);
+               for (i = 0; i < array->argc; i++)
+                       free((char *)array->argv[i]);
+               free(array->argv);
        }
+       argv_array_init(array);
 }