shell should call the new setup_path() to setup $PATH
Shell currently does its own manual thing for setting up the $PATH; it can now call setup_path(). Signed-off-by: Scott R Parish <srp@srparish.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
1eb056905a
commit
e8f5d87056
8
shell.c
8
shell.c
|
@ -24,17 +24,11 @@ static int do_cvs_cmd(const char *me, char *arg)
|
||||||
const char *cvsserver_argv[3] = {
|
const char *cvsserver_argv[3] = {
|
||||||
"cvsserver", "server", NULL
|
"cvsserver", "server", NULL
|
||||||
};
|
};
|
||||||
const char *oldpath = getenv("PATH");
|
|
||||||
struct strbuf newpath = STRBUF_INIT;
|
|
||||||
|
|
||||||
if (!arg || strcmp(arg, "server"))
|
if (!arg || strcmp(arg, "server"))
|
||||||
die("git-cvsserver only handles server: %s", arg);
|
die("git-cvsserver only handles server: %s", arg);
|
||||||
|
|
||||||
strbuf_addstr(&newpath, git_exec_path());
|
setup_path(NULL);
|
||||||
strbuf_addch(&newpath, ':');
|
|
||||||
strbuf_addstr(&newpath, oldpath);
|
|
||||||
|
|
||||||
setenv("PATH", strbuf_detach(&newpath, NULL), 1);
|
|
||||||
|
|
||||||
return execv_git_cmd(cvsserver_argv);
|
return execv_git_cmd(cvsserver_argv);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue