Merge branch 'maint-2.5' into maint-2.6

diff --git a/argv-array.c b/argv-array.c
index 256741d2262b237c56b6730bea9d52c9b39b7ee3..eaed47712b44ed1a5f9e5d35d356d0de4a5a4d54 100644 (file)
--- a/argv-array.c
+++ b/argv-array.c
@@ -49,6 +49,12 @@ void argv_array_pushl(struct argv_array *array, ...)
        va_end(ap);
 }
 
+void argv_array_pushv(struct argv_array *array, const char **argv)
+{
+       for (; *argv; argv++)
+               argv_array_push(array, *argv);
+}
+
 void argv_array_pop(struct argv_array *array)
 {
        if (!array->argc)