quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array

This new function unwraps the space separated shell quoted elements in
its first argument and places them in the argv array passed as its second
argument.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/quote.c b/quote.c
index ea49c7a99fb1fc28f786d53f528addf4dcbf5a02..7a49fcf69671646a0d3ba6de6478cfc6767c31fe 100644 (file)
--- a/quote.c
+++ b/quote.c
@@ -120,6 +120,23 @@ char *sq_dequote(char *arg)
        return sq_dequote_step(arg, NULL);
 }
 
+int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc)
+{
+       char *next = arg;
+
+       if (!*arg)
+               return 0;
+       do {
+               char *dequoted = sq_dequote_step(next, &next);
+               if (!dequoted)
+                       return -1;
+               ALLOC_GROW(*argv, *nr + 1, *alloc);
+               (*argv)[(*nr)++] = dequoted;
+       } while (next);
+
+       return 0;
+}
+
 /* 1 means: quote as octal
  * 0 means: quote as octal if (quote_path_fully)
  * -1 means: never quote

diff --git a/quote.h b/quote.h
index 2315105fa3eae59f6abaf636eec7590c335154b4..66730f2bff3cee42bc7c670e2a6d7da240db1d08 100644 (file)
--- a/quote.h
+++ b/quote.h
@@ -46,6 +46,7 @@ extern char *sq_dequote(char *);
  * is no more argument to be dequoted, "next" is updated to point to NULL.
  */
 extern char *sq_dequote_step(char *arg, char **next);
+extern int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc);
 
 extern int unquote_c_style(struct strbuf *, const char *quoted, const char **endp);
 extern size_t quote_c_style(const char *name, struct strbuf *, FILE *, int no_dq);