From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 6 Jan 2010 13:53:29 +0000 (+0100)
Subject: Create temporary manifest files in the directory they will end up in
X-Git-Tag: v3.0pre0~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1f553ce98d2e84b8b174e84be57726c6d35cc88;p=thirdparty%2Fccache.git

Create temporary manifest files in the directory they will end up in

See also commit 106566bb638d112826fafa1661259258ac6ac1f7.
---

diff --git a/manifest.c b/manifest.c
index 31f5b6be4..b25ab5af7 100644
--- a/manifest.c
+++ b/manifest.c
@@ -31,8 +31,6 @@
 #include "murmurhashneutral2.h"
 #include "comments.h"
 
-extern char *temp_dir;
-
 /*
  * Sketchy specification of the manifest disk format:
  *
@@ -608,7 +606,7 @@ int manifest_put(const char *manifest_path, struct file_hash *object_hash,
 		}
 	}
 
-	x_asprintf(&tmp_file, "%s/manifest.tmp.%s", temp_dir, tmp_string());
+	x_asprintf(&tmp_file, "%s.tmp.%s", manifest_path, tmp_string());
 	fd2 = safe_open(tmp_file);
 	if (fd2 == -1) {
 		cc_log("Failed to open %s\n", tmp_file);