fsck: Don't require tmp_obj_ file names are 14 bytes in length

diff --git a/exec_cmd.c b/exec_cmd.c
index dedb01da6f1b7e98edb0ce4459039f6825e024da..0ed768ddc0ac321f0d8dcf8b501412a0b440c31e 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -7,45 +7,11 @@ extern char **environ;
 static const char *argv_exec_path;
 static const char *argv0_path;
 
-static const char *builtin_exec_path(void)
-{
-#ifndef __MINGW32__
-       return GIT_EXEC_PATH;
-#else
-       int len;
-       char *p, *q, *sl;
-       static char *ep;
-       if (ep)
-               return ep;
-
-       len = strlen(_pgmptr);
-       if (len < 2)
-               return ep = ".";
-
-       p = ep = xmalloc(len+1);
-       q = _pgmptr;
-       sl = NULL;
-       /* copy program name, turn '\\' into '/', skip last part */
-       while ((*p = *q)) {
-               if (*q == '\\' || *q == '/') {
-                       *p = '/';
-                       sl = p;
-               }
-               p++, q++;
-       }
-       if (sl)
-               *sl = '\0';
-       else
-               ep[0] = '.', ep[1] = '\0';
-       return ep;
-#endif
-}
-
 const char *system_path(const char *path)
 {
-       if (!is_absolute_path(path)) {
+       if (!is_absolute_path(path) && argv0_path) {
                struct strbuf d = STRBUF_INIT;
-               strbuf_addf(&d, "%s/%s", git_exec_path(), path);
+               strbuf_addf(&d, "%s/%s", argv0_path, path);
                path = strbuf_detach(&d, NULL);
        }
        return path;
@@ -75,7 +41,7 @@ const char *git_exec_path(void)
                return env;
        }
 
-       return builtin_exec_path();
+       return system_path(GIT_EXEC_PATH);
 }
 
 static void add_path(struct strbuf *out, const char *path)
@@ -84,7 +50,7 @@ static void add_path(struct strbuf *out, const char *path)
                if (is_absolute_path(path))
                        strbuf_addstr(out, path);
                else
-                       strbuf_addstr(out, make_absolute_path(path));
+                       strbuf_addstr(out, make_nonrelative_path(path));
 
                strbuf_addch(out, PATH_SEP);
        }
@@ -99,7 +65,7 @@ void setup_path(void)
 
        add_path(&new_path, argv_exec_path);
        add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
-       add_path(&new_path, builtin_exec_path());
+       add_path(&new_path, system_path(GIT_EXEC_PATH));
        add_path(&new_path, argv0_path);
 
        if (old_path)