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;
|
|
|
|
static const char *builtin_exec_path = GIT_EXEC_PATH;
|
2006-08-15 17:23:48 +00:00
|
|
|
static const char *current_exec_path;
|
2006-01-11 02:12:17 +00:00
|
|
|
|
|
|
|
void git_set_exec_path(const char *exec_path)
|
|
|
|
{
|
|
|
|
current_exec_path = exec_path;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
|
|
|
if (current_exec_path)
|
|
|
|
return current_exec_path;
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
return builtin_exec_path;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-03-05 10:47:29 +00:00
|
|
|
int execv_git_cmd(const char **argv)
|
2006-01-11 02:12:17 +00:00
|
|
|
{
|
|
|
|
char git_command[PATH_MAX + 1];
|
2006-05-30 14:58:52 +00:00
|
|
|
int i;
|
2006-01-11 02:12:17 +00:00
|
|
|
const char *paths[] = { current_exec_path,
|
2006-12-19 09:28:15 +00:00
|
|
|
getenv(EXEC_PATH_ENVIRONMENT),
|
2006-01-11 02:12:17 +00:00
|
|
|
builtin_exec_path };
|
|
|
|
|
2006-03-09 19:58:05 +00:00
|
|
|
for (i = 0; i < ARRAY_SIZE(paths); ++i) {
|
2006-05-30 14:58:52 +00:00
|
|
|
size_t len;
|
|
|
|
int rc;
|
2006-01-11 02:12:17 +00:00
|
|
|
const char *exec_dir = paths[i];
|
2006-03-05 10:47:29 +00:00
|
|
|
const char *tmp;
|
|
|
|
|
2006-05-29 00:34:34 +00:00
|
|
|
if (!exec_dir || !*exec_dir) continue;
|
2006-01-11 02:12:17 +00:00
|
|
|
|
|
|
|
if (*exec_dir != '/') {
|
|
|
|
if (!getcwd(git_command, sizeof(git_command))) {
|
|
|
|
fprintf(stderr, "git: cannot determine "
|
2006-05-30 14:58:52 +00:00
|
|
|
"current directory: %s\n",
|
|
|
|
strerror(errno));
|
|
|
|
break;
|
2006-01-11 02:12:17 +00:00
|
|
|
}
|
|
|
|
len = strlen(git_command);
|
|
|
|
|
|
|
|
/* Trivial cleanup */
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
while (!prefixcmp(exec_dir, "./")) {
|
2006-01-11 02:12:17 +00:00
|
|
|
exec_dir += 2;
|
|
|
|
while (*exec_dir == '/')
|
|
|
|
exec_dir++;
|
|
|
|
}
|
2006-05-30 14:58:52 +00:00
|
|
|
|
|
|
|
rc = snprintf(git_command + len,
|
|
|
|
sizeof(git_command) - len, "/%s",
|
|
|
|
exec_dir);
|
|
|
|
if (rc < 0 || rc >= sizeof(git_command) - len) {
|
|
|
|
fprintf(stderr, "git: command name given "
|
|
|
|
"is too long.\n");
|
|
|
|
break;
|
|
|
|
}
|
2006-01-11 02:12:17 +00:00
|
|
|
} else {
|
2006-05-30 14:58:52 +00:00
|
|
|
if (strlen(exec_dir) + 1 > sizeof(git_command)) {
|
|
|
|
fprintf(stderr, "git: command name given "
|
|
|
|
"is too long.\n");
|
|
|
|
break;
|
|
|
|
}
|
2006-01-11 02:12:17 +00:00
|
|
|
strcpy(git_command, exec_dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
len = strlen(git_command);
|
2006-05-30 14:58:52 +00:00
|
|
|
rc = snprintf(git_command + len, sizeof(git_command) - len,
|
|
|
|
"/git-%s", argv[0]);
|
|
|
|
if (rc < 0 || rc >= sizeof(git_command) - len) {
|
2006-01-11 02:12:17 +00:00
|
|
|
fprintf(stderr,
|
|
|
|
"git: command name given is too long.\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* argv[0] must be the git command, but the argv array
|
|
|
|
* belongs to the caller, and my be reused in
|
|
|
|
* subsequent loop iterations. Save argv[0] and
|
|
|
|
* restore it on error.
|
|
|
|
*/
|
|
|
|
|
|
|
|
tmp = argv[0];
|
|
|
|
argv[0] = git_command;
|
|
|
|
|
2006-08-31 06:42:11 +00:00
|
|
|
trace_argv_printf(argv, -1, "trace: exec:");
|
2006-06-25 13:56:18 +00:00
|
|
|
|
2006-01-11 02:12:17 +00:00
|
|
|
/* execve() can only ever return if it fails */
|
2006-03-05 10:47:29 +00:00
|
|
|
execve(git_command, (char **)argv, environ);
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2006-08-31 06:42:11 +00:00
|
|
|
trace_printf("trace: exec failed: %s\n", strerror(errno));
|
2006-06-25 13:56:18 +00:00
|
|
|
|
2006-01-11 02:12:17 +00:00
|
|
|
argv[0] = tmp;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|