clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a pair of functions to handle the binary coding used by PHP from within

Browse Source 
UDF callbacks.

Add test for binary functions.
Fix proto.
This commit is contained in:
Wez Furlong 2003-06-21 12:29:32 +00:00
parent 418e4aee58
commit 9e858102a8
3 changed files with 98 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/sqlite/php_sqlite.h
View File

@ -78,6 +78,8 @@ PHP_FUNCTION(sqlite_error_string);
PHP_FUNCTION(sqlite_create_aggregate);
PHP_FUNCTION(sqlite_create_function);
PHP_FUNCTION(sqlite_udf_decode_binary);
PHP_FUNCTION(sqlite_udf_encode_binary);
ZEND_BEGIN_MODULE_GLOBALS(sqlite)
long assoc_case;

65
ext/sqlite/sqlite.c
View File

@ -142,6 +142,8 @@ function_entry sqlite_functions[] = {
PHP_FE(sqlite_unbuffered_query, NULL)
PHP_FE(sqlite_create_aggregate, NULL)
PHP_FE(sqlite_create_function, NULL)
PHP_FE(sqlite_udf_encode_binary, NULL)
PHP_FE(sqlite_udf_decode_binary, NULL)
{NULL, NULL, NULL}
};
@ -1371,8 +1373,8 @@ PHP_FUNCTION(sqlite_current)
}
/* }}} */
/* {{{ proto array sqlite_column(resource result, mixed index_or_name [, bool decode_binary])
Fetches a column from the current row from a result set */
/* {{{ proto mixed sqlite_column(resource result, mixed index_or_name [, bool decode_binary])
Fetches a column from the current row of a result set */
PHP_FUNCTION(sqlite_column)
{
zval *zres;
@ -1808,6 +1810,65 @@ PHP_FUNCTION(sqlite_create_function)
}
/* }}} */
/* {{{ proto string sqlite_udf_encode_binary(string data)
Apply binary encoding (if required) to a string to return from an UDF */
PHP_FUNCTION(sqlite_udf_encode_binary)
{
char *data = NULL;
long datalen;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data, &datalen)) {
return;
}
if (data == NULL) {
RETURN_NULL();
}
if (datalen && (data[0] == '\x01' || memchr(data, '\0', datalen) != NULL)) {
/* binary string */
int enclen;
char *ret;
ret = emalloc( 1 + ((256 * datalen + 1262) / 253) );
ret[0] = '\x01';
enclen = sqlite_encode_binary((const unsigned char*)data, datalen, ret+1);
RETVAL_STRINGL(ret, enclen+1, 0);
} else {
RETVAL_STRINGL(data, datalen, 1);
}
}
/* }}} */
/* {{{ proto string sqlite_udf_decode_binary(string data)
Decode binary encoding on a string parameter passed to an UDF */
PHP_FUNCTION(sqlite_udf_decode_binary)
{
char *data = NULL;
long datalen;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data, &datalen)) {
return;
}
if (data == NULL) {
RETURN_NULL();
}
if (datalen && data[0] == '\x01') {
/* encoded string */
int enclen;
char *ret;
ret = emalloc(datalen);
enclen = sqlite_decode_binary((const unsigned char*)data+1, ret);
ret[enclen] = '\0';
RETVAL_STRINGL(ret, enclen, 0);
} else {
RETVAL_STRINGL(data, datalen, 1);
}
}
/* }}} */
/*
* Local variables:
* tab-width: 4

33
ext/sqlite/tests/sqlite_017.phpt Executable file
View File

@ -0,0 +1,33 @@
--TEST--
sqlite: UDF binary handling functions
--SKIPIF--
<?php # vim:ft=php
if (!extension_loaded("sqlite")) print "skip"; ?>
--FILE--
<?php
$data = array(
"hello there",
"this has a \x00 char in the middle",
"\x01 this has an 0x01 at the start",
"this has \x01 in the middle"
);
foreach ($data as $item) {
$coded = sqlite_udf_encode_binary($item);
echo bin2hex($coded) . "\n";
$decoded = sqlite_udf_decode_binary($coded);
if ($item != $decoded) {
echo "FAIL! $item decoded is $decoded\n";
}
}
echo "OK!\n";
?>
--EXPECT--
68656c6c6f207468657265
0101736768721f6760721f601fff1f626760711f686d1f7367641f6c6863636b64
0102ff1e726667711e665f711e5f6c1e2e762e2f1e5f721e7266631e71725f7072
7468697320686173200120696e20746865206d6964646c65
OK!