cvs: php4 /ext/standard exec.c
| From: | Jani Taskinen | Date: | Sun, 04 Nov 2001 02:09:55 +0000 |
| Subject: | cvs: php4 /ext/standard exec.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8074@lists.php.net to get a copy of this message | ||
sniper Sat Nov 3 21:09:55 2001 EDT
Modified files:
/php4/ext/standard exec.c
Log:
ws fix
Index: php4/ext/standard/exec.c
diff -u php4/ext/standard/exec.c:1.64 php4/ext/standard/exec.c:1.65
--- php4/ext/standard/exec.c:1.64 Sun Sep 9 09:29:17 2001
+++ php4/ext/standard/exec.c Sat Nov 3 21:09:55 2001
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.64 2001/09/09 13:29:17 derick Exp $ */
+/* $Id: exec.c,v 1.65 2001/11/04 02:09:55 sniper Exp $ */
#include <stdio.h>
#include "php.h"
@@ -55,11 +55,11 @@
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 @@
#endif
return -1;
}
+
} else { /* not safe_mode */
#if PHP_SIGCHILD
sig_handler = signal (SIGCHLD, SIG_DFL);