Ticket #108: flint_table.cc.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
@@ -102 +102 @@
 
 static int sys_open_to_write_no_except(const string & name)
 {
+#ifdef _MSC_VER
+        /* open file using Windows API, as we may need to delete it while it is still open */
+        HANDLE handleWin = CreateFile(name.c_str(), 
+                                                        GENERIC_WRITE, 
+                                                        FILE_SHARE_WRITE | FILE_SHARE_DELETE, /* FILE_SHARE_DELETE allows it to be deleted while open */
+                                                        NULL, 
+                                                        CREATE_ALWAYS, 
+                                                        FILE_ATTRIBUTE_NORMAL, 
+                                                        NULL);
+        if( handleWin == INVALID_HANDLE_VALUE)
+        { /* Failed to open */
+                switch(GetLastError()){
+                        case ERROR_ALREADY_EXISTS: _set_errno(EEXIST); break;
+                        case ERROR_ACCESS_DENIED: _set_errno(EACCES); break;
+                        }
+                return -1;                      
+        }
+ 
+        /* Now return a standard file descriptor */
+        int fd = _open_osfhandle((intptr_t)handleWin, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY);
+
+#else
     int fd = open(name.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
+#endif  
     return fd;
 }
 
@@ -119 +142 @@
 
 static int sys_open_for_readwrite(const string & name)
 {
+#ifdef _MSC_VER
+        /* open file using Windows API, as we may need to delete it while it is still open */
+        HANDLE handleWin = CreateFile(name.c_str(), 
+                                                        GENERIC_READ | GENERIC_WRITE, 
+                                                        FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, /* FILE_SHARE_DELETE allows it to be deleted while open */
+                                                        NULL, 
+                                                        CREATE_ALWAYS, 
+                                                        FILE_ATTRIBUTE_NORMAL, 
+                                                        NULL);
+        if( handleWin == INVALID_HANDLE_VALUE)
+        { /* Failed to open */
+                switch(GetLastError()){
+                        case ERROR_ALREADY_EXISTS: _set_errno(EEXIST); break;
+                        case ERROR_ACCESS_DENIED: _set_errno(EACCES); break;
+                }
+                return -1;                      
+        }
+ 
+        /* Now return a standard file descriptor */
+        int fd = _open_osfhandle((intptr_t)handleWin, O_RDWR | O_CREAT | O_TRUNC | O_BINARY);
+
+#else
     int fd = open(name.c_str(), O_RDWR | O_BINARY);
+#endif  
     if (fd < 0) {
         string message = string("Couldn't open ")
                 + name + " read/write: " + strerror(errno);
@@ -130 +176 @@
 
 static void sys_unlink(const string &filename)
 {
+#ifdef _MSC_VER
+        if(DeleteFile(filename.c_str())) {
+                switch(GetLastError()){
+                        case ERROR_FILE_NOT_FOUND: _set_errno(ENOENT); break;
+                        case ERROR_ACCESS_DENIED: _set_errno(EACCES); break;
+                }
+#else   
     if (unlink(filename) == -1) {
+#endif
         string message = "Failed to unlink ";
         message += filename;
         message += ": ";