archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "backport 51e1da6ea1 into 7.0"

Browse source 
This reverts commit 8da8756312.
This commit is contained in:
Anatol Belski 2017-01-31 14:21:20 +01:00
parent 536b3ca1e1
commit 5b5130c4ff
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Zend/zend_virtual_cwd.c
View file

@ -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; int bufindex = 0, isabsolute = 0;
wchar_t * reparsetarget; wchar_t * reparsetarget;
BOOL isVolume = FALSE; BOOL isVolume = FALSE;
#if VIRTUAL_CWD_DEBUG
char printname[MAX_PATH]; char printname[MAX_PATH];
int printname_len;
#endif
char substitutename[MAX_PATH]; char substitutename[MAX_PATH];
int substitutename_len; int printname_len, substitutename_len;
int substitutename_off = 0; int substitutename_off = 0;
if(++(*ll) > LINK_MAX) { 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) { if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) {
reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget; reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget;
#if VIRTUAL_CWD_DEBUG
printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR); printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0; isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
if (!WideCharToMultiByte(CP_THREAD_ACP, 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_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
printname[printname_len] = 0; printname[printname_len] = 0;
#endif
substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR); substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 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) { else if(pbuffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) {
isabsolute = 1; isabsolute = 1;
reparsetarget = pbuffer->MountPointReparseBuffer.ReparseTarget; reparsetarget = pbuffer->MountPointReparseBuffer.ReparseTarget;
#if VIRTUAL_CWD_DEBUG
printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR); printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
if (!WideCharToMultiByte(CP_THREAD_ACP, 0, if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR), 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; return -1;
}; };
printname[pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR)] = 0; printname[pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR)] = 0;
#endif
substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR); substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
if (!WideCharToMultiByte(CP_THREAD_ACP, 0, if (!WideCharToMultiByte(CP_THREAD_ACP, 0,