Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Message-ID: <20050629113420.31674.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r202348 - /apr/apr/trunk/file_io/os2/open.c
Date: Wed, 29 Jun 2005 11:34:19 -0000
To: commits@apr.apache.org
From: bjh@apache.org

Author: bjh
Date: Wed Jun 29 04:34:19 2005
New Revision: 202348

URL: http://svn.apache.org/viewcvs?rev=202348&view=rev
Log:
OS/2: Using apr_file_rename() to replace one file with another doesn't work
on some types of network drive as the file system driver returns a different
error code when an attempt is made to rename to an existing file name.

Allow for this error code, ERROR_ALREADY_EXISTS.


Modified:
    apr/apr/trunk/file_io/os2/open.c

Modified: apr/apr/trunk/file_io/os2/open.c
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/file_io/os2/open.c?rev=202348&r1=202347&r2=202348&view=diff
==============================================================================
--- apr/apr/trunk/file_io/os2/open.c (original)
+++ apr/apr/trunk/file_io/os2/open.c Wed Jun 29 04:34:19 2005
@@ -156,7 +156,7 @@
 {
     ULONG rc = DosMove(from_path, to_path);
 
-    if (rc == ERROR_ACCESS_DENIED) {
+    if (rc == ERROR_ACCESS_DENIED || rc == ERROR_ALREADY_EXISTS) {
         rc = DosDelete(to_path);
 
         if (rc == 0 || rc == ERROR_FILE_NOT_FOUND) {