cvs: TSRM / tsrm_virtual_cwd.h
| From: | Ilia Alshanetsky | Date: | Wed, 11 Dec 2002 00:32:34 +0000 |
| Subject: | cvs: TSRM / tsrm_virtual_cwd.h | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-706@lists.php.net to get a copy of this message | ||
iliaa Tue Dec 10 19:32:34 2002 EDT
Modified files:
/TSRM tsrm_virtual_cwd.h
Log:
On Win32 make PHP treat UNC paths as absolute paths, this should solve bugs
such as #20831. Thanks to Wez Furlong for isolating the problem.
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.27 TSRM/tsrm_virtual_cwd.h:1.28
--- TSRM/tsrm_virtual_cwd.h:1.27 Fri Nov 15 11:36:55 2002
+++ TSRM/tsrm_virtual_cwd.h Tue Dec 10 19:32:33 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.27 2002/11/15 16:36:55 iliaa Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.28 2002/12/11 00:32:33 iliaa Exp $ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
@@ -58,7 +58,7 @@
*/
#define COPY_WHEN_ABSOLUTE(path) 2
#define IS_ABSOLUTE_PATH(path, len) \
- (len >= 2 && isalpha(path[0]) && path[1] == ':')
+ (len >= 2 && ((isalpha(path[0]) && path[1] == ':') ||
(IS_SLASH(path[0]) && IS_SLASH(path[1]))))
#define IS_UNC_PATH(path, len) \
(len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1]))