From: Wez Furlong Date: Thu, 13 Feb 2003 13:43:37 +0000 (+0000) Subject: Use FILE*-less implementation for php://(stdin|stdout|stderr) X-Git-Tag: RELEASE_0_5~1054 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95e7c2e9edfec601286b072253d0ff991f8dfcb2;p=php Use FILE*-less implementation for php://(stdin|stdout|stderr) --- diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index d908cbee83..bf163cc783 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -124,7 +124,7 @@ php_stream_ops php_stream_input_ops = { php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC) { - FILE * fp = NULL; + int fd = -1; php_stream * stream = NULL; if (!strncasecmp(path, "php://", 6)) @@ -139,17 +139,17 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, ch } if (!strcasecmp(path, "stdin")) { - fp = fdopen(dup(STDIN_FILENO), mode); + fd = dup(STDIN_FILENO); } else if (!strcasecmp(path, "stdout")) { - fp = fdopen(dup(STDOUT_FILENO), mode); + fd = dup(STDOUT_FILENO); } else if (!strcasecmp(path, "stderr")) { - fp = fdopen(dup(STDERR_FILENO), mode); + fd = dup(STDERR_FILENO); } - if (fp) { - stream = php_stream_fopen_from_file(fp, mode); + if (fd) { + stream = php_stream_fopen_from_fd(fd, mode); if (stream == NULL) - fclose(fp); + close(fd); } return stream; }