cvs: php-src /ext/standard exec.c

scottmac Fri May 30 16:52:06 2008 UTC Modified files: /php-src/ext/standard exec.c Log: Fixed bug #43261 (Use ^ as an escape character for Windows escapeshellcmd) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.132&r2=1.133&diff_format=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.132 php-src/ext/standard/exec.c:1.133 --- php-src/ext/standard/exec.c:1.132 Sun Mar 30 12:27:37 2008 +++ php-src/ext/standard/exec.c Fri May 30 16:52:06 2008 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <iliaa@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.132 2008/03/30 12:27:37 felipe Exp $ */ +/* $Id: exec.c,v 1.133 2008/05/30 16:52:06 scottmac Exp $ */ #include <stdio.h> #include "php.h" @@ -307,12 +307,12 @@ case '\x0A': /* excluding these two */ case '\xFF': #ifdef PHP_WIN32 - /* since Windows does not allow us to escape these chars, just remove them */ + /* This is Windows specific for enviromental variables */ case '%': - cmd[y++] = ' '; - break; -#endif + cmd[y++] = '^'; +#else cmd[y++] = '\\'; +#endif /* fall-through */ default: cmd[y++] = str[x];