com php-src: don't return long path prefix to script: win32/ioutil.c

From: Date: Sat, 23 Jul 2016 19:11:27 +0000
Subject: com php-src: don't return long path prefix to script: win32/ioutil.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93351@lists.php.net to get a copy of this message
Commit: 7d83324105c86c75282cfbd343597c547b924b7f Author: Anatol Belski <ab@php.net> Fri, 22 Jul 2016 17:04:33 +0200 Parents: 3d95cc50a799649358b494fe0ccd53174562ed12 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7d83324105c86c75282cfbd343597c547b924b7f Log: don't return long path prefix to script Changed paths: M win32/ioutil.c Diff: diff --git a/win32/ioutil.c b/win32/ioutil.c index 768239c..ee298e7 100644 --- a/win32/ioutil.c +++ b/win32/ioutil.c @@ -488,7 +488,11 @@ PW32IO size_t php_win32_ioutil_dirname(char *path, size_t len) *(endw+1) = L'\0'; ret_len = (endw + 1 - startw); - ret = php_win32_ioutil_conv_w_to_any(startw, ret_len, &ret_len); + if (PHP_WIN32_IOUTIL_IS_LONG_PATHW(startw, ret_len)) { + ret = php_win32_ioutil_conv_w_to_any(startw + PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW, ret_len - PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW, &ret_len); + } else { + ret = php_win32_ioutil_conv_w_to_any(startw, ret_len, &ret_len); + } memmove(start, ret, ret_len+1); assert(start[ret_len] == '\0'); free(ret);

« previous php.cvs (#93351) next »