prepare_{git,shell}_cmd: use argv_array
[git/gitweb.git] / exec_cmd.c
blobcf442a97f86aea7accc673d3fe55b9b7494dbf78
1 #include "cache.h"
2 #include "exec_cmd.h"
3 #include "quote.h"
4 #include "argv-array.h"
5 #define MAX_ARGS 32
7 static const char *argv_exec_path;
8 static const char *argv0_path;
10 char *system_path(const char *path)
12 #ifdef RUNTIME_PREFIX
13 static const char *prefix;
14 #else
15 static const char *prefix = PREFIX;
16 #endif
17 struct strbuf d = STRBUF_INIT;
19 if (is_absolute_path(path))
20 return xstrdup(path);
22 #ifdef RUNTIME_PREFIX
23 assert(argv0_path);
24 assert(is_absolute_path(argv0_path));
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"))) {
30 prefix = PREFIX;
31 trace_printf("RUNTIME_PREFIX requested, "
32 "but prefix computation failed. "
33 "Using static fallback '%s'.\n", prefix);
35 #endif
37 strbuf_addf(&d, "%s/%s", prefix, path);
38 return strbuf_detach(&d, NULL);
41 const char *git_extract_argv0_path(const char *argv0)
43 const char *slash;
45 if (!argv0 || !*argv0)
46 return NULL;
47 slash = argv0 + strlen(argv0);
49 while (argv0 <= slash && !is_dir_sep(*slash))
50 slash--;
52 if (slash >= argv0) {
53 argv0_path = xstrndup(argv0, slash - argv0);
54 return slash + 1;
57 return argv0;
60 void git_set_argv_exec_path(const char *exec_path)
62 argv_exec_path = exec_path;
64 * Propagate this setting to external programs.
66 setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);
70 /* Returns the highest-priority, location to look for git programs. */
71 const char *git_exec_path(void)
73 const char *env;
75 if (argv_exec_path)
76 return argv_exec_path;
78 env = getenv(EXEC_PATH_ENVIRONMENT);
79 if (env && *env) {
80 return env;
83 return system_path(GIT_EXEC_PATH);
86 static void add_path(struct strbuf *out, const char *path)
88 if (path && *path) {
89 strbuf_add_absolute_path(out, path);
90 strbuf_addch(out, PATH_SEP);
94 void setup_path(void)
96 const char *old_path = getenv("PATH");
97 struct strbuf new_path = STRBUF_INIT;
99 add_path(&new_path, git_exec_path());
101 if (old_path)
102 strbuf_addstr(&new_path, old_path);
103 else
104 strbuf_addstr(&new_path, _PATH_DEFPATH);
106 setenv("PATH", new_path.buf, 1);
108 strbuf_release(&new_path);
111 const char **prepare_git_cmd(struct argv_array *out, const char **argv)
113 argv_array_push(out, "git");
114 argv_array_pushv(out, argv);
115 return out->argv;
118 int execv_git_cmd(const char **argv) {
119 struct argv_array nargv = ARGV_ARRAY_INIT;
121 prepare_git_cmd(&nargv, argv);
122 trace_argv_printf(nargv.argv, "trace: exec:");
124 /* execvp() can only ever return if it fails */
125 sane_execvp("git", (char **)nargv.argv);
127 trace_printf("trace: exec failed: %s\n", strerror(errno));
129 argv_array_clear(&nargv);
130 return -1;
134 int execl_git_cmd(const char *cmd,...)
136 int argc;
137 const char *argv[MAX_ARGS + 1];
138 const char *arg;
139 va_list param;
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;
149 va_end(param);
150 if (MAX_ARGS <= argc)
151 return error("too many args to run %s", cmd);
153 argv[argc] = NULL;
154 return execv_git_cmd(argv);