prepare_{git,shell}_cmd: use argv_array
[git/git.git] / exec_cmd.c
CommitLineData
77cb17e9
MO
1#include "cache.h"
2#include "exec_cmd.h"
575ba9d6 3#include "quote.h"
20574f55 4#include "argv-array.h"
77cb17e9
MO
5#define MAX_ARGS 32
6
384df833 7static const char *argv_exec_path;
e1464ca7 8static const char *argv0_path;
77cb17e9 9
59362e56 10char *system_path(const char *path)
2de9de5e 11{
35fb0e86
SP
12#ifdef RUNTIME_PREFIX
13 static const char *prefix;
14#else
026fa0d5 15 static const char *prefix = PREFIX;
35fb0e86 16#endif
026fa0d5
SP
17 struct strbuf d = STRBUF_INIT;
18
19 if (is_absolute_path(path))
59362e56 20 return xstrdup(path);
026fa0d5 21
35fb0e86
SP
22#ifdef RUNTIME_PREFIX
23 assert(argv0_path);
24 assert(is_absolute_path(argv0_path));
25
024aa7d8
JS
26 if (!prefix &&
27 !(prefix = strip_path_suffix(argv0_path, GIT_EXEC_PATH)) &&
28 !(prefix = strip_path_suffix(argv0_path, BINDIR)) &&
29 !(prefix = strip_path_suffix(argv0_path, "git"))) {
35fb0e86 30 prefix = PREFIX;
aa094570 31 trace_printf("RUNTIME_PREFIX requested, "
35fb0e86
SP
32 "but prefix computation failed. "
33 "Using static fallback '%s'.\n", prefix);
34 }
35#endif
36
026fa0d5 37 strbuf_addf(&d, "%s/%s", prefix, path);
59362e56 38 return strbuf_detach(&d, NULL);
2de9de5e
SP
39}
40
4dd47c3b 41const char *git_extract_argv0_path(const char *argv0)
e1464ca7 42{
2cd72b0b
SP
43 const char *slash;
44
45 if (!argv0 || !*argv0)
46 return NULL;
47 slash = argv0 + strlen(argv0);
4dd47c3b
SH
48
49 while (argv0 <= slash && !is_dir_sep(*slash))
50 slash--;
51
52 if (slash >= argv0) {
53 argv0_path = xstrndup(argv0, slash - argv0);
54 return slash + 1;
55 }
56
57 return argv0;
e1464ca7
JS
58}
59
384df833 60void git_set_argv_exec_path(const char *exec_path)
77cb17e9 61{
384df833 62 argv_exec_path = exec_path;
c90d565a
JS
63 /*
64 * Propagate this setting to external programs.
65 */
66 setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);
77cb17e9
MO
67}
68
69
70/* Returns the highest-priority, location to look for git programs. */
962554c6 71const char *git_exec_path(void)
77cb17e9
MO
72{
73 const char *env;
74
384df833
SP
75 if (argv_exec_path)
76 return argv_exec_path;
77cb17e9 77
d4ebc36c 78 env = getenv(EXEC_PATH_ENVIRONMENT);
2b601626 79 if (env && *env) {
77cb17e9
MO
80 return env;
81 }
82
49fa65a7 83 return system_path(GIT_EXEC_PATH);
77cb17e9
MO
84}
85
511707d4
SP
86static void add_path(struct strbuf *out, const char *path)
87{
88 if (path && *path) {
9610decf 89 strbuf_add_absolute_path(out, path);
80ba074f 90 strbuf_addch(out, PATH_SEP);
511707d4
SP
91 }
92}
93
e1464ca7 94void setup_path(void)
511707d4
SP
95{
96 const char *old_path = getenv("PATH");
f285a2d7 97 struct strbuf new_path = STRBUF_INIT;
511707d4 98
8e346283 99 add_path(&new_path, git_exec_path());
511707d4
SP
100
101 if (old_path)
102 strbuf_addstr(&new_path, old_path);
103 else
cb6a22c0 104 strbuf_addstr(&new_path, _PATH_DEFPATH);
511707d4
SP
105
106 setenv("PATH", new_path.buf, 1);
107
108 strbuf_release(&new_path);
109}
77cb17e9 110
20574f55 111const char **prepare_git_cmd(struct argv_array *out, const char **argv)
77cb17e9 112{
20574f55
JK
113 argv_array_push(out, "git");
114 argv_array_pushv(out, argv);
115 return out->argv;
4933e5eb
SP
116}
117
118int execv_git_cmd(const char **argv) {
20574f55
JK
119 struct argv_array nargv = ARGV_ARRAY_INIT;
120
121 prepare_git_cmd(&nargv, argv);
122 trace_argv_printf(nargv.argv, "trace: exec:");
575ba9d6 123
511707d4 124 /* execvp() can only ever return if it fails */
20574f55 125 sane_execvp("git", (char **)nargv.argv);
77cb17e9 126
511707d4 127 trace_printf("trace: exec failed: %s\n", strerror(errno));
575ba9d6 128
20574f55 129 argv_array_clear(&nargv);
511707d4 130 return -1;
77cb17e9
MO
131}
132
133
9201c707 134int execl_git_cmd(const char *cmd,...)
77cb17e9
MO
135{
136 int argc;
9201c707
JH
137 const char *argv[MAX_ARGS + 1];
138 const char *arg;
77cb17e9
MO
139 va_list param;
140
141 va_start(param, cmd);
142 argv[0] = cmd;
143 argc = 1;
144 while (argc < MAX_ARGS) {
145 arg = argv[argc++] = va_arg(param, char *);
146 if (!arg)
147 break;
148 }
149 va_end(param);
150 if (MAX_ARGS <= argc)
151 return error("too many args to run %s", cmd);
152
153 argv[argc] = NULL;
154 return execv_git_cmd(argv);
155}