execv_dashed_external: use child_process struct
When we run a dashed external, we use the one-liner run_command_v_opt() to do so. Let's switch to using a child_process struct, which has two advantages: 1. We can drop all of the allocation and cleanup code for building our custom argv array, and just rely on the builtin argv_array (at the minor cost of doing a few extra mallocs). 2. We have access to the complete range of child_process options, not just the ones that the "_opt()" form can forward. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 6, 2017 at 20:16 UTC
2b296c93d49d65303a4ce291225c8755eeab1ff8
1 file changed
+7
-18
git.c
+7
-18
@@ -575,8 +575,7 @@ static void handle_builtin(int argc, const char **argv)
575
576
static void execv_dashed_external(const char **argv)
577
{
578
- struct strbuf cmd = STRBUF_INIT;
579
- const char *tmp;
578
+ struct child_process cmd = CHILD_PROCESS_INIT;
579
int status;
580
581
if (get_super_prefix())
@@ -586,30 +585,20 @@ static void execv_dashed_external(const char **argv)
585
use_pager = check_pager_config(argv[0]);
586
commit_pager_choice();
587
589
- strbuf_addf(&cmd, "git-%s", argv[0]);
588
+ argv_array_pushf(&cmd.args, "git-%s", argv[0]);
589
+ argv_array_pushv(&cmd.args, argv + 1);
590
+ cmd.clean_on_exit = 1;
591
+ cmd.silent_exec_failure = 1;
592
591
- /*
592
- * argv[0] must be the git command, but the argv array
593
- * belongs to the caller, and may be reused in
594
- * subsequent loop iterations. Save argv[0] and
595
- * restore it on error.
596
- */
597
- tmp = argv[0];
598
- argv[0] = cmd.buf;
599
-
600
- trace_argv_printf(argv, "trace: exec:");
593
+ trace_argv_printf(cmd.args.argv, "trace: exec:");
594
595
/*
596
* if we fail because the command is not found, it is
597
* OK to return. Otherwise, we just pass along the status code.
598
*/
606
- status = run_command_v_opt(argv, RUN_SILENT_EXEC_FAILURE | RUN_CLEAN_ON_EXIT);
599
+ status = run_command(&cmd);
600
if (status >= 0 || errno != ENOENT)
601
exit(status);
609
-
610
- argv[0] = tmp;
611
-
612
- strbuf_release(&cmd);
602
}
603
604
static int run_argv(int *argcp, const char ***argv)