From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>,
Stephen Robin <stephen.robin@gmail.com>,
Paul Tan <pyokagan@gmail.com>
Subject: [PATCH v3 03/19] argv-array: implement argv_array_pushv()
Date: Sun, 14 Jun 2015 16:41:50 +0800 [thread overview]
Message-ID: <1434271326-11349-4-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1434271326-11349-1-git-send-email-pyokagan@gmail.com>
When we have a null-terminated array, it would be useful to convert it
or append it to an argv_array for further manipulation.
Implement argv_array_pushv() which will push a null-terminated array of
strings on to an argv_array.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
Documentation/technical/api-argv-array.txt | 3 +++
argv-array.c | 6 ++++++
argv-array.h | 1 +
3 files changed, 10 insertions(+)
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt
index 1a79781..8076172 100644
--- a/Documentation/technical/api-argv-array.txt
+++ b/Documentation/technical/api-argv-array.txt
@@ -46,6 +46,9 @@ Functions
Format a string and push it onto the end of the array. This is a
convenience wrapper combining `strbuf_addf` and `argv_array_push`.
+`argv_array_pushv`::
+ Push a null-terminated array of strings onto the end of the array.
+
`argv_array_pop`::
Remove the final element from the array. If there are no
elements in the array, do nothing.
diff --git a/argv-array.c b/argv-array.c
index 256741d..eaed477 100644
--- 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)
diff --git a/argv-array.h b/argv-array.h
index c65e6e8..a2fa0aa 100644
--- a/argv-array.h
+++ b/argv-array.h
@@ -17,6 +17,7 @@ __attribute__((format (printf,2,3)))
void argv_array_pushf(struct argv_array *, const char *fmt, ...);
LAST_ARG_MUST_BE_NULL
void argv_array_pushl(struct argv_array *, ...);
+void argv_array_pushv(struct argv_array *, const char **);
void argv_array_pop(struct argv_array *);
void argv_array_clear(struct argv_array *);
--
2.1.4
next prev parent reply other threads:[~2015-06-14 8:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-14 8:41 [PATCH v3 00/19] Make git-pull a builtin Paul Tan
2015-06-14 8:41 ` [PATCH v3 01/19] parse-options-cb: implement parse_opt_passthru() Paul Tan
2015-06-14 8:41 ` [PATCH v3 02/19] parse-options-cb: implement parse_opt_passthru_argv() Paul Tan
2015-06-14 8:41 ` Paul Tan [this message]
2015-06-14 8:41 ` [PATCH v3 04/19] pull: implement skeletal builtin pull Paul Tan
2015-06-14 8:41 ` [PATCH v3 05/19] pull: implement fetch + merge Paul Tan
2015-06-14 8:41 ` [PATCH v3 06/19] pull: pass verbosity, --progress flags to fetch and merge Paul Tan
2015-06-14 8:41 ` [PATCH v3 07/19] pull: pass git-merge's options to git-merge Paul Tan
2015-06-14 8:41 ` [PATCH v3 08/19] pull: pass git-fetch's options to git-fetch Paul Tan
2015-06-14 8:41 ` [PATCH v3 09/19] pull: error on no merge candidates Paul Tan
2015-06-14 8:41 ` [PATCH v3 10/19] pull: support pull.ff config Paul Tan
2015-06-14 8:41 ` [PATCH v3 11/19] pull: check if in unresolved merge state Paul Tan
2015-06-14 8:41 ` [PATCH v3 12/19] pull: fast-forward working tree if head is updated Paul Tan
2015-06-14 8:42 ` [PATCH v3 13/19] pull: implement pulling into an unborn branch Paul Tan
2015-06-14 8:42 ` [PATCH v3 14/19] pull: set reflog message Paul Tan
2015-06-14 8:42 ` [PATCH v3 15/19] pull: teach git pull about --rebase Paul Tan
2015-06-14 8:42 ` [PATCH v3 16/19] pull: configure --rebase via branch.<name>.rebase or pull.rebase Paul Tan
2015-06-14 8:42 ` [PATCH v3 17/19] pull --rebase: exit early when the working directory is dirty Paul Tan
2015-06-14 8:42 ` [PATCH v3 18/19] pull --rebase: error on no merge candidate cases Paul Tan
2015-06-14 8:42 ` [PATCH v3 19/19] pull: remove redirection to git-pull.sh Paul Tan
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=1434271326-11349-4-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
--cc=stephen.robin@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).