Merge branch 'maint-1.6.0' into maint-1.6.1
[tgit.git] / exec_cmd.c
blob351fec2e9e374eacaeba88d2a7dddf11f5e331ce
1 #include "cache.h"
2 #include "exec_cmd.h"
3 #include "quote.h"
4 #define MAX_ARGS 32
6 extern char **environ;
7 static const char *argv_exec_path;
8 static const char *argv0_path;
10 const char *system_path(const char *path)
12 if (!is_absolute_path(path) && argv0_path) {
13 struct strbuf d = STRBUF_INIT;
14 strbuf_addf(&d, "%s/%s", argv0_path, path);
15 path = strbuf_detach(&d, NULL);
17 return path;
20 void git_set_argv0_path(const char *path)
22 argv0_path = path;
25 void git_set_argv_exec_path(const char *exec_path)
27 argv_exec_path = exec_path;
29 * Propagate this setting to external programs.
31 setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);
35 /* Returns the highest-priority, location to look for git programs. */
36 const char *git_exec_path(void)
38 const char *env;
40 if (argv_exec_path)
41 return argv_exec_path;
43 env = getenv(EXEC_PATH_ENVIRONMENT);
44 if (env && *env) {
45 return env;
48 return system_path(GIT_EXEC_PATH);
51 static void add_path(struct strbuf *out, const char *path)
53 if (path && *path) {
54 if (is_absolute_path(path))
55 strbuf_addstr(out, path);
56 else
57 strbuf_addstr(out, make_nonrelative_path(path));
59 strbuf_addch(out, PATH_SEP);
63 void setup_path(void)
65 const char *old_path = getenv("PATH");
66 struct strbuf new_path = STRBUF_INIT;
68 add_path(&new_path, argv_exec_path);
69 add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
70 add_path(&new_path, system_path(GIT_EXEC_PATH));
71 add_path(&new_path, argv0_path);
73 if (old_path)
74 strbuf_addstr(&new_path, old_path);
75 else
76 strbuf_addstr(&new_path, "/usr/local/bin:/usr/bin:/bin");
78 setenv("PATH", new_path.buf, 1);
80 strbuf_release(&new_path);
83 const char **prepare_git_cmd(const char **argv)
85 int argc;
86 const char **nargv;
88 for (argc = 0; argv[argc]; argc++)
89 ; /* just counting */
90 nargv = xmalloc(sizeof(*nargv) * (argc + 2));
92 nargv[0] = "git";
93 for (argc = 0; argv[argc]; argc++)
94 nargv[argc + 1] = argv[argc];
95 nargv[argc + 1] = NULL;
96 return nargv;
99 int execv_git_cmd(const char **argv) {
100 const char **nargv = prepare_git_cmd(argv);
101 trace_argv_printf(nargv, "trace: exec:");
103 /* execvp() can only ever return if it fails */
104 execvp("git", (char **)nargv);
106 trace_printf("trace: exec failed: %s\n", strerror(errno));
108 free(nargv);
109 return -1;
113 int execl_git_cmd(const char *cmd,...)
115 int argc;
116 const char *argv[MAX_ARGS + 1];
117 const char *arg;
118 va_list param;
120 va_start(param, cmd);
121 argv[0] = cmd;
122 argc = 1;
123 while (argc < MAX_ARGS) {
124 arg = argv[argc++] = va_arg(param, char *);
125 if (!arg)
126 break;
128 va_end(param);
129 if (MAX_ARGS <= argc)
130 return error("too many args to run %s", cmd);
132 argv[argc] = NULL;
133 return execv_git_cmd(argv);