X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=path.c;h=495d17ca4ca371f4b5bdb6f1f3de9a6a9d84280b;hb=bd321bcc51e95f644ac5335abe673afcbcaade62;hp=d217ef0b7f04d7e021770cb50a7c58c14bc7920d;hpb=638ccfdf0eeabf3d985426308b2a82db6207ae28;p=git.git

diff --git a/path.c b/path.c
index d217ef0b..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;
 
@@ -58,3 +58,34 @@ char *git_path(const char *fmt, ...)
 		return bad_path;
 	return cleanup_path(pathname);
 }
+
+
+/* git_mkstemp() - create tmp file honoring TMPDIR variable */
+int git_mkstemp(char *path, size_t len, const char *template)
+{
+	char *env, *pch = path;
+
+	if ((env = getenv("TMPDIR")) == NULL) {
+		strcpy(pch, "/tmp/");
+		len -= 5;
+		pch += 5;
+	} else {
+		size_t n = snprintf(pch, len, "%s/", env);
+
+		len -= n;
+		pch += n;
+	}
+
+	safe_strncpy(pch, template, len);
+
+	return mkstemp(path);
+}
+
+
+char *safe_strncpy(char *dest, const char *src, size_t n)
+{
+	strncpy(dest, src, n);
+	dest[n - 1] = '\0';
+
+	return dest;
+}