From: Scott R Parish <srp@srparish.net>
Date: Sat, 27 Oct 2007 08:36:55 +0000 (-0700)
Subject: shell should call the new setup_path() to setup $PATH
X-Git-Tag: v1.5.4-rc0~294^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8f5d87056093f40a271f89c2c91d1a7025e2440;p=git.git

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>
---

diff --git a/shell.c b/shell.c
index cfe372b21..9826109d5 100644
--- a/shell.c
+++ b/shell.c
@@ -24,17 +24,11 @@ static int do_cvs_cmd(const char *me, char *arg)
 	const char *cvsserver_argv[3] = {
 		"cvsserver", "server", NULL
 	};
-	const char *oldpath = getenv("PATH");
-	struct strbuf newpath = STRBUF_INIT;
 
 	if (!arg || strcmp(arg, "server"))
 		die("git-cvsserver only handles server: %s", arg);
 
-	strbuf_addstr(&newpath, git_exec_path());
-	strbuf_addch(&newpath, ':');
-	strbuf_addstr(&newpath, oldpath);
-
-	setenv("PATH", strbuf_detach(&newpath, NULL), 1);
+	setup_path(NULL);
 
 	return execv_git_cmd(cvsserver_argv);
 }