pollita Thu Oct 5 21:28:19 2006 UTC
Modified files:
/php-src/ext/bz2 bz2.c
/php-src/ext/bz2/tests 001.phpt 004.phpt 005.phpt
Log:
Updated for PHP6
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.26 php-src/ext/bz2/bz2.c:1.27
--- php-src/ext/bz2/bz2.c:1.26 Wed Aug 30 18:40:01 2006
+++ php-src/ext/bz2/bz2.c Thu Oct 5 21:28:18 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.26 2006/08/30 18:40:01 iliaa Exp $ */
+/* $Id: bz2.c,v 1.27 2006/10/05 21:28:18 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -305,7 +305,7 @@
php_info_print_table_end();
}
-/* {{{ proto string bzread(resource bz[, int length])
+/* {{{ proto string bzread(resource bz[, int length]) U
Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is
not specified */
static PHP_FUNCTION(bzread)
{
@@ -324,54 +324,64 @@
RETURN_FALSE;
}
- Z_STRVAL_P(return_value) = emalloc(len + 1);
- Z_STRLEN_P(return_value) = php_stream_read(stream,
Z_STRVAL_P(return_value), len);
-
- if (Z_STRLEN_P(return_value) < 0) {
- efree(Z_STRVAL_P(return_value));
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not read
valid bz2 data from stream");
- RETURN_FALSE;
- }
-
- Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0;
+ if (stream->readbuf_type == IS_UNICODE) {
+ int buflen = len;
+ UChar *buf = php_stream_read_unicode_chars(stream, &buflen);
+
+ if (!buf) {
+ /* For BC */
+ RETURN_EMPTY_UNICODE();
+ }
- Z_TYPE_P(return_value) = IS_STRING;
+ RETURN_UNICODEL(buf, buflen, 0);
+ } else { /* IS_STRING */
+ char *buf = emalloc(len + 1);
+ int buflen = php_stream_read(stream, buf, len);
+
+ if (!buflen) {
+ efree(buf);
+ RETURN_EMPTY_STRING();
+ }
+ buf[buflen] = 0;
+ RETURN_STRINGL(buf, buflen, 0);
+ }
}
/* }}} */
-/* {{{ proto resource bzopen(string|int file|fp, string mode)
+/* {{{ proto resource bzopen(string|int file|fp, string mode) U
Opens a new BZip2 stream */
static PHP_FUNCTION(bzopen)
{
- zval **file, /* The file to open */
- **mode; /* The mode to open the stream with */
+ zval **file; /* The file to open */
+ char *mode; /* The mode to open the stream with */
+ int mode_len;
BZFILE *bz; /* The compressed file stream */
php_stream *stream = NULL;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &file, &mode) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zs", &file,
&mode, &mode_len) == FAILURE) {
+ return;
}
- convert_to_string_ex(mode);
- if (Z_STRLEN_PP(mode) != 1 || (Z_STRVAL_PP(mode)[0] != 'r' &&
Z_STRVAL_PP(mode)[0] != 'w')) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a
valid mode for bzopen(). Only 'w' and 'r' are supported.", Z_STRVAL_PP(mode));
+ if (mode_len != 1 || (mode[0] != 'r' && mode[0] != 'w')) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a
valid mode for bzopen(). Only 'w' and 'r' are supported.", mode);
RETURN_FALSE;
}
/* If it's not a resource its a string containing the filename to open
*/
if (Z_TYPE_PP(file) != IS_RESOURCE) {
- convert_to_string_ex(file);
+ char *filename;
+ int filename_len;
+
+ if (FAILURE == php_stream_path_param_encode(file, &filename,
&filename_len, REPORT_ERRORS, FG(default_context))) {
+ RETURN_FALSE;
+ }
- if (Z_STRLEN_PP(file) == 0) {
+ if (filename_len == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "filename
cannot be empty");
RETURN_FALSE;
}
- stream = php_stream_bz2open(NULL,
-
Z_STRVAL_PP(file),
-
Z_STRVAL_PP(mode),
-
REPORT_ERRORS,
- NULL);
+ stream = php_stream_bz2open(NULL, filename, mode,
REPORT_ERRORS, NULL);
} else {
/* If it is a resource, than its a stream resource */
int fd;
@@ -388,17 +398,17 @@
RETURN_FALSE;
}
- switch(Z_STRVAL_PP(mode)[0]) {
+ switch(mode[0]) {
case 'r':
/* only "r" and "rb" are supported */
- if (stream->mode[0] != Z_STRVAL_PP(mode)[0] &&
!(stream_mode_len == 2 && stream->mode[1] != Z_STRVAL_PP(mode)[0])) {
+ if (stream->mode[0] != mode[0] &&
!(stream_mode_len == 2 && stream->mode[1] != mode[0])) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "cannot read from a stream opened in write only mode");
RETURN_FALSE;
}
break;
case 'w':
/* support only "w"(b), "a"(b), "x"(b) */
- if (stream->mode[0] != Z_STRVAL_PP(mode)[0] &&
!(stream_mode_len == 2 && stream->mode[1] != Z_STRVAL_PP(mode)[0])
+ if (stream->mode[0] != mode[0] &&
!(stream_mode_len == 2 && stream->mode[1] != mode[0])
&& stream->mode[0] != 'a' &&
!(stream_mode_len == 2 && stream->mode[1] != 'a')
&& stream->mode[0] != 'x' &&
!(stream_mode_len == 2 && stream->mode[1] != 'x')) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "cannot write to a stream opened in read only mode");
@@ -410,13 +420,14 @@
break;
}
+ /* If the stream is filtered, it'll fail here because it's not
castable */
if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_FD, (void
*) &fd, REPORT_ERRORS)) {
RETURN_FALSE;
}
- bz = BZ2_bzdopen(fd, Z_STRVAL_PP(mode));
+ bz = BZ2_bzdopen(fd, mode);
- stream = php_stream_bz2open_from_BZFILE(bz, Z_STRVAL_PP(mode),
stream);
+ stream = php_stream_bz2open_from_BZFILE(bz, mode, stream);
}
if (stream) {
@@ -427,7 +438,7 @@
}
/* }}} */
-/* {{{ proto int bzerrno(resource bz)
+/* {{{ proto int bzerrno(resource bz) U
Returns the error number */
static PHP_FUNCTION(bzerrno)
{
@@ -435,7 +446,7 @@
}
/* }}} */
-/* {{{ proto string bzerrstr(resource bz)
+/* {{{ proto string bzerrstr(resource bz) U
Returns the error string */
static PHP_FUNCTION(bzerrstr)
{
@@ -443,7 +454,7 @@
}
/* }}} */
-/* {{{ proto array bzerror(resource bz)
+/* {{{ proto array bzerror(resource bz) U
Returns the error number and error string in an associative array */
static PHP_FUNCTION(bzerror)
{
@@ -451,65 +462,59 @@
}
/* }}} */
-/* {{{ proto string bzcompress(string source [, int blocksize100k [, int
workfactor]])
+/* {{{ proto string bzcompress(string source [, int blocksize100k [, int
workfactor]]) U
Compresses a string into BZip2 encoded data */
static PHP_FUNCTION(bzcompress)
{
- zval **source, /* Source data to compress */
- **zblock_size, /* Optional block size to use */
- **zwork_factor; /* Optional work
factor to use */
- char *dest = NULL; /* Destination to place the
compressed data into */
- int error, /* Error Container */
- block_size = 4, /* Block size for
compression algorithm */
- work_factor = 0, /* Work factor for
compression algorithm */
- argc; /* Argument count */
- unsigned int source_len, /* Length of the source data */
- dest_len; /* Length of the
destination buffer */
-
- argc = ZEND_NUM_ARGS();
-
- if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &source,
&zblock_size, &zwork_factor) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- convert_to_string_ex(source);
-
- /* Assign them to easy to use variables, dest_len is initially the
length of the data
- + .01 x length of data + 600 which is the largest size the results
of the compression
- could possibly be, at least that's what the libbz2 docs say (thanks
to [EMAIL PROTECTED]
- for pointing this out). */
- source_len = Z_STRLEN_PP(source);
- dest_len = Z_STRLEN_PP(source) + (0.01 * Z_STRLEN_PP(source)) + 600;
-
- /* Allocate the destination buffer */
+ char *source; /* String to compress */
+ int source_len;
+ zend_uchar source_type;
+ long block_size = 4, /* Block size for compression algorithm
*/
+ work_factor = 0; /* Work factor for compression
algorithm */
+ char *dest = NULL; /* Destination to place the compressed
data into */
+ int dest_len = 0;
+ int error; /* Error Container */
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|ll", &source,
&source_len, &source_type, &block_size, &work_factor) == FAILURE) {
+ return;
+ }
+
+ /* Malloc dest to dest_len which is the length of the 101% the length
of the data plus 600 bytes
+ * This is the largest size the results of the compression could
possibly be,
+ * at least that's what the libbz2 docs say (thanks to [EMAIL
PROTECTED] for pointing this out).
+ */
+ dest_len = source_len + (0.01 * source_len) + 600;
dest = emalloc(dest_len + 1);
- /* Handle the optional arguments */
- if (argc > 1) {
- convert_to_long_ex(zblock_size);
- block_size = Z_LVAL_PP(zblock_size);
- }
-
- if (argc > 2) {
- convert_to_long_ex(zwork_factor);
- work_factor = Z_LVAL_PP(zwork_factor);
+ if (source_type == IS_UNICODE) {
+ source = zend_unicode_to_ascii((UChar*)source, source_len
TSRMLS_CC);
+ if (!source) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Binary or
ASCII-Unicode string expected, non-ASCII-Unicode string received");
+ RETURN_FALSE;
+ }
}
- error = BZ2_bzBuffToBuffCompress(dest, &dest_len, Z_STRVAL_PP(source),
source_len, block_size, 0, work_factor);
+ error = BZ2_bzBuffToBuffCompress(dest, &dest_len, source, source_len,
block_size, 0, work_factor);
if (error != BZ_OK) {
efree(dest);
- RETURN_LONG(error);
+ RETVAL_LONG(error);
} else {
- /* Copy the buffer, we have perhaps allocate alot more than we
need,
- so we erealloc() the buffer to the proper size */
- dest = erealloc(dest, dest_len + 1);
+ if (dest_len < source_len) {
+ /* Normal case, but it means we over alloc'd */
+ dest = erealloc(dest, dest_len + 1);
+ } /* else it's not worth a realloc */
+
dest[dest_len] = 0;
- RETURN_STRINGL(dest, dest_len, 0);
+ RETVAL_STRINGL(dest, dest_len, 0);
+ }
+
+ if (source_type == IS_UNICODE) {
+ efree(source);
}
}
/* }}} */
-/* {{{ proto string bzdecompress(string source [, int small])
+/* {{{ proto string bzdecompress(string source [, int small]) U
Decompresses BZip2 compressed data */
static PHP_FUNCTION(bzdecompress)
{
@@ -523,7 +528,7 @@
#endif
bz_stream bzs;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
&source, &source_len, &small)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|l",
&source, &source_len, &small)) {
RETURN_FALSE;
}
@@ -567,17 +572,17 @@
The central error handling interface, does the work for bzerrno, bzerrstr
and bzerror */
static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int opt)
{
- zval **bzp; /* BZip2 Resource Pointer */
+ zval *zstream; /* BZip2 Resource Pointer */
php_stream *stream;
const char *errstr; /* Error string */
int errnum; /* Error number */
struct php_bz2_stream_data_t *self;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &bzp) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) ==
FAILURE) {
+ return;
}
- php_stream_from_zval(stream, bzp);
+ php_stream_from_zval(stream, &zstream);
if (!php_stream_is(stream, PHP_STREAM_IS_BZIP2)) {
RETURN_FALSE;
@@ -594,13 +599,13 @@
RETURN_LONG(errnum);
break;
case PHP_BZ_ERRSTR:
- RETURN_STRING((char*)errstr, 1);
+ RETURN_RT_STRING((char*)errstr, ZSTR_DUPLICATE);
break;
case PHP_BZ_ERRBOTH:
array_init(return_value);
- add_assoc_long (return_value, "errno", errnum);
- add_assoc_string(return_value, "errstr", (char*)errstr,
1);
+ add_ascii_assoc_long (return_value, "errno",
errnum);
+ add_ascii_assoc_rt_string(return_value, "errstr",
(char*)errstr, ZSTR_DUPLICATE);
break;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/001.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/bz2/tests/001.phpt
diff -u php-src/ext/bz2/tests/001.phpt:1.2 php-src/ext/bz2/tests/001.phpt:1.3
--- php-src/ext/bz2/tests/001.phpt:1.2 Mon Jun 26 22:20:55 2006
+++ php-src/ext/bz2/tests/001.phpt Thu Oct 5 21:28:19 2006
@@ -19,7 +19,7 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: Wrong parameter count for bzopen() in %s on line %d
+Warning: bzopen() expects exactly 2 parameters, 0 given in %s on line %d
NULL
Warning: bzopen(): '' is not a valid mode for bzopen(). Only 'w' and 'r' are
supported. in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/004.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/bz2/tests/004.phpt
diff -u php-src/ext/bz2/tests/004.phpt:1.3 php-src/ext/bz2/tests/004.phpt:1.4
--- php-src/ext/bz2/tests/004.phpt:1.3 Wed Oct 4 08:45:21 2006
+++ php-src/ext/bz2/tests/004.phpt Thu Oct 5 21:28:19 2006
@@ -109,3 +109,69 @@
Warning: bzerrno(): %d is not a valid stream resource in %s on line %d
bool(false)
Done
+--UEXPECTF--
+array(2) {
+ [u"errno"]=>
+ int(0)
+ [u"errstr"]=>
+ unicode(2) "OK"
+}
+unicode(2) "OK"
+int(0)
+array(2) {
+ [u"errno"]=>
+ int(0)
+ [u"errstr"]=>
+ unicode(2) "OK"
+}
+unicode(2) "OK"
+int(0)
+string(0) ""
+array(2) {
+ [u"errno"]=>
+ int(-5)
+ [u"errstr"]=>
+ unicode(16) "DATA_ERROR_MAGIC"
+}
+unicode(16) "DATA_ERROR_MAGIC"
+int(-5)
+string(0) ""
+array(2) {
+ [u"errno"]=>
+ int(-4)
+ [u"errstr"]=>
+ unicode(10) "DATA_ERROR"
+}
+unicode(10) "DATA_ERROR"
+int(-4)
+string(0) ""
+array(2) {
+ [u"errno"]=>
+ int(-5)
+ [u"errstr"]=>
+ unicode(16) "DATA_ERROR_MAGIC"
+}
+unicode(16) "DATA_ERROR_MAGIC"
+int(-5)
+string(0) ""
+array(2) {
+ [u"errno"]=>
+ int(-4)
+ [u"errstr"]=>
+ unicode(10) "DATA_ERROR"
+}
+unicode(10) "DATA_ERROR"
+int(-4)
+
+Warning: bzread(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerror(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerrstr(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerrno(): %d is not a valid stream resource in %s on line %d
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/005.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/bz2/tests/005.phpt
diff -u php-src/ext/bz2/tests/005.phpt:1.2 php-src/ext/bz2/tests/005.phpt:1.3
--- php-src/ext/bz2/tests/005.phpt:1.2 Mon Jun 26 22:20:55 2006
+++ php-src/ext/bz2/tests/005.phpt Thu Oct 5 21:28:19 2006
@@ -11,7 +11,8 @@
Nothing matters no one else";
var_dump(bzcompress());
-var_dump(bzcompress(1,1,1));
+/* Having newlines confuses EXPECTF */
+var_dump(str_replace(array(b"\n", b"\r"), array(b"\\n", b"\\r"),
bzcompress(1,1,1)));
var_dump(bzcompress($string, 100));
var_dump(bzcompress($string, 100, -1));
var_dump(bzcompress($string, 100, 1000));
@@ -21,7 +22,7 @@
$data2 = bzcompress($string, 1, 10);
$data3 = $data2;
-$data3{3} = 0;
+$data3[3] = b"0";
var_dump(bzdecompress());
var_dump(bzdecompress(1,1,1));
@@ -38,7 +39,7 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: Wrong parameter count for bzcompress() in %s on line %d
+Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d
NULL
string(%d) "BZ%s"
int(-2)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
