compat: Add simplified merge sort implementation from glibc

diff --git a/shell.c b/shell.c
index cfe372b21379486ea0c7e4d5686c08064c20c279..9826109d5b1b3746aea33dc6b7ebe7b6da19bd22 100644 (file)
--- 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);
 }