- add php_sys_readlink

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 48aeeb59c20d0429ba7831d589a8fcf1d333d31b..25d56f2a8085845e716c6e37dfd171c1770f9aa4 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -207,6 +207,60 @@ static inline time_t FileTimeToUnixTime(const FILETIME FileTime)
        return (time_t)UnixTime;
 }
 
+CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len){ /* {{{ */
+       HINSTANCE kernel32;
+       HANDLE hFile;
+       DWORD dwRet;
+
+       typedef BOOL (WINAPI *gfpnh_func)(HANDLE, LPTSTR, DWORD, DWORD);
+       gfpnh_func pGetFinalPathNameByHandle;
+
+       kernel32 = LoadLibrary("kernel32.dll");
+
+       if (kernel32) {
+               pGetFinalPathNameByHandle = (gfpnh_func)GetProcAddress(kernel32, "GetFinalPathNameByHandleA");
+               if (pGetFinalPathNameByHandle == NULL) {
+                       return -1;
+               }
+       } else {
+               return -1;
+       }
+
+       hFile = CreateFile(link,            // file to open
+                                GENERIC_READ,          // open for reading
+                                FILE_SHARE_READ,       // share for reading
+                                NULL,                  // default security
+                                OPEN_EXISTING,         // existing file only
+                                FILE_FLAG_BACKUP_SEMANTICS, // normal file
+                                NULL);                 // no attr. template
+
+       if( hFile == INVALID_HANDLE_VALUE) {
+                       return -1;
+       }
+
+       dwRet = pGetFinalPathNameByHandle(hFile, target, MAXPATHLEN, VOLUME_NAME_DOS);
+       if(dwRet >= MAXPATHLEN) {
+               return -1;
+       }
+
+       CloseHandle(hFile);
+
+       if(dwRet > 4) {
+               /* Skip first 4 characters if they are "\??\" */
+               if(target[0] == '\\' && target[1] == '\\' && target[2] == '?' && target[3] ==  '\\') {
+                       char tmp[MAXPATHLEN];
+                       
+                       dwRet -= 4;
+                       memcpy(tmp, target + 4, dwRet);
+                       memcpy(target, tmp, dwRet);
+               }
+       }
+
+       target[dwRet] = '\0';
+       return dwRet;
+}
+/* }}} */
+
 CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat) /* {{{ */
 {
        WIN32_FILE_ATTRIBUTE_DATA data;

diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h
index 44ed99e345aa602adc5cedacfe145704b872e430..b26d2234af3f07ed5b898bf10a9b20f024d8b03f 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.h
+++ b/TSRM/tsrm_virtual_cwd.h
@@ -133,9 +133,13 @@ typedef unsigned short mode_t;
 CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat);
 # define php_sys_stat(path, buf) php_sys_stat_ex(path, buf, 0)
 # define php_sys_lstat(path, buf) php_sys_stat_ex(path, buf, 1)
+CWD_API int php_sys_readlink(link, target, target_len);
 #else
 # define php_sys_stat stat
 # define php_sys_lstat lstat
+# ifdef HAVE_SYMLINK
+# define php_sys_readlink(link, target, target_len) readlink(link, target, target_len)
+# endif
 #endif
 
 typedef struct _cwd_state {

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 79572eb2e9d74e3caa3d8235c056ca7fca696cbc..d86dfc6f6b18f2abdca673ff57cc0c45ee7996c4 100644 (file)
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -20,3 +20,10 @@ lstat is now available on all platforms. On unix-like platform
 php_sys_lstat is an alias to lstat (when avaible). On Windows it is now 
 available using php_sys_lstat. php_sys_stat and php_sys_lstat usage is recommended 
 instead of calling lstat directly, to ensure portability.
+
+       b. readlink support
+
+readlink is now available on all platforms. On unix-like platform
+php_sys_readlink is an alias to readlink (when avaible). On Windows it is now 
+available using php_sys_readlink. php_sys_readlink usage is recommended 
+instead of calling readlink directly, to ensure portability.