зеркало из https://github.com/microsoft/git.git
run-command API users: use strvec_pushv(), not argv assignment
Migrate those run-command API users that assign directly to the "argv" member to use a strvec_pushv() of "args" instead. In these cases it did not make sense to further refactor these callers, e.g. daemon.c could be made to construct the arguments closer to handle(), but that would require moving the construction from its cmd_main() and pass "argv" through two intermediate functions. It would be possible for a change like this to introduce a regression if we were doing: cp.argv = argv; argv[1] = "foo"; And changed the code, as is being done here, to: strvec_pushv(&cp.args, argv); argv[1] = "foo"; But as viewing this change with the "-W" flag reveals none of these functions modify variable that's being pushed afterwards in a way that would introduce such a logic error. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
c8a4cd55d9
Коммит
6def0ff878
|
@ -413,7 +413,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
|
|||
strvec_push(&args, ps->items[i].original);
|
||||
|
||||
setup_child_process(s, &cp, NULL);
|
||||
cp.argv = args.v;
|
||||
strvec_pushv(&cp.args, args.v);
|
||||
res = capture_command(&cp, plain, 0);
|
||||
if (res) {
|
||||
strvec_clear(&args);
|
||||
|
@ -431,7 +431,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
|
|||
|
||||
setup_child_process(s, &colored_cp, NULL);
|
||||
xsnprintf((char *)args.v[color_arg_index], 8, "--color");
|
||||
colored_cp.argv = args.v;
|
||||
strvec_pushv(&colored_cp.args, args.v);
|
||||
colored = &s->colored;
|
||||
res = capture_command(&colored_cp, colored, 0);
|
||||
strvec_clear(&args);
|
||||
|
|
2
daemon.c
2
daemon.c
|
@ -922,7 +922,7 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
|
|||
#endif
|
||||
}
|
||||
|
||||
cld.argv = cld_argv.v;
|
||||
strvec_pushv(&cld.args, cld_argv.v);
|
||||
cld.in = incoming;
|
||||
cld.out = dup(incoming);
|
||||
|
||||
|
|
|
@ -480,7 +480,7 @@ static void run_service(const char **argv, int buffer_input)
|
|||
strvec_pushf(&cld.env_array,
|
||||
"GIT_COMMITTER_EMAIL=%s@http.%s", user, host);
|
||||
|
||||
cld.argv = argv;
|
||||
strvec_pushv(&cld.args, argv);
|
||||
if (buffer_input || gzipped_request || req_len >= 0)
|
||||
cld.in = -1;
|
||||
cld.git_cmd = 1;
|
||||
|
|
5
http.c
5
http.c
|
@ -2126,8 +2126,9 @@ int finish_http_pack_request(struct http_pack_request *preq)
|
|||
|
||||
ip.git_cmd = 1;
|
||||
ip.in = tmpfile_fd;
|
||||
ip.argv = preq->index_pack_args ? preq->index_pack_args
|
||||
: default_index_pack_args;
|
||||
strvec_pushv(&ip.args, preq->index_pack_args ?
|
||||
preq->index_pack_args :
|
||||
default_index_pack_args);
|
||||
|
||||
if (preq->preserve_index_pack_stdout)
|
||||
ip.out = 0;
|
||||
|
|
|
@ -1061,7 +1061,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
|
|||
client.in = -1;
|
||||
client.out = -1;
|
||||
client.git_cmd = 1;
|
||||
client.argv = client_argv;
|
||||
strvec_pushv(&client.args, client_argv);
|
||||
if (start_command(&client))
|
||||
exit(1);
|
||||
write_or_die(client.in, preamble->buf, preamble->len);
|
||||
|
|
|
@ -1039,7 +1039,7 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
|
|||
const char *const *env, const char *tr2_class)
|
||||
{
|
||||
struct child_process cmd = CHILD_PROCESS_INIT;
|
||||
cmd.argv = argv;
|
||||
strvec_pushv(&cmd.args, argv);
|
||||
cmd.no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0;
|
||||
cmd.git_cmd = opt & RUN_GIT_CMD ? 1 : 0;
|
||||
cmd.stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0;
|
||||
|
|
|
@ -15,6 +15,6 @@ int cmd__subprocess(int argc, const char **argv)
|
|||
argv++;
|
||||
}
|
||||
cp.git_cmd = 1;
|
||||
cp.argv = (const char **)argv + 1;
|
||||
strvec_pushv(&cp.args, (const char **)argv + 1);
|
||||
return run_command(&cp);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче