summaryrefslogtreecommitdiff
path: root/ext/standard/exec.c
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2001-11-04 02:09:55 +0000
committerfoobar <sniper@php.net>2001-11-04 02:09:55 +0000
commit488b76b95d14f6ef5aa72c04ef886986a83d275f (patch)
tree8302dd118445efc4529b345b2ff3ad6eff4db10b /ext/standard/exec.c
parent2c9ed05832451205c9d7d77c9d27d6e58440b645 (diff)
downloadphp-git-488b76b95d14f6ef5aa72c04ef886986a83d275f.tar.gz
ws fix
Diffstat (limited to 'ext/standard/exec.c')
-rw-r--r--ext/standard/exec.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index fc35f76fe6..a6e2e7ad77 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -55,11 +55,11 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
void (*sig_handler)();
#endif
- buf = (char*) emalloc(EXEC_INPUT_BUF);
- if (!buf) {
+ buf = (char *) emalloc(EXEC_INPUT_BUF);
+ if (!buf) {
php_error(E_WARNING, "Unable to emalloc %d bytes for exec buffer", EXEC_INPUT_BUF);
return -1;
- }
+ }
buflen = EXEC_INPUT_BUF;
if (PG(safe_mode)) {
@@ -110,6 +110,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
#endif
return -1;
}
+
} else { /* not safe_mode */
#if PHP_SIGCHILD
sig_handler = signal (SIGCHLD, SIG_DFL);