[PHP-CVS] cvs: php-src /ext/standard dir.c

[Ilia Alshanetsky]

iliaa           Sun May  9 15:01:14 2004 EDT

  Modified files:              
    /php-src/ext/standard       dir.c 
  Log:
  Fixed bug #28289 (incorrect resolving of relative paths by glob() in
  windows).
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.136&r2=1.137&ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.136 php-src/ext/standard/dir.c:1.137
--- php-src/ext/standard/dir.c:1.136    Tue Mar 16 18:23:17 2004
+++ php-src/ext/standard/dir.c  Sun May  9 15:01:13 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dir.c,v 1.136 2004/03/16 23:23:17 iliaa Exp $ */
+/* $Id: dir.c,v 1.137 2004/05/09 19:01:13 iliaa Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -379,11 +379,13 @@
                if (!result) {
                        cwd[0] = '\0';
                }
-               cwd_skip = strlen(cwd)+1;
 #ifdef PHP_WIN32
-               if (IS_SLASH(cwd[0]) && !IS_UNC_PATH(pattern, pattern_len)) {
+               if (!IS_SLASH(cwd[0])) {
                        cwd[2] = '\0';
+                       cwd_skip = 3;
                }
+#else
+               cwd_skip = strlen(cwd)+1;
 #endif
                snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, 
pattern);
                pattern = work_pattern;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php