com php-src: Revert "backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0": Zend/zend_virtual_cwd.c

Commit: a85d8242b21b253ea5c794fd4b5e79017004151b Author: Anatol Belski <ab@php.net> Tue, 31 Jan 2017 14:21:20 +0100 Parents: 2e11702601bf982d094e0b4f07e16275290ab514 Branches: PHP-7.0.16 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a85d8242b21b253ea5c794fd4b5e79017004151b Log: Revert "backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0" This reverts commit 8da87563122e4d14208b2827fd6b2807578677ec. (cherry picked from commit 5b5130c4ff084985c4ffd8046ec7ff87fc36c975) Changed paths: M Zend/zend_virtual_cwd.c Diff: diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c index 8e09078..ca19802 100644 --- a/Zend/zend_virtual_cwd.c +++ b/Zend/zend_virtual_cwd.c @@ -899,12 +899,9 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i int bufindex = 0, isabsolute = 0; wchar_t * reparsetarget; BOOL isVolume = FALSE; -#if VIRTUAL_CWD_DEBUG char printname[MAX_PATH]; - int printname_len; -#endif char substitutename[MAX_PATH]; - int substitutename_len; + int printname_len, substitutename_len; int substitutename_off = 0; if(++(*ll) > LINK_MAX) { @@ -931,7 +928,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) { reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget; -#if VIRTUAL_CWD_DEBUG printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR); isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0; if (!WideCharToMultiByte(CP_THREAD_ACP, 0, @@ -944,7 +940,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i }; printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR); printname[printname_len] = 0; -#endif substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR); if (!WideCharToMultiByte(CP_THREAD_ACP, 0, @@ -960,7 +955,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i else if(pbuffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) { isabsolute = 1; reparsetarget = pbuffer->MountPointReparseBuffer.ReparseTarget; -#if VIRTUAL_CWD_DEBUG printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR); if (!WideCharToMultiByte(CP_THREAD_ACP, 0, reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR), @@ -971,7 +965,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i return -1; }; printname[pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR)] = 0; -#endif substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR); if (!WideCharToMultiByte(CP_THREAD_ACP, 0,