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 31f5b6be474c5945cd3895b555addb36850fd1ad..b25ab5af7adb98f969234daf5860ef1f7dcce6c8 100644 (file)
--- 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);