Ticket #108: winunlink.patch

backends/flint/flint_table.cc

@@ -23 +23 @@
 #include <config.h>
 
 #include "safeerrno.h"
+#include "safewindows.h"
 
 // Define to use "dangerous" mode - in this mode we write modified btree
 // blocks back in place.  This is somewhat faster (especially once we're
@@ -130 +131 @@
 
 static void sys_unlink(const string &filename)
 {
-    if (unlink(filename) == -1) {
+    while (unlink(filename) == -1) {
+#if defined __CYGWIN__ || defined __WIN32__
+        if (errno == EACCES) {
+
+            /* Windows fails with EACCES if the file is currently open for
+             * reading.  We need to try again in this case.  It would be better
+             * if we could distinguish this from permission denied, so we don't
+             * go into an infinite loop in this situation. */
+
+            Sleep(100); /* Sleep() takes a number of milliseconds to sleep as
+                           it's parameter. */
+            continue;
+        }
+#endif
         string message = "Failed to unlink ";
         message += filename;
         message += ": ";