archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Restore ability to use strrpos/strripos with an ordinal needle

Browse source
This commit is contained in:
Sara Golemon 2003-12-03 01:11:36 +00:00
parent 86c8a87283
commit 3d6fcddfd2
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ext/standard/string.c
View file

@ -1570,14 +1570,26 @@ PHP_FUNCTION(stripos)
Finds position of last occurrence of a string within another string */ Finds position of last occurrence of a string within another string */
PHP_FUNCTION(strrpos) PHP_FUNCTION(strrpos)
{ {
zval *zneedle;
char *needle, *haystack; char *needle, *haystack;
int needle_len, haystack_len, offset = 0; int needle_len, haystack_len, offset = 0;
char *p, *e; char *p, *e, ord_needle[2];
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &haystack, &haystack_len, &needle, &needle_len, &offset) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &haystack, &haystack_len, &zneedle, &offset) == FAILURE) {
RETURN_FALSE; RETURN_FALSE;
} }
if (Z_TYPE_P(zneedle) == IS_STRING) {
needle = Z_STRVAL_P(zneedle);
needle_len = Z_STRLEN_P(zneedle);
} else {
convert_to_long(zneedle);
ord_needle[0] = (char)(Z_LVAL_P(zneedle) & 0xFF);
ord_needle[1] = '\0';
needle = ord_needle;
needle_len = 1;
}
if ((haystack_len == 0) || (needle_len == 0)) { if ((haystack_len == 0) || (needle_len == 0)) {
RETURN_FALSE; RETURN_FALSE;
} }
@ -1609,15 +1621,27 @@ PHP_FUNCTION(strrpos)
Finds position of last occurrence of a string within another string */ Finds position of last occurrence of a string within another string */
PHP_FUNCTION(strripos) PHP_FUNCTION(strripos)
{ {
zval *zneedle;
char *needle, *haystack; char *needle, *haystack;
int needle_len, haystack_len, offset = 0; int needle_len, haystack_len, offset = 0;
char *p, *e; char *p, *e, ord_needle[2];
char *needle_dup, *haystack_dup; char *needle_dup, *haystack_dup;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &haystack, &haystack_len, &needle, &needle_len, &offset) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &haystack, &haystack_len, &zneedle, &offset) == FAILURE) {
RETURN_FALSE; RETURN_FALSE;
} }
if (Z_TYPE_P(zneedle) == IS_STRING) {
needle = Z_STRVAL_P(zneedle);
needle_len = Z_STRLEN_P(zneedle);
} else {
convert_to_long(zneedle);
ord_needle[0] = (char)(Z_LVAL_P(zneedle) & 0xFF);
ord_needle[1] = '\0';
needle = ord_needle;
needle_len = 1;
}
if ((haystack_len == 0) || (needle_len == 0)) { if ((haystack_len == 0) || (needle_len == 0)) {
RETURN_FALSE; RETURN_FALSE;
} }