Ticket #242: patch7.patch

common/utils.cc

@@ -149 +149 @@
         while (true) {
             errno = 0;
             struct dirent * entry = readdir(dir);
+            int tmp =errno;
             if (entry == NULL) {
-                if (errno == 0)
+                if ((errno == 0) || (errno == ENOENT))
                     break;
                 throw Xapian::DatabaseError("Cannot read entry from directory at '" + dirname + "'", errno);
             }

net/remoteconnection.cc

@@ -78 +78 @@
     if (buffer.length() >= min_len) return;
 
 #ifdef __WIN32__
+    // FIXME transforming handles this way isn't recommended. In particular
+    // file offsets are not preserved through subsequent ReadFile calls, so
+    // we have to do this manually (although this will only manifest when using 
+    // an actual file)
     HANDLE hin = fd_to_handle(fdin);
+    off_t ofs;
     do {
         char buf[CHUNKSIZE];
         DWORD received;
@@ -104 +109 @@
             throw Xapian::NetworkError("Received EOF", context);
 
         buffer.append(buf, received);
+
+        // We must move the offset in the OVERLAPPED structure manually
+        ofs = (((off_t)overlapped.OffsetHigh)<<32) + overlapped.Offset + received;
+        overlapped.Offset = ofs & 0xFFFFFFFF;
+        overlapped.OffsetHigh = ofs >> 32;
+
     } while (buffer.length() < min_len);
 #else
     // If there's no end_time, just use blocking I/O.
@@ -196 +207 @@
     header += encode_length(message.size());
 
 #ifdef __WIN32__
+    // FIXME transforming handles this way isn't recommended. In particular
+    // file offsets are not preserved through subsequent WriteFile calls, so
+    // we have to do this manually (although this will only manifest when using 
+    // an actual file)
     HANDLE hout = fd_to_handle(fdout);
     const string * str = &header;
+    off_t ofs;
 
     size_t count = 0;
     while (true) {
@@ -221 +237 @@
         }
 
         count += n;
+
+        // We must move the offset in the OVERLAPPED structure manually
+        ofs = (((off_t)overlapped.OffsetHigh)<<32) + overlapped.Offset + n;
+        overlapped.Offset = ofs & 0xFFFFFFFF;
+        overlapped.OffsetHigh = ofs >> 32;
+
         if (count == str->size()) {
             if (str == &message || message.empty()) return;
             str = &message;
             count = 0;
         }
+
     }
+
+
 #else
     // If there's no end_time, just use blocking I/O.
     if (fcntl(fdout, F_SETFL, end_time.is_set() ? O_NONBLOCK : 0) < 0) {
@@ -325 +350 @@
     }
 
 #ifdef __WIN32__
+    // FIXME transforming handles this way isn't recommended. In particular
+    // file offsets are not preserved through subsequent WriteFile calls, so
+    // we have to do this manually (although this will only manifest when using 
+    // an actual file)
     HANDLE hout = fd_to_handle(fdout);
-
+    off_t ofs;
     size_t count = 0;
     while (true) {
         DWORD n;
@@ -349 +378 @@
         }
 
         count += n;
+
+        // We must move the offset in the OVERLAPPED structure manually
+        ofs = (((off_t)overlapped.OffsetHigh)<<32) + overlapped.Offset + n;
+        overlapped.Offset = ofs & 0xFFFFFFFF;
+        overlapped.OffsetHigh = ofs >> 32;
+
         if (count == c) {
             if (size == 0) return;
 
@@ -363 +398 @@
             count = 0;
         }
     }
+    
 #else
     // If there's no end_time, just use blocking I/O.
     if (fcntl(fdout, F_SETFL, end_time.is_set() ? O_NONBLOCK : 0) < 0) {

tests/api_replicate.cc

@@ -175 +175 @@
 
     check_equal_dbs(masterpath, replicapath);
 
+    replica.close();
     rmtmpdir(tempdir);
     return true;
 }