Honor user's umask.

diff --git a/setup.c b/setup.c
index 258da176150081749a2ca2faeebc316911f0fba1..9e20160d941bd610ca8f752627a4481a728d9a8a 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -1,8 +1,8 @@
 #include "cache.h"
 
-char *prefix_path(const char *prefix, int len, char *path)
+const char *prefix_path(const char *prefix, int len, const char *path)
 {
-       char *orig = path;
+       const char *orig = path;
        for (;;) {
                char c;
                if (*path != '.')
@@ -47,10 +47,10 @@ char *prefix_path(const char *prefix, int len, char *path)
        return path;
 }
 
-const char **get_pathspec(const char *prefix, char **pathspec)
+const char **get_pathspec(const char *prefix, const char **pathspec)
 {
-       char *entry = *pathspec;
-       char **p;
+       const char *entry = *pathspec;
+       const char **p;
        int prefixlen;
 
        if (!prefix && !entry)
@@ -87,7 +87,7 @@ static int is_toplevel_directory(void)
        return  !lstat(".git/HEAD", &st) &&
                S_ISLNK(st.st_mode) &&
                !access(".git/refs/", X_OK) &&
-               (gitenv(DB_ENVIRONMENT) || !access(".git/objects/", X_OK));
+               (getenv(DB_ENVIRONMENT) || !access(".git/objects/", X_OK));
 }
 
 const char *setup_git_directory(void)
@@ -99,7 +99,7 @@ const char *setup_git_directory(void)
         * If GIT_DIR is set explicitly, we're not going
         * to do any discovery
         */
-       if (gitenv(GIT_DIR_ENVIRONMENT))
+       if (getenv(GIT_DIR_ENVIRONMENT))
                return NULL;
 
        if (!getcwd(cwd, sizeof(cwd)) || cwd[0] != '/')