Improved readlink, supress \??\ and use the drive syntax only

diff --git a/NEWS b/NEWS
index fdf485618976f14792a92ef734d6ea72ed34fcd3..40c6c58724c52a37efdc5d78d5010603257aa4de 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ PHP                                                                        NEWS
 - Added error constant when json_encode() detects an invalid UTF-8 sequence.
   (Scott)
 
+
+- Improved readlink on Windows, supress \??\ and use the drive syntax only.
+ (Pierre)
 - Improved dns_get_record AAAA support on windows. Always available when IPv6
   is support is installed, format is now the same than on unix. (Pierre)
 - Improved the DNS functions on OSX to use newer APIs, also use Bind 9 API
@@ -14,7 +17,7 @@ PHP                                                                        NEWS
 - Improved shared extension loading on OSX to use the standard Unix dlopen()
   API. (Scott)
 
-- Fixed possilbe bad caching of symlinked directories in the realpath cache
+- Fixed possible bad caching of symlinked directories in the realpath cache
   on Windows. (Pierre)
 - Fixed atime and mtime in stat related functions on Windows. (Pierre)
 - Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and

diff --git a/ext/standard/link_win32.c b/ext/standard/link_win32.c
index 078b7d18a39206588fe251fd61745af2bf05b6bb..0a837a5608b00d6d5d4e510525704e2fd3bdcd7f 100644 (file)
--- a/ext/standard/link_win32.c
+++ b/ext/standard/link_win32.c
@@ -107,7 +107,7 @@ PHP_FUNCTION(readlink)
                        RETURN_FALSE;
        }
 
-       dwRet = pGetFinalPathNameByHandle(hFile, Path, MAXPATHLEN, VOLUME_NAME_NT);
+       dwRet = pGetFinalPathNameByHandle(hFile, Path, MAXPATHLEN, VOLUME_NAME_DOS);
        if(dwRet >= MAXPATHLEN) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't resolve the full path, the path exceeds the MAX_PATH_LEN (%d) limit", MAXPATHLEN);
                RETURN_FALSE;
@@ -118,7 +118,14 @@ PHP_FUNCTION(readlink)
        /* Append NULL to the end of the string */
        Path[dwRet] = '\0';
 
-       RETURN_STRING(Path, 1);
+       if(dwRet > 4) {
+               /* Skip first 4 characters if they are "\??\" */
+               if(Path[0] == '\\' && Path[0] == '\\' && Path[1] == '?' && Path[2] == '?' && Path[3] ==  '\\') {
+                       RETURN_STRING(Path + 4, 1);
+               }
+       } else {
+               RETURN_STRING(Path, 1);
+       }
 }
 /* }}} */