Changeset 379 for trunk/orca

Timestamp:

04/03/07 17:37:23 (20 months ago)

Author:

krobillard

Message:

Rename now has Unix overwrite behavior on Windows.

Files:

• trunk/orca/stdio.c (modified) (2 diffs)

trunk/orca/stdio.c

@@ -69 +69 @@
 
 
+#ifdef _WIN32
+extern int orIsDir( const char* path );
+#endif
+
 OR_NATIVE_PUB( orRenameNative )
 {
@@ -87 +91 @@
     cp2 = orStrChars( str2, a2 );
 
+#ifdef _WIN32
+    // We want Unix rename overwrite behavior.
+    if( orIsDir() == 0 )
+    {
+        if( remove( cp2 ) == -1 )
+        {
+            orErrorT( OR_ERROR_ACCESS, "remove() %s", strerror(errno) );
+            return;
+        }
+    }
+#endif
+
     ok = rename( cp1, cp2 );
     if( ok != 0 )
     {
-        orErrorT( OR_ERROR_ACCESS, "rename() error %d", errno );
+        orErrorT( OR_ERROR_ACCESS, "rename() %s", strerror(errno) );
         return;
     }