diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-09-20 02:51:20 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-09-20 02:51:20 +0000 |
| commit | 0917a7f62f785e046d902889b443e782106285d4 (patch) | |
| tree | 023e2edad6fadd64bf6ef996ee49a001ec6716d6 /ext/standard/dir.c | |
| parent | e010d8ac9b8cfcd575613286663ab54da2828f82 (diff) | |
| download | php-git-0917a7f62f785e046d902889b443e782106285d4.tar.gz | |
Fixed bug #25583 (Incorrect handling of paths starting with / on win32
inside glob() function).
Diffstat (limited to 'ext/standard/dir.c')
| -rw-r--r-- | ext/standard/dir.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 40bb238a38..40738b3b8e 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -373,6 +373,11 @@ PHP_FUNCTION(glob) cwd[0] = '\0'; } cwd_skip = strlen(cwd)+1; +#ifdef PHP_WIN32 + if (IS_SLASH(cwd[0]) && !IS_UNC_PATH(pattern, pattern_len)) { + cwd[2] = '\0'; + } +#endif snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, pattern); pattern = work_pattern; } |