mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wt-status: use argv_array for environment

Browse Source 
Instead of using a PATH_MAX buffer, use argv_array for constructing the
environment for git submodule summary.  This simplifies the code a bit
and removes the arbitrary length limit.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2014-06-29 22:47:00 +02:00
committed by Junio C Hamano
parent 341e7e8eda
commit 85dd6bf491
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wt-status.c
View File

@ -735,8 +735,7 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt
{ {
struct child_process sm_summary; struct child_process sm_summary;
char summary_limit[64]; char summary_limit[64];
char index[PATH_MAX]; struct argv_array env = ARGV_ARRAY_INIT;
const char *env[] = { NULL, NULL };
struct argv_array argv = ARGV_ARRAY_INIT; struct argv_array argv = ARGV_ARRAY_INIT;
struct strbuf cmd_stdout = STRBUF_INIT; struct strbuf cmd_stdout = STRBUF_INIT;
struct strbuf summary = STRBUF_INIT; struct strbuf summary = STRBUF_INIT;
@ -744,9 +743,8 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt
size_t len; size_t len;
sprintf(summary_limit, "%d", s->submodule_summary); sprintf(summary_limit, "%d", s->submodule_summary);
snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file); argv_array_pushf(&env, "GIT_INDEX_FILE=%s", s->index_file);
env[0] = index;
argv_array_push(&argv, "submodule"); argv_array_push(&argv, "submodule");
argv_array_push(&argv, "summary"); argv_array_push(&argv, "summary");
argv_array_push(&argv, uncommitted ? "--files" : "--cached"); argv_array_push(&argv, uncommitted ? "--files" : "--cached");
@ -758,13 +756,14 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt
memset(&sm_summary, 0, sizeof(sm_summary)); memset(&sm_summary, 0, sizeof(sm_summary));
sm_summary.argv = argv.argv; sm_summary.argv = argv.argv;
sm_summary.env = env; sm_summary.env = env.argv;
sm_summary.git_cmd = 1; sm_summary.git_cmd = 1;
sm_summary.no_stdin = 1; sm_summary.no_stdin = 1;
fflush(s->fp); fflush(s->fp);
sm_summary.out = -1; sm_summary.out = -1;
run_command(&sm_summary); run_command(&sm_summary);
argv_array_clear(&env);
argv_array_clear(&argv); argv_array_clear(&argv);
len = strbuf_read(&cmd_stdout, sm_summary.out, 1024); len = strbuf_read(&cmd_stdout, sm_summary.out, 1024);