Fix: Renaming temp files didn't work on Windows.

Fixes #3216

diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp
index 38ec74fe31f4a92cdb41afa60a7efca264b95cf5..45bd28f64308adf42d8a2542ebbbe4e94f7ebd03 100644 (file)
--- a/components/compat/compatcomponent.cpp
+++ b/components/compat/compatcomponent.cpp
@@ -340,10 +340,20 @@ void CompatComponent::StatusTimerHandler(void)
        }
 
        statusfp.close();
-       rename(statuspathtmp.CStr(), statuspath.CStr());
+       objectfp.close();
+
+#ifdef _WIN32
+       _unlink(statuspath.CStr());
+       _unlink(objectspath.CStr());
+#endif /* _WIN32 */
+
+       statusfp.close();
+       if (rename(statuspathtmp.CStr(), statuspath.CStr()) < 0)
+               throw_exception(PosixException("rename() failed", errno));
 
        objectfp.close();
-       rename(objectspathtmp.CStr(), objectspath.CStr());
+       if (rename(objectspathtmp.CStr(), objectspath.CStr()) < 0)
+               throw_exception(PosixException("rename() failed", errno));      
 }
 
 EXPORT_COMPONENT(compat, CompatComponent);

diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp
index 9ee0f296051e92ad6d5cef19cb6d5a61412b5489..7e983cdb87353f8c77cd7d1b98a497596d5975ce 100644 (file)
--- a/lib/base/dynamicobject.cpp
+++ b/lib/base/dynamicobject.cpp
@@ -416,6 +416,12 @@ void DynamicObject::DumpObjects(const String& filename)
                }
        }
 
+       fp.close();
+
+#ifdef _WIN32
+       _unlink(filename.CStr());
+#endif /* _WIN32 */
+
        if (rename(tempFilename.CStr(), filename.CStr()) < 0)
                throw_exception(PosixException("rename() failed", errno));
 }

diff --git a/lib/base/object.cpp b/lib/base/object.cpp
index d0e221f4eb9d18935619ca90a15cb331f7711cf8..a0f7d03d2ed3e5c9578f0549ab9ee7f90a9be555 100644 (file)
--- a/lib/base/object.cpp
+++ b/lib/base/object.cpp
@@ -116,6 +116,10 @@ void Object::PrintMemoryProfile(void)
                }
        }
 
+#ifdef _WIN32
+       _unlink("dictionaries.dump");
+#endif /* _WIN32 */
+
        dictfp.close();
        if (rename("dictionaries.dump.tmp", "dictionaries.dump") < 0)
                throw_exception(PosixException("rename() failed", errno));