sha1_name.c: fix parsing of ":/token" syntax

diff --git a/path.c b/path.c
index ab2e3687ab1c58c4a9e87679093208a701a0bfbd..f6226fcd557b1b06706775cb3a32cc780ee2b708 100644 (file)
--- a/path.c
+++ b/path.c
@@ -162,7 +162,7 @@ int git_mkstemps(char *path, size_t len, const char *template, int suffix_len)
 #undef TMP_MAX
 #define TMP_MAX 16384
 
-int gitmkstemps(char *pattern, int suffix_len)
+int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 {
        static const char letters[] =
                "abcdefghijklmnopqrstuvwxyz"
@@ -204,7 +204,7 @@ int gitmkstemps(char *pattern, int suffix_len)
                template[4] = letters[v % num_letters]; v /= num_letters;
                template[5] = letters[v % num_letters]; v /= num_letters;
 
-               fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, 0600);
+               fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode);
                if (fd > 0)
                        return fd;
                /*
@@ -222,10 +222,20 @@ int gitmkstemps(char *pattern, int suffix_len)
        }
        /* We return the null string if we can't find a unique file name.  */
        pattern[0] = '\0';
-       errno = EINVAL;
        return -1;
 }
 
+int git_mkstemp_mode(char *pattern, int mode)
+{
+       /* mkstemp is just mkstemps with no suffix */
+       return git_mkstemps_mode(pattern, 0, mode);
+}
+
+int gitmkstemps(char *pattern, int suffix_len)
+{
+       return git_mkstemps_mode(pattern, suffix_len, 0600);
+}
+
 int validate_headref(const char *path)
 {
        struct stat st;
@@ -306,6 +316,8 @@ char *expand_user_path(const char *path)
                size_t username_len = first_slash - username;
                if (username_len == 0) {
                        const char *home = getenv("HOME");
+                       if (!home)
+                               goto return_null;
                        strbuf_add(&user_path, home, strlen(home));
                } else {
                        struct passwd *pw = getpw_str(username, username_len);
@@ -679,7 +691,7 @@ int daemon_avoid_alias(const char *p)
        /*
         * This resurrects the belts and suspenders paranoia check by HPA
         * done in <435560F7.4080006@zytor.com> thread, now enter_repo()
-        * does not do getcwd() based path canonicalizations.
+        * does not do getcwd() based path canonicalization.
         *
         * sl becomes true immediately after seeing '/' and continues to
         * be true as long as dots continue after that without intervening