cvs: php4 /ext/standard streamsfuncs.c

pollita Sat Apr 19 21:18:58 2003 EDT Modified files: /php4/ext/standard streamsfuncs.c Log: Revert change to stream_copy_to_stream() Index: php4/ext/standard/streamsfuncs.c diff -u php4/ext/standard/streamsfuncs.c:1.11 php4/ext/standard/streamsfuncs.c:1.12 --- php4/ext/standard/streamsfuncs.c:1.11 Fri Apr 18 22:47:16 2003 +++ php4/ext/standard/streamsfuncs.c Sat Apr 19 21:18:58 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.11 2003/04/19 02:47:16 pollita Exp $ */ +/* $Id: streamsfuncs.c,v 1.12 2003/04/20 01:18:58 pollita Exp $ */ #include "php.h" #include "php_globals.h" @@ -267,40 +267,18 @@ Reads up to maxlen bytes from source stream and writes them to dest stream. */ PHP_FUNCTION(stream_copy_to_stream) { - php_stream *src = NULL, *dest = NULL; + php_stream *src, *dest; zval *zsrc, *zdest; - long maxlen = PHP_STREAM_COPY_ALL, copied; + long maxlen = PHP_STREAM_COPY_ALL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|l", &zsrc, &zdest, &maxlen) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l", &zsrc, &zdest, &maxlen) == FAILURE) { RETURN_FALSE; } - php_stream_get_from_zval(src, &zsrc, "rb", USE_PATH | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL); - if (!src) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access source stream"); - RETURN_FALSE; - } - - php_stream_get_from_zval(dest, &zdest, "wb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL); - if (!dest) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to access destination stream"); - if (Z_TYPE_P(zsrc) == IS_STRING) { - php_stream_close(src); - } - RETURN_FALSE; - } - - copied = php_stream_copy_to_stream(src, dest, maxlen); - - if (Z_TYPE_P(zsrc) == IS_STRING) { - php_stream_close(src); - } - - if (Z_TYPE_P(zdest) == IS_STRING) { - php_stream_close(dest); - } + php_stream_from_zval(src, &zsrc); + php_stream_from_zval(dest, &zdest); - RETURN_LONG(copied); + RETURN_LONG(php_stream_copy_to_stream(src, dest, maxlen)); } /* }}} */