2006-01-11 02:12:17 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "exec_cmd.h"
|
2006-06-25 13:56:18 +00:00
|
|
|
#include "quote.h"
|
2006-01-11 02:12:17 +00:00
|
|
|
#define MAX_ARGS 32
|
|
|
|
|
|
|
|
extern char **environ;
|
2007-10-27 08:36:51 +00:00
|
|
|
static const char *argv_exec_path;
|
2008-07-21 19:19:52 +00:00
|
|
|
static const char *argv0_path;
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2008-07-13 20:31:18 +00:00
|
|
|
const char *system_path(const char *path)
|
|
|
|
{
|
2008-07-21 19:19:53 +00:00
|
|
|
if (!is_absolute_path(path) && argv0_path) {
|
2008-07-13 20:31:18 +00:00
|
|
|
struct strbuf d = STRBUF_INIT;
|
2008-07-21 19:19:53 +00:00
|
|
|
strbuf_addf(&d, "%s/%s", argv0_path, path);
|
2008-07-13 20:31:18 +00:00
|
|
|
path = strbuf_detach(&d, NULL);
|
|
|
|
}
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
2008-07-21 19:19:52 +00:00
|
|
|
void git_set_argv0_path(const char *path)
|
|
|
|
{
|
|
|
|
argv0_path = path;
|
|
|
|
}
|
|
|
|
|
2007-10-27 08:36:51 +00:00
|
|
|
void git_set_argv_exec_path(const char *exec_path)
|
2006-01-11 02:12:17 +00:00
|
|
|
{
|
2007-10-27 08:36:51 +00:00
|
|
|
argv_exec_path = exec_path;
|
2006-01-11 02:12:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Returns the highest-priority, location to look for git programs. */
|
2006-02-26 15:13:46 +00:00
|
|
|
const char *git_exec_path(void)
|
2006-01-11 02:12:17 +00:00
|
|
|
{
|
|
|
|
const char *env;
|
|
|
|
|
2007-10-27 08:36:51 +00:00
|
|
|
if (argv_exec_path)
|
|
|
|
return argv_exec_path;
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2006-12-19 09:28:15 +00:00
|
|
|
env = getenv(EXEC_PATH_ENVIRONMENT);
|
2006-05-29 00:34:34 +00:00
|
|
|
if (env && *env) {
|
2006-01-11 02:12:17 +00:00
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2008-07-23 19:12:18 +00:00
|
|
|
return system_path(GIT_EXEC_PATH);
|
2006-01-11 02:12:17 +00:00
|
|
|
}
|
|
|
|
|
2007-10-28 11:17:20 +00:00
|
|
|
static void add_path(struct strbuf *out, const char *path)
|
|
|
|
{
|
|
|
|
if (path && *path) {
|
|
|
|
if (is_absolute_path(path))
|
|
|
|
strbuf_addstr(out, path);
|
|
|
|
else
|
|
|
|
strbuf_addstr(out, make_absolute_path(path));
|
|
|
|
|
2007-12-03 20:55:57 +00:00
|
|
|
strbuf_addch(out, PATH_SEP);
|
2007-10-28 11:17:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-21 19:19:52 +00:00
|
|
|
void setup_path(void)
|
2007-10-28 11:17:20 +00:00
|
|
|
{
|
|
|
|
const char *old_path = getenv("PATH");
|
|
|
|
struct strbuf new_path;
|
|
|
|
|
|
|
|
strbuf_init(&new_path, 0);
|
|
|
|
|
|
|
|
add_path(&new_path, argv_exec_path);
|
|
|
|
add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
|
2008-07-23 19:12:18 +00:00
|
|
|
add_path(&new_path, system_path(GIT_EXEC_PATH));
|
2008-07-21 19:19:52 +00:00
|
|
|
add_path(&new_path, argv0_path);
|
2007-10-28 11:17:20 +00:00
|
|
|
|
|
|
|
if (old_path)
|
|
|
|
strbuf_addstr(&new_path, old_path);
|
|
|
|
else
|
|
|
|
strbuf_addstr(&new_path, "/usr/local/bin:/usr/bin:/bin");
|
|
|
|
|
|
|
|
setenv("PATH", new_path.buf, 1);
|
|
|
|
|
|
|
|
strbuf_release(&new_path);
|
|
|
|
}
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2006-03-05 10:47:29 +00:00
|
|
|
int execv_git_cmd(const char **argv)
|
2006-01-11 02:12:17 +00:00
|
|
|
{
|
2007-12-02 06:09:22 +00:00
|
|
|
int argc;
|
|
|
|
const char **nargv;
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2007-12-02 06:09:22 +00:00
|
|
|
for (argc = 0; argv[argc]; argc++)
|
|
|
|
; /* just counting */
|
|
|
|
nargv = xmalloc(sizeof(*nargv) * (argc + 2));
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2007-12-02 06:09:22 +00:00
|
|
|
nargv[0] = "git";
|
|
|
|
for (argc = 0; argv[argc]; argc++)
|
|
|
|
nargv[argc + 1] = argv[argc];
|
|
|
|
nargv[argc + 1] = NULL;
|
|
|
|
trace_argv_printf(nargv, "trace: exec:");
|
2006-06-25 13:56:18 +00:00
|
|
|
|
2007-10-28 11:17:20 +00:00
|
|
|
/* execvp() can only ever return if it fails */
|
2007-12-02 06:09:22 +00:00
|
|
|
execvp("git", (char **)nargv);
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2007-10-28 11:17:20 +00:00
|
|
|
trace_printf("trace: exec failed: %s\n", strerror(errno));
|
2006-06-25 13:56:18 +00:00
|
|
|
|
2007-12-02 06:09:22 +00:00
|
|
|
free(nargv);
|
2007-10-28 11:17:20 +00:00
|
|
|
return -1;
|
2006-01-11 02:12:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-03-05 10:47:29 +00:00
|
|
|
int execl_git_cmd(const char *cmd,...)
|
2006-01-11 02:12:17 +00:00
|
|
|
{
|
|
|
|
int argc;
|
2006-03-05 10:47:29 +00:00
|
|
|
const char *argv[MAX_ARGS + 1];
|
|
|
|
const char *arg;
|
2006-01-11 02:12:17 +00:00
|
|
|
va_list param;
|
|
|
|
|
|
|
|
va_start(param, cmd);
|
|
|
|
argv[0] = cmd;
|
|
|
|
argc = 1;
|
|
|
|
while (argc < MAX_ARGS) {
|
|
|
|
arg = argv[argc++] = va_arg(param, char *);
|
|
|
|
if (!arg)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
va_end(param);
|
|
|
|
if (MAX_ARGS <= argc)
|
|
|
|
return error("too many args to run %s", cmd);
|
|
|
|
|
|
|
|
argv[argc] = NULL;
|
|
|
|
return execv_git_cmd(argv);
|
|
|
|
}
|