Ticket #1010: UseMoveFileEx.diff

lib/filesys.cpp

@@ -529 +529 @@
     sprintf(cmd, "copy \"%s\" \"%s\"", orig, newf);
     return system(cmd);
 #else
-    // POSIX requires that shells run from an application will use the 
-    // real UID and GID if different from the effective UID and GID.  
-    // Mac OS 10.4 did not enforce this, but OS 10.5 does.  Since 
-    // system() invokes a shell, it may not properly copy the file's 
-    // ownership or permissions when called from the BOINC Client 
+    // POSIX requires that shells run from an application will use the
+    // real UID and GID if different from the effective UID and GID.
+    // Mac OS 10.4 did not enforce this, but OS 10.5 does.  Since
+    // system() invokes a shell, it may not properly copy the file's
+    // ownership or permissions when called from the BOINC Client
     // under sandbox security, so we copy the file directly.
     FILE *src, *dst;
     int m, n;
@@ -568 +568 @@
 
 static int boinc_rename_aux(const char* old, const char* newf) {
 #ifdef _WIN32
-    boinc_delete_file(newf);
-    if (MoveFileA(old, newf)) return 0;
+    if (MoveFileExA(old, newf, MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH))
+        return 0;
     return GetLastError();
 #else
     int retval = rename(old, newf);
@@ -723 +723 @@
 #ifdef _WIN32
     getcwd(path, 256);
 #else
-    char* p 
+    char* p
 #ifdef __GNUC__
       __attribute__ ((unused))
 #endif