mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-13 20:05:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
This commit is contained in:
Anatol Belski 2014-01-03 22:32:39 +01:00
commit d3a053d9f4
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/string.c
View File

@ -1434,7 +1434,7 @@ PHPAPI void php_basename(const char *s, size_t len, char *suffix, size_t sufflen
goto quit_loop;
case 1:
#if defined(PHP_WIN32) || defined(NETWARE)
if (*c == '/' || *c == '\\') {
if (*c == '/' || *c == '\\' || (*c == ':' && (c - s == 1))) {
#else
if (*c == '/') {
#endif

18
ext/standard/tests/file/basename_bug66395-win32.phpt Normal file
View File

@ -0,0 +1,18 @@
--TEST--
basename bug #66395
--SKIPIF--
<?php if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip Windows only basename tests'); } ?>
--FILE--
<?php
echo basename("c:file.txt") . "\n";
echo basename("d:subdir\\file.txt") . "\n";
echo basename("y:file.txt", ".txt") . "\n";
echo basename("notdriveletter:file.txt") . "\n";
?>
==DONE==
--EXPECTF--
file.txt
file.txt
file
notdriveletter:file.txt
==DONE==