use env_array member of struct child_process

Convert users of struct child_process to using the managed env_array for
specifying environment variables instead of supplying an array on the
stack or bringing their own argv_array.  This shortens and simplifies
the code and ensures automatically that the allocated memory is freed
after use.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index f2f6c67359cb5941c2d57b6692ce1fbbc86edccc..7593861d758ad1ddb7fc7cc5aa839d26b2ace6c0 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -453,7 +453,6 @@ static const char *check_nonce(const char *buf, size_t len)
 static void prepare_push_cert_sha1(struct child_process *proc)
 {
        static int already_done;
 static void prepare_push_cert_sha1(struct child_process *proc)
 {
        static int already_done;

-       struct argv_array env = ARGV_ARRAY_INIT;

 
        if (!push_cert.len)
                return;
 
        if (!push_cert.len)
                return;


@@ -487,20 +486,26 @@ static void prepare_push_cert_sha1(struct child_process *proc)
                nonce_status = check_nonce(push_cert.buf, bogs);
        }
        if (!is_null_sha1(push_cert_sha1)) {
                nonce_status = check_nonce(push_cert.buf, bogs);
        }
        if (!is_null_sha1(push_cert_sha1)) {

-               argv_array_pushf(&env, "GIT_PUSH_CERT=%s", sha1_to_hex(push_cert_sha1));
-               argv_array_pushf(&env, "GIT_PUSH_CERT_SIGNER=%s",
+               argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT=%s",
+                                sha1_to_hex(push_cert_sha1));
+               argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s",

                                 sigcheck.signer ? sigcheck.signer : "");
                                 sigcheck.signer ? sigcheck.signer : "");

-               argv_array_pushf(&env, "GIT_PUSH_CERT_KEY=%s",
+               argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s",

                                 sigcheck.key ? sigcheck.key : "");
                                 sigcheck.key ? sigcheck.key : "");

-               argv_array_pushf(&env, "GIT_PUSH_CERT_STATUS=%c", sigcheck.result);
+               argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_STATUS=%c",
+                                sigcheck.result);

                if (push_cert_nonce) {
                if (push_cert_nonce) {

-                       argv_array_pushf(&env, "GIT_PUSH_CERT_NONCE=%s", push_cert_nonce);
-                       argv_array_pushf(&env, "GIT_PUSH_CERT_NONCE_STATUS=%s", nonce_status);
+                       argv_array_pushf(&proc->env_array,
+                                        "GIT_PUSH_CERT_NONCE=%s",
+                                        push_cert_nonce);
+                       argv_array_pushf(&proc->env_array,
+                                        "GIT_PUSH_CERT_NONCE_STATUS=%s",
+                                        nonce_status);

                        if (nonce_status == NONCE_SLOP)
                        if (nonce_status == NONCE_SLOP)

-                               argv_array_pushf(&env, "GIT_PUSH_CERT_NONCE_SLOP=%ld",
+                               argv_array_pushf(&proc->env_array,
+                                                "GIT_PUSH_CERT_NONCE_SLOP=%ld",

                                                 nonce_stamp_slop);
                }
                                                 nonce_stamp_slop);
                }

-               proc->env = env.argv;

        }
 }
 
        }
 }
 

diff --git a/http-backend.c b/http-backend.c
index 404e682593ecfca218d0aee0634f5c21356ef69c..e3e0dda0b8ee8ec94df3639c7b74d420e0144468 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -314,7 +314,6 @@ static void run_service(const char **argv)
        const char *encoding = getenv("HTTP_CONTENT_ENCODING");
        const char *user = getenv("REMOTE_USER");
        const char *host = getenv("REMOTE_ADDR");
        const char *encoding = getenv("HTTP_CONTENT_ENCODING");
        const char *user = getenv("REMOTE_USER");
        const char *host = getenv("REMOTE_ADDR");

-       struct argv_array env = ARGV_ARRAY_INIT;

        int gzipped_request = 0;
        struct child_process cld = CHILD_PROCESS_INIT;
 
        int gzipped_request = 0;
        struct child_process cld = CHILD_PROCESS_INIT;
 


@@ -329,13 +328,12 @@ static void run_service(const char **argv)
                host = "(none)";
 
        if (!getenv("GIT_COMMITTER_NAME"))
                host = "(none)";
 
        if (!getenv("GIT_COMMITTER_NAME"))

-               argv_array_pushf(&env, "GIT_COMMITTER_NAME=%s", user);
+               argv_array_pushf(&cld.env_array, "GIT_COMMITTER_NAME=%s", user);

        if (!getenv("GIT_COMMITTER_EMAIL"))
        if (!getenv("GIT_COMMITTER_EMAIL"))

-               argv_array_pushf(&env, "GIT_COMMITTER_EMAIL=%s@http.%s",
-                                user, host);
+               argv_array_pushf(&cld.env_array,
+                                "GIT_COMMITTER_EMAIL=%s@http.%s", user, host);

 
        cld.argv = argv;
 
        cld.argv = argv;

-       cld.env = env.argv;

        if (gzipped_request)
                cld.in = -1;
        cld.git_cmd = 1;
        if (gzipped_request)
                cld.in = -1;
        cld.git_cmd = 1;


