Merge branch 'da/p4merge-mktemp' into maint

diff --git a/argv-array.c b/argv-array.c
index 256741d2262b237c56b6730bea9d52c9b39b7ee3..9e960d549c158a4c761942bb17824c1d5e075d49 100644 (file)
--- a/argv-array.c
+++ b/argv-array.c
@@ -68,3 +68,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);
+       }
+}