Move unlinking save files to the save code itself.

This fixes --edit-save foo repack on Windows, and is safer in case the
player's name ever changes (might be possible if we add that "read morgue"
functionality).

1 files changed, 13 insertions, 3 deletions

diff --git a/crawl-ref/source/package.cc b/crawl-ref/source/package.cc
index 399aace955..18f48b4dcb 100644
--- a/crawl-ref/source/package.cc
+++ b/crawl-ref/source/package.cc
@@ -93,6 +93,7 @@ package::package(const char* file, bool writeable, bool empty)
 {
     dprintf("package: initializing file=\"%s\" rw=%d\n", file, writeable);
     ASSERT(writeable || !empty);
+    filename = file;
     rw = writeable;
 
     if (empty)
@@ -173,9 +174,10 @@ package::~package()
     }
 
     // all errors here should be cached write errors
-    if (close(fd) && !aborted)
-        sysfail(rw ? "write error while saving"
-                   : "can't close the save I've just read???");
+    if (fd != -1)
+        if (close(fd) && !aborted)
+            sysfail(rw ? "write error while saving"
+                       : "can't close the save I've just read???");
     dprintf("package: closed\n");
 }
 
@@ -519,6 +521,14 @@ void package::abort()
     aborted = true;
 }
 
+void package::unlink()
+{
+    abort();
+    close(fd);
+    fd = -1;
+    ::unlink(filename.c_str());
+}
+
 
 chunk_writer::chunk_writer(package *parent, const std::string _name)
     : first_block(0), cur_block(0), block_len(0)