cvs: TSRM(PHP_5_3) / tsrm_virtual_cwd.c tsrm_virtual_cwd.h

From: Date: Mon, 06 Jul 2009 08:56:23 +0000
Subject: cvs: TSRM(PHP_5_3) / tsrm_virtual_cwd.c tsrm_virtual_cwd.h
Groups: php.zend-engine.cvs 
Request: Send a blank email to [email protected] to get a copy of this message 
pajoye		Mon Jul  6 08:56:23 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /TSRM	tsrm_virtual_cwd.c tsrm_virtual_cwd.h 
  Log:
  - MFH: #48771, rename() between drives error: No error
  
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.35.2.22&r2=1.74.2.9.2.35.2.23&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.35.2.22 TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.35.2.23
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.35.2.22	Fri Jun 26 07:39:42 2009
+++ TSRM/tsrm_virtual_cwd.c	Mon Jul  6 08:56:22 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.35.2.22 2009/06/26 07:39:42 pajoye Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.35.2.23 2009/07/06 08:56:22 pajoye Exp $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1371,7 +1371,7 @@
 	/* rename on windows will fail if newname already exists.
 	   MoveFileEx has to be used */
 #ifdef TSRM_WIN32
-	retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0) ? -1 : 0;
+	retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0) ? -1
: 0;
 #else
 	retval = rename(oldname, newname);
 #endif
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.48.2.5.2.8.2.7&r2=1.48.2.5.2.8.2.8&diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.48.2.5.2.8.2.7 TSRM/tsrm_virtual_cwd.h:1.48.2.5.2.8.2.8
--- TSRM/tsrm_virtual_cwd.h:1.48.2.5.2.8.2.7	Tue Jun 16 00:07:04 2009
+++ TSRM/tsrm_virtual_cwd.h	Mon Jul  6 08:56:23 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: tsrm_virtual_cwd.h,v 1.48.2.5.2.8.2.7 2009/06/16 00:07:04 pajoye Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.48.2.5.2.8.2.8 2009/07/06 08:56:23 pajoye Exp $ */
 
 #ifndef VIRTUAL_CWD_H
 #define VIRTUAL_CWD_H
@@ -288,7 +288,7 @@
 /* rename on windows will fail if newname already exists.
    MoveFileEx has to be used */
 #if defined(TSRM_WIN32)
-# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) ==
0 ? -1 : 0)
+# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname,
MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0 ? -1 : 0)
 #else
 # define VCWD_RENAME(oldname, newname) rename(oldname, newname)
 #endif

Thread (1 message)

  • Pierre-Alain Joye
« previous php.zend-engine.cvs (#7704) next »