From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, John Tapsell <johnflux@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 2/4] quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
Date: Sun, 29 Mar 2009 11:44:52 +0200 [thread overview]
Message-ID: <20090329114452.b19a2f60.chriscool@tuxfamily.org> (raw)
This new function unwraps the space separated shell quoted elements in
its first argument and put a copy of them in the argv array passed as
its second argument.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
quote.c | 17 +++++++++++++++++
quote.h | 2 ++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/quote.c b/quote.c
index 8cf0ef4..5b12a4a 100644
--- a/quote.c
+++ b/quote.c
@@ -120,6 +120,23 @@ char *sq_dequote(char *arg)
return sq_dequote_many(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_many(next, &next);
+ if (!dequoted)
+ return 1;
+ ALLOC_GROW(*argv, *nr + 1, *alloc);
+ (*argv)[(*nr)++] = xstrdup(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 c2f98e7..bbd0f09 100644
--- a/quote.h
+++ b/quote.h
@@ -47,6 +47,8 @@ extern char *sq_dequote(char *);
*/
extern char *sq_dequote_many(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);
extern void quote_two_c_style(struct strbuf *, const char *, const char *, int);
--
1.6.2.1.404.gb0085.dirty
next reply other threads:[~2009-03-29 9:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-29 9:44 Christian Couder [this message]
2009-03-30 6:48 ` [PATCH 2/4] quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array Junio C Hamano
2009-03-31 5:09 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090329114452.b19a2f60.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johnflux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).