@@ -350,7 +348,6 @@ static void run_service(const char **argv)
 
        if (finish_command(&cld))
                exit(1);
 
        if (finish_command(&cld))
                exit(1);

-       argv_array_clear(&env);

 }
 
 static int show_text_ref(const char *name, const unsigned char *sha1,
 }
 
 static int show_text_ref(const char *name, const unsigned char *sha1,

diff --git a/pager.c b/pager.c
index b2b805af98552061a723f3b8e2ac3093d0b897f7..f6e8c331924496ca6656cd05d7de6497310502ab 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -74,17 +74,10 @@ void setup_pager(void)
        pager_process.use_shell = 1;
        pager_process.argv = pager_argv;
        pager_process.in = -1;
        pager_process.use_shell = 1;
        pager_process.argv = pager_argv;
        pager_process.in = -1;

-       if (!getenv("LESS") || !getenv("LV")) {
-               static const char *env[3];
-               int i = 0;
-
-               if (!getenv("LESS"))
-                       env[i++] = "LESS=FRX";
-               if (!getenv("LV"))
-                       env[i++] = "LV=-c";
-               env[i] = NULL;
-               pager_process.env = env;
-       }
+       if (!getenv("LESS"))
+               argv_array_push(&pager_process.env_array, "LESS=FRX");
+       if (!getenv("LV"))
+               argv_array_push(&pager_process.env_array, "LV=-c");

        if (start_command(&pager_process))
                return;
 
        if (start_command(&pager_process))
                return;
 

diff --git a/transport-helper.c b/transport-helper.c
index 2b24d51a24adb9dfc885591ceb1653ace65f198a..033a2286137e3ed741eef40c0572affa0edac14b 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -108,12 +108,6 @@ static struct child_process *get_helper(struct transport *transport)
        int refspec_alloc = 0;
        int duped;
        int code;
        int refspec_alloc = 0;
        int duped;
        int code;

-       char git_dir_buf[sizeof(GIT_DIR_ENVIRONMENT) + PATH_MAX + 1];
-       const char *helper_env[] = {
-               git_dir_buf,
-               NULL
-       };
-

 
        if (data->helper)
                return data->helper;
 
        if (data->helper)
                return data->helper;


@@ -129,8 +123,8 @@ static struct child_process *get_helper(struct transport *transport)
        helper->git_cmd = 0;
        helper->silent_exec_failure = 1;
 
        helper->git_cmd = 0;
        helper->silent_exec_failure = 1;
 

-       snprintf(git_dir_buf, sizeof(git_dir_buf), "%s=%s", GIT_DIR_ENVIRONMENT, get_git_dir());
-       helper->env = helper_env;
+       argv_array_pushf(&helper->env_array, "%s=%s", GIT_DIR_ENVIRONMENT,
+                        get_git_dir());

 
        code = start_command(helper);
        if (code < 0 && errno == ENOENT)
 
        code = start_command(helper);
        if (code < 0 && errno == ENOENT)

diff --git a/wt-status.c b/wt-status.c
index 1bf5d725453f726f6a6179f9706a50f3c8c9dbb5..66d267c6743e8c182af64c1c057b58039fc78689 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -726,14 +726,14 @@ static void wt_status_print_changed(struct wt_status *s)
 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
 {
        struct child_process sm_summary = CHILD_PROCESS_INIT;
 static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
 {
        struct child_process sm_summary = CHILD_PROCESS_INIT;

-       struct argv_array env = ARGV_ARRAY_INIT;

        struct argv_array argv = ARGV_ARRAY_INIT;
        struct strbuf cmd_stdout = STRBUF_INIT;
        struct strbuf summary = STRBUF_INIT;
        char *summary_content;
        size_t len;
 
        struct argv_array argv = ARGV_ARRAY_INIT;
        struct strbuf cmd_stdout = STRBUF_INIT;
        struct strbuf summary = STRBUF_INIT;
        char *summary_content;
        size_t len;
 

-       argv_array_pushf(&env, "GIT_INDEX_FILE=%s", s->index_file);
+       argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
+                        s->index_file);

 
        argv_array_push(&argv, "submodule");
        argv_array_push(&argv, "summary");
 
        argv_array_push(&argv, "submodule");
        argv_array_push(&argv, "summary");


@@ -745,14 +745,12 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt
                argv_array_push(&argv, s->amend ? "HEAD^" : "HEAD");
 
        sm_summary.argv = argv.argv;
                argv_array_push(&argv, s->amend ? "HEAD^" : "HEAD");
 
        sm_summary.argv = argv.argv;

-       sm_summary.env = env.argv;

        sm_summary.git_cmd = 1;
        sm_summary.no_stdin = 1;
        fflush(s->fp);
        sm_summary.out = -1;
 
        run_command(&sm_summary);
        sm_summary.git_cmd = 1;
        sm_summary.no_stdin = 1;
        fflush(s->fp);
        sm_summary.out = -1;
 
        run_command(&sm_summary);

-       argv_array_clear(&env);

        argv_array_clear(&argv);
 
        len = strbuf_read(&cmd_stdout, sm_summary.out, 1024);
        argv_array_clear(&argv);
 
        len = strbuf_read(&cmd_stdout, sm_summary.out, 1024);