diff options
| author | Wez Furlong <wez@php.net> | 2002-12-12 17:44:48 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-12-12 17:44:48 +0000 |
| commit | 27cdd59febfbcf79ac407fd05edb44716e81caa3 (patch) | |
| tree | 9af2d9c3a16aeef3bfc303406af897e73dc05037 /ext | |
| parent | 9baa62f093bdcbded74228e668a0c3e669af9815 (diff) | |
| download | php-git-27cdd59febfbcf79ac407fd05edb44716e81caa3.tar.gz | |
Fix some issues with the return value from pclose and proc_close,
and bogus seek-on-pipe warnings when used with fpassthru.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/exec.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index f83ca07f19..fd5076297b 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -118,6 +118,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC) int overflow_limit, lcmd, ldir; char *b, *c, *d=NULL; php_stream *stream = NULL; + int pclose_return = 0; #if PHP_SIGCHILD void (*sig_handler)(); #endif @@ -283,13 +284,8 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC) } } - FG(pclose_ret) = php_stream_close(stream); + pclose_return = php_stream_close(stream); -#if HAVE_SYS_WAIT_H - if (WIFEXITED(FG(pclose_ret))) { - FG(pclose_ret) = WEXITSTATUS(FG(pclose_ret)); - } -#endif #if PHP_SIGCHILD signal (SIGCHLD, sig_handler); #endif @@ -297,7 +293,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC) efree(d); } efree(buf); - return FG(pclose_ret); + return pclose_return; } /* }}} */ @@ -586,8 +582,12 @@ static void proc_open_rsrc_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) if (wait_pid == -1) FG(pclose_ret) = -1; - else + else { + if (WIFEXITED(wstatus)) + wstatus = WEXITSTATUS(wstatus); FG(pclose_ret) = wstatus; + } + # else FG(pclose_ret) = -1; # endif @@ -976,7 +976,7 @@ PHP_FUNCTION(proc_open) fp = fdopen(descriptors[i].parentend, mode_string); #endif if (fp) { - stream = php_stream_fopen_from_file(fp, mode_string); + stream = php_stream_fopen_from_pipe(fp, mode_string); if (stream) { zval *retfp; |