Replace rename()

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index 27b1dbbebf57001031c7eb6289f189bdf192d761..8355a28357e14cc46774785039b7b59e12e151de 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -33,7 +33,7 @@
 #endif
 
 #ifdef __WIN32__
-#  include <win32.h>
+#  include "win32.h"
 #endif
 
 #include "list.h"
@@ -45,6 +45,7 @@
 #include "lzx.h"
 #include "xpress.h"
 
+
 #ifdef ENABLE_MULTITHREADED_COMPRESSION
 #  include <pthread.h>
 #endif
@@ -1981,6 +1982,17 @@ overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags,
 
        DEBUG("Renaming `%s' to `%s'", tmpfile, w->filename);
 
+#ifdef __WIN32__
+       /* Windows won't let you delete open files unless FILE_SHARE_DELETE was
+        * specified to CreateFile().  The WIM was opened with fopen(), which
+        * didn't provided this flag to CreateFile, so the handle must be closed
+        * before executing the rename(). */
+       if (w->fp != NULL) {
+               fclose(w->fp);
+               w->fp = NULL;
+       }
+#endif
+
        /* Rename the new file to the old file .*/
        if (rename(tmpfile, w->filename) != 0) {
                ERROR_WITH_ERRNO("Failed to rename `%s' to `%s'",