2006-01-11 03:12:17 +01:00
|
|
|
#include "cache.h"
|
|
|
|
#include "exec_cmd.h"
|
2006-06-25 15:56:18 +02:00
|
|
|
#include "quote.h"
|
2006-01-11 03:12:17 +01:00
|
|
|
#define MAX_ARGS 32
|
|
|
|
|
|
|
|
extern char **environ;
|
2007-10-27 10:36:51 +02:00
|
|
|
static const char *argv_exec_path;
|
2008-07-21 21:19:52 +02:00
|
|
|
static const char *argv0_path;
|
2006-01-11 03:12:17 +01:00
|
|
|
|
2008-07-13 22:31:18 +02:00
|
|
|
const char *system_path(const char *path)
|
|
|
|
{
|
2008-07-21 21:19:53 +02:00
|
|
|
if (!is_absolute_path(path) && argv0_path) {
|
2008-07-13 22:31:18 +02:00
|
|
|
struct strbuf d = STRBUF_INIT;
|
2008-07-21 21:19:53 +02:00
|
|
|
strbuf_addf(&d, "%s/%s", argv0_path, path);
|
2008-07-13 22:31:18 +02:00
|
|
|
path = strbuf_detach(&d, NULL);
|
|
|
|
}
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
2008-07-21 21:19:52 +02:00
|
|
|
void git_set_argv0_path(const char *path)
|
|
|
|
{
|
|
|
|
argv0_path = path;
|
|
|
|
}
|
|
|
|
|
2007-10-27 10:36:51 +02:00
|
|
|
void git_set_argv_exec_path(const char *exec_path)
|
2006-01-11 03:12:17 +01:00
|
|
|
{
|
2007-10-27 10:36:51 +02:00
|
|
|
argv_exec_path = exec_path;
|
Propagate --exec-path setting to external commands via GIT_EXEC_PATH
Let PATH0=$PATH that was set before the invocation.
Let /foo be a build directory.
Let /pfx be the installation prefix.
Let pfxexecpath=/pfx/libexec/git-core.
The following is going on when 'git --exec-path=/foo gc' is invoked:
1. git sets PATH=/foo:$PATH0 using the path from --exec-path
2. gc execs 'git repack' (note: no dash).
3. Since there is a git in /foo (it's a build directory), /foo/git is
taken.
4. No explicit exec-path is set this time, hence, this secondary git sets
PATH=$pfxexecpath:/foo:$PATH
5. Since 'repack' is not a built-in, execv_dashed_external execs
'git-repack' (note: dash).
6. There is a $pfxexecpath/git-repack, and it is taken.
7. This git-repack runs 'git pack-objects' (note: no dash).
8. There is no git in $pfxexecpath, but there is one in /foo. Hence,
/foo/git is run.
9. pack-objects is a builtin, hence, in effect /foo/git-pack-objects
is run.
As you can see, the way in which we previously set the PATH allowed to
mix gits of different vintage. By setting GIT_EXEC_PATH when --exec-path
was given on the command line, we reduce the confusion.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-21 23:21:18 +01:00
|
|
|
/*
|
|
|
|
* Propagate this setting to external programs.
|
|
|
|
*/
|
|
|
|
setenv(EXEC_PATH_ENVIRONMENT, exec_path, 1);
|
2006-01-11 03:12:17 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Returns the highest-priority, location to look for git programs. */
|
2006-02-26 16:13:46 +01:00
|
|
|
const char *git_exec_path(void)
|
2006-01-11 03:12:17 +01:00
|
|
|
{
|
|
|
|
const char *env;
|
|
|
|
|
2007-10-27 10:36:51 +02:00
|
|
|
if (argv_exec_path)
|
|
|
|
return argv_exec_path;
|
2006-01-11 03:12:17 +01:00
|
|
|
|
2006-12-19 10:28:15 +01:00
|
|
|
env = getenv(EXEC_PATH_ENVIRONMENT);
|
2006-05-29 02:34:34 +02:00
|
|
|
if (env && *env) {
|
2006-01-11 03:12:17 +01:00
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2008-07-23 21:12:18 +02:00
|
|
|
return system_path(GIT_EXEC_PATH);
|
2006-01-11 03:12:17 +01:00
|
|
|
}
|
|
|
|
|
2007-10-28 12:17:20 +01:00
|
|
|
static void add_path(struct strbuf *out, const char *path)
|
|
|
|
{
|
|
|
|
if (path && *path) {
|
|
|
|
if (is_absolute_path(path))
|
|
|
|
strbuf_addstr(out, path);
|
|
|
|
else
|
2008-07-21 21:19:55 +02:00
|
|
|
strbuf_addstr(out, make_nonrelative_path(path));
|
2007-10-28 12:17:20 +01:00
|
|
|
|
2007-12-03 21:55:57 +01:00
|
|
|
strbuf_addch(out, PATH_SEP);
|
2007-10-28 12:17:20 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-21 21:19:52 +02:00
|
|
|
void setup_path(void)
|
2007-10-28 12:17:20 +01:00
|
|
|
{
|
|
|
|
const char *old_path = getenv("PATH");
|
2008-10-09 21:12:12 +02:00
|
|
|
struct strbuf new_path = STRBUF_INIT;
|
2007-10-28 12:17:20 +01:00
|
|
|
|
|
|
|
add_path(&new_path, argv_exec_path);
|
|
|
|
add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
|
2008-07-23 21:12:18 +02:00
|
|
|
add_path(&new_path, system_path(GIT_EXEC_PATH));
|
2008-07-21 21:19:52 +02:00
|
|
|
add_path(&new_path, argv0_path);
|
2007-10-28 12:17:20 +01: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 03:12:17 +01:00
|
|
|
|
2008-07-28 07:50:27 +02:00
|
|
|
const char **prepare_git_cmd(const char **argv)
|
2006-01-11 03:12:17 +01:00
|
|
|
{
|
2007-12-02 07:09:22 +01:00
|
|
|
int argc;
|
|
|
|
const char **nargv;
|
2006-01-11 03:12:17 +01:00
|
|
|
|
2007-12-02 07:09:22 +01:00
|
|
|
for (argc = 0; argv[argc]; argc++)
|
|
|
|
; /* just counting */
|
|
|
|
nargv = xmalloc(sizeof(*nargv) * (argc + 2));
|
2006-01-11 03:12:17 +01:00
|
|
|
|
2007-12-02 07:09:22 +01:00
|
|
|
nargv[0] = "git";
|
|
|
|
for (argc = 0; argv[argc]; argc++)
|
|
|
|
nargv[argc + 1] = argv[argc];
|
|
|
|
nargv[argc + 1] = NULL;
|
2008-07-28 07:50:27 +02:00
|
|
|
return nargv;
|
|
|
|
}
|
|
|
|
|
|
|
|
int execv_git_cmd(const char **argv) {
|
|
|
|
const char **nargv = prepare_git_cmd(argv);
|
2007-12-02 07:09:22 +01:00
|
|
|
trace_argv_printf(nargv, "trace: exec:");
|
2006-06-25 15:56:18 +02:00
|
|
|
|
2007-10-28 12:17:20 +01:00
|
|
|
/* execvp() can only ever return if it fails */
|
2007-12-02 07:09:22 +01:00
|
|
|
execvp("git", (char **)nargv);
|
2006-01-11 03:12:17 +01:00
|
|
|
|
2007-10-28 12:17:20 +01:00
|
|
|
trace_printf("trace: exec failed: %s\n", strerror(errno));
|
2006-06-25 15:56:18 +02:00
|
|
|
|
2007-12-02 07:09:22 +01:00
|
|
|
free(nargv);
|
2007-10-28 12:17:20 +01:00
|
|
|
return -1;
|
2006-01-11 03:12:17 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
int execl_git_cmd(const char *cmd,...)
|
2006-01-11 03:12:17 +01:00
|
|
|
{
|
|
|
|
int argc;
|
2006-03-05 11:47:29 +01:00
|
|
|
const char *argv[MAX_ARGS + 1];
|
|
|
|
const char *arg;
|
2006-01-11 03:12:17 +01: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);
|
|
|
|
}
|