X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=path.c;h=495d17ca4ca371f4b5bdb6f1f3de9a6a9d84280b;hb=211b5f9e62cc961acda59392fbf5a3efa8106c97;hp=7ef0d1b80d926d832816a587ddff721cb03130b3;hpb=6b7242aa1acc3c7835f80522914ffc4b2e789a29;p=git.git

diff --git a/path.c b/path.c
index 7ef0d1b8..495d17ca 100644
--- a/path.c
+++ b/path.c
@@ -41,7 +41,7 @@ char *mkpath(const char *fmt, ...)
 
 char *git_path(const char *fmt, ...)
 {
-	const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
+	const char *git_dir = get_git_dir();
 	va_list args;
 	unsigned len;
 
@@ -68,8 +68,13 @@ int git_mkstemp(char *path, size_t len, const char *template)
 	if ((env = getenv("TMPDIR")) == NULL) {
 		strcpy(pch, "/tmp/");
 		len -= 5;
-	} else
-		len -= snprintf(pch, len, "%s/", env);
+		pch += 5;
+	} else {
+		size_t n = snprintf(pch, len, "%s/", env);
+
+		len -= n;
+		pch += n;
+	}
 
 	safe_strncpy(pch, template, len);