# [PATCH] http: use internal argv_array of struct child_process 3 messages from 2017-12-22 to 2017-12-22. Participants: René Scharfe, Eric Sunshine. Thread: https://gitlist.dev/t/47479 ## René Scharfe, 2017-12-22 08:14 Subject: [PATCH] http: use internal argv_array of struct child_process Message-ID: <504cafe3-2960-af2d-10fe-51e8ba3d2213@web.de> URL: https://gitlist.dev/e/504cafe3-2960-af2d-10fe-51e8ba3d2213%40web.de ``` Avoid a strangely magic array size (it's slightly too big) and explicit index numbers by building the command line for index-pack using the embedded argv_array of the child_process. The resulting code is shorter and easier to extend. Signed-off-by: Rene Scharfe --- http.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/http.c b/http.c index 215bebef1b..b22b4ada58 100644 --- a/http.c +++ b/http.c @@ -2025,7 +2025,6 @@ int finish_http_pack_request(struct http_pack_request *preq) char *tmp_idx; size_t len; struct child_process ip = CHILD_PROCESS_INIT; - const char *ip_argv[8]; close_pack_index(p); @@ -2041,13 +2040,10 @@ int finish_http_pack_request(struct http_pack_request *preq) die("BUG: pack tmpfile does not end in .pack.temp?"); tmp_idx = xstrfmt("%.*s.idx.temp", (int)len, preq->tmpfile); - ip_argv[0] = "index-pack"; - ip_argv[1] = "-o"; - ip_argv[2] = tmp_idx; - ip_argv[3] = preq->tmpfile; - ip_argv[4] = NULL; - - ip.argv = ip_argv; + argv_array_push(&ip.args, "index-pack"); + argv_array_push(&ip.args, "-o"); + argv_array_push(&ip.args, tmp_idx); + argv_array_push(&ip.args, preq->tmpfile); ip.git_cmd = 1; ip.no_stdin = 1; ip.no_stdout = 1; -- 2.15.1 ``` ## Eric Sunshine, 2017-12-22 08:59 Subject: Re: [PATCH] http: use internal argv_array of struct child_process Message-ID: URL: https://gitlist.dev/e/CAPig%2BcQaQ9ae1e4eMfJMG4wykXe2tTgtvpxB1_Z%3D3XbitYeQyw%40mail.gmail.com In-Reply-To: <504cafe3-2960-af2d-10fe-51e8ba3d2213@web.de> ``` On Fri, Dec 22, 2017 at 3:14 AM, René Scharfe wrote: > Avoid a strangely magic array size (it's slightly too big) and explicit > index numbers by building the command line for index-pack using the > embedded argv_array of the child_process. The resulting code is shorter > and easier to extend. > > Signed-off-by: Rene Scharfe > --- > diff --git a/http.c b/http.c > @@ -2041,13 +2040,10 @@ int finish_http_pack_request(struct http_pack_request *preq) > - ip_argv[0] = "index-pack"; > - ip_argv[1] = "-o"; > - ip_argv[2] = tmp_idx; > - ip_argv[3] = preq->tmpfile; > - ip_argv[4] = NULL; > - > - ip.argv = ip_argv; > + argv_array_push(&ip.args, "index-pack"); > + argv_array_push(&ip.args, "-o"); > + argv_array_push(&ip.args, tmp_idx); > + argv_array_push(&ip.args, preq->tmpfile); Not necessarily worth a re-roll, but using the "pushl" variant would make it clear that "-o" and tmp_idx are related and would ensure that they don't accidentally get split up if someone inserts a new "push" in the sequence in the future. argv_array_push(&ip.args, "index-pack"); argv_array_pushl(&ip.args, "-o", tmp_idx, NULL); argv_array_push(&ip.args, preq->tmpfile); ``` ## René Scharfe, 2017-12-22 11:56 Subject: [PATCH v2] http: use internal argv_array of struct child_process Message-ID: <6bebb8a0-31ec-b20c-2430-2d69daa63dea@web.de> URL: https://gitlist.dev/e/6bebb8a0-31ec-b20c-2430-2d69daa63dea%40web.de In-Reply-To: ``` Avoid a strangely magic array size (it's slightly too big) and explicit index numbers by building the command line for index-pack using the embedded argv_array of the child_process. Add the flag -o and its argument with argv_array_pushl() to make it obvious that they belong together. The resulting code is shorter and easier to extend. Helped-by: Eric Sunshine Signed-off-by: Rene Scharfe --- Change from v1: use argv_array_pushl for -o and tmp_idx. Thanks, Eric, good idea! http.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/http.c b/http.c index 215bebef1b..9f2fcc9ec4 100644 --- a/http.c +++ b/http.c @@ -2025,7 +2025,6 @@ int finish_http_pack_request(struct http_pack_request *preq) char *tmp_idx; size_t len; struct child_process ip = CHILD_PROCESS_INIT; - const char *ip_argv[8]; close_pack_index(p); @@ -2041,13 +2040,9 @@ int finish_http_pack_request(struct http_pack_request *preq) die("BUG: pack tmpfile does not end in .pack.temp?"); tmp_idx = xstrfmt("%.*s.idx.temp", (int)len, preq->tmpfile); - ip_argv[0] = "index-pack"; - ip_argv[1] = "-o"; - ip_argv[2] = tmp_idx; - ip_argv[3] = preq->tmpfile; - ip_argv[4] = NULL; - - ip.argv = ip_argv; + argv_array_push(&ip.args, "index-pack"); + argv_array_pushl(&ip.args, "-o", tmp_idx, NULL); + argv_array_push(&ip.args, preq->tmpfile); ip.git_cmd = 1; ip.no_stdin = 1; ip.no_stdout = 1; -- 2.15.1 ```