diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-11-25 08:37:02 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-11-25 08:37:02 +0000 |
| commit | e07feeaf8b91f16a89e9903b461042a0f6a63ac0 (patch) | |
| tree | 4a94cd382fcffefff920f7733562e1860a66cc44 /ext/standard/exec.c | |
| parent | 9b6836ebd36eccc9e81ca51e2efe172e1d334f0b (diff) | |
| parent | d4f42289ddde002cb4d3ed9d1a4f2219f68df48e (diff) | |
| download | php-git-e07feeaf8b91f16a89e9903b461042a0f6a63ac0.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'ext/standard/exec.c')
| -rw-r--r-- | ext/standard/exec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 6106fe2c86..ca6942a9c9 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -242,9 +242,11 @@ PHP_FUNCTION(passthru) PHPAPI zend_string *php_escape_shell_cmd(char *str) { register int x, y, l = (int)strlen(str); - char *p = NULL; size_t estimate = (2 * l) + 1; zend_string *cmd; +#ifndef PHP_WIN32 + char *p = NULL; +#endif TSRMLS_FETCH(); @@ -277,7 +279,7 @@ PHPAPI zend_string *php_escape_shell_cmd(char *str) cmd->val[y++] = str[x]; break; #else - /* % is Windows specific for enviromental variables, ^%PATH% will + /* % is Windows specific for environmental variables, ^%PATH% will output PATH whil ^%PATH^% not. escapeshellcmd->val will escape all %. */ case '%': |