summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Ruch <bafain@gmail.com>2014-03-15 11:14:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-18 19:47:29 (GMT)
commitc45a18e88f47fc9b23f8e8e7b14a030434917a66 (patch)
treeaf79409e04717098c12015a4ea97744a5dba3b51
parent16216b6ab1073b7aaa8225c32208758e6ea16629 (diff)
downloadgit-c45a18e88f47fc9b23f8e8e7b14a030434917a66.zip
git-c45a18e88f47fc9b23f8e8e7b14a030434917a66.tar.gz
git-c45a18e88f47fc9b23f8e8e7b14a030434917a66.tar.bz2
add: use struct argv_array in run_add_interactive()
run_add_interactive() in builtin/add.c manually computes array bounds and allocates a static args array to build the add--interactive command line, which is error-prone. Use the argv-array helper functions instead. Signed-off-by: Fabian Ruch <bafain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/add.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 2a2722f..5d83267 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -15,6 +15,7 @@
#include "diffcore.h"
#include "revision.h"
#include "bulk-checkin.h"
+#include "argv-array.h"
static const char * const builtin_add_usage[] = {
N_("git add [options] [--] <pathspec>..."),
@@ -246,23 +247,21 @@ static void refresh(int verbose, const struct pathspec *pathspec)
int run_add_interactive(const char *revision, const char *patch_mode,
const struct pathspec *pathspec)
{
- int status, ac, i;
- const char **args;
+ int status, i;
+ struct argv_array argv = ARGV_ARRAY_INIT;
- args = xcalloc(sizeof(const char *), (pathspec->nr + 6));
- ac = 0;
- args[ac++] = "add--interactive";
+ argv_array_push(&argv, "add--interactive");
if (patch_mode)
- args[ac++] = patch_mode;
+ argv_array_push(&argv, patch_mode);
if (revision)
- args[ac++] = revision;
- args[ac++] = "--";
+ argv_array_push(&argv, revision);
+ argv_array_push(&argv, "--");
for (i = 0; i < pathspec->nr; i++)
/* pass original pathspec, to be re-parsed */
- args[ac++] = pathspec->items[i].original;
+ argv_array_push(&argv, pathspec->items[i].original);
- status = run_command_v_opt(args, RUN_GIT_CMD);
- free(args);
+ status = run_command_v_opt(argv.argv, RUN_GIT_CMD);
+ argv_array_clear(&argv);
return status;
}