Ticket #108: flint_table.cc.2.patch

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
 // I/O bound) but the database can't be safely searched during indexing
@@ -130 +130 @@
 
 static void sys_unlink(const string &filename)
 {
+#ifdef _MSC_VER
+        /* We must use DeleteFile as this can delete files that are open */
+        if(DeleteFile(filename.c_str()) == 0) {
+                DWORD dwErr = GetLastError();
+                switch(dwErr){
+                        case ERROR_FILE_NOT_FOUND: _set_errno(ENOENT); break;
+                        case ERROR_SHARING_VIOLATION: 
+                                /* The file should have been opened with FILE_SHARE_DELETE if it is allowed
+                                to be deleted, so if we get a sharing violation something's gone wrong */
+                        case ERROR_ACCESS_DENIED: _set_errno(EACCES); break;
+                }
+#else   
     if (unlink(filename) == -1) {
+#endif
         string message = "Failed to unlink ";
         message += filename;
         message += ": ";