undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"current_exec_path" is a misleading name, use "argv_exec_path"

Browse Source 
Signed-off-by: Scott R Parish <srp@srparish.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Scott R Parish 2007-10-27 01:36:51 -07:00 committed by Junio C Hamano
parent edb6ddc53e
commit 384df83312
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
exec_cmd.c
View File

@ -5,11 +5,11 @@
extern char **environ; extern char **environ;
static const char *builtin_exec_path = GIT_EXEC_PATH; static const char *builtin_exec_path = GIT_EXEC_PATH;
static const char *current_exec_path; static const char *argv_exec_path;
void git_set_exec_path(const char *exec_path) void git_set_argv_exec_path(const char *exec_path)
{ {
current_exec_path = exec_path; argv_exec_path = exec_path;
} }
@ -18,8 +18,8 @@ const char *git_exec_path(void)
{ {
const char *env; const char *env;
if (current_exec_path) if (argv_exec_path)
return current_exec_path; return argv_exec_path;
env = getenv(EXEC_PATH_ENVIRONMENT); env = getenv(EXEC_PATH_ENVIRONMENT);
if (env && *env) { if (env && *env) {
@ -34,7 +34,7 @@ int execv_git_cmd(const char **argv)
{ {
char git_command[PATH_MAX + 1]; char git_command[PATH_MAX + 1];
int i; int i;
const char *paths[] = { current_exec_path, const char *paths[] = { argv_exec_path,
getenv(EXEC_PATH_ENVIRONMENT), getenv(EXEC_PATH_ENVIRONMENT),
builtin_exec_path }; builtin_exec_path };

2
exec_cmd.h
View File

@ -1,7 +1,7 @@
#ifndef GIT_EXEC_CMD_H #ifndef GIT_EXEC_CMD_H
#define GIT_EXEC_CMD_H #define GIT_EXEC_CMD_H
extern void git_set_exec_path(const char *exec_path); extern void git_set_argv_exec_path(const char *exec_path);
extern const char* git_exec_path(void); extern const char* git_exec_path(void);
extern int execv_git_cmd(const char **argv); /* NULL terminated */ extern int execv_git_cmd(const char **argv); /* NULL terminated */
extern int execl_git_cmd(const char *cmd, ...); extern int execl_git_cmd(const char *cmd, ...);

2
git.c
View File

@ -51,7 +51,7 @@ static int handle_options(const char*** argv, int* argc, int* envchanged)
if (!prefixcmp(cmd, "--exec-path")) { if (!prefixcmp(cmd, "--exec-path")) {
cmd += 11; cmd += 11;
if (*cmd == '=') if (*cmd == '=')
git_set_exec_path(cmd + 1); git_set_argv_exec_path(cmd + 1);
else { else {
puts(git_exec_path()); puts(git_exec_path());
exit(0); exit(0);