added mb_strstr( ), mb_strrchr( ).

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index ccb94fd21d11ff8e86e22ebf3d7ce04397d6c3e9..75d5333fcd1a3a48414be5bb27fd6d38132bf469 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -174,6 +174,8 @@ static const struct mb_overload_def mb_ovld[] = {
        {MB_OVERLOAD_STRING, "strrpos", "mb_strrpos", "mb_orig_strrpos"},
        {MB_OVERLOAD_STRING, "stripos", "mb_stripos", "mb_orig_stripos"},
        {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_stripos"},
+       {MB_OVERLOAD_STRING, "strstr", "mb_strstr", "mb_orig_strstr"},
+       {MB_OVERLOAD_STRING, "strrchr", "mb_strrchr", "mb_orig_strrchr"},
        {MB_OVERLOAD_STRING, "substr", "mb_substr", "mb_orig_substr"},
        {MB_OVERLOAD_STRING, "strtolower", "mb_strtolower", "mb_orig_strtolower"},
        {MB_OVERLOAD_STRING, "strtoupper", "mb_strtoupper", "mb_orig_strtoupper"},
@@ -208,6 +210,8 @@ zend_function_entry mbstring_functions[] = {
        PHP_FE(mb_strrpos,                              NULL)
        PHP_FE(mb_stripos,                              NULL)
        PHP_FE(mb_strripos,                             NULL)
+       PHP_FE(mb_strstr,                               NULL)
+       PHP_FE(mb_strrchr,                              NULL)
        PHP_FE(mb_substr_count,                 NULL)
        PHP_FE(mb_substr,                               NULL)
        PHP_FE(mb_strcut,                               NULL)
@@ -1733,6 +1737,130 @@ PHP_FUNCTION(mb_strripos)
 }
 /* }}} */
 
+/* {{{ proto string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+   Finds first occurrence of a string within another */
+PHP_FUNCTION(mb_strstr)
+{
+       int n, len, mblen;
+       mbfl_string haystack, needle, result, *ret = NULL;
+       char *enc_name = NULL;
+       int enc_name_len;
+       zend_bool part = 0;
+
+       mbfl_string_init(&haystack);
+       mbfl_string_init(&needle);
+       haystack.no_language = MBSTRG(current_language);
+       haystack.no_encoding = MBSTRG(current_internal_encoding);
+       needle.no_language = MBSTRG(current_language);
+       needle.no_encoding = MBSTRG(current_internal_encoding);
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bs", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &part, &enc_name, &enc_name_len) == FAILURE) {
+               RETURN_FALSE;
+       }
+
+       if (enc_name != NULL) {
+               haystack.no_encoding = needle.no_encoding = mbfl_name2no_encoding(enc_name);
+               if (haystack.no_encoding == mbfl_no_encoding_invalid) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", enc_name);
+                       RETURN_FALSE;
+               }
+       }
+
+       if (haystack.len <= 0) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty haystack");
+               RETURN_FALSE;
+       }
+       if (needle.len <= 0) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Empty needle");
+               RETURN_FALSE;
+       }
+       n = mbfl_strpos(&haystack, &needle, 0, 0);
+       if (n >= 0) {
+               mblen = mbfl_strlen(&haystack);
+               if (part) {
+                       ret = mbfl_substr(&haystack, &result, 0, n);
+                       if (ret != NULL) {
+                               RETVAL_STRINGL((char *)ret->val, ret->len, 0);
+                       } else {
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       len = (mblen - n);
+                       ret = mbfl_substr(&haystack, &result, n, len);
+                       if (ret != NULL) {
+                               RETVAL_STRINGL((char *)ret->val, ret->len, 0);
+                       } else {
+                               RETVAL_FALSE;
+                       }
+               }
+       } else {
+               RETVAL_FALSE;
+       }
+}
+/* }}} */
+
+/* {{{ proto string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+   Finds the last occurrence of a character in a string within another */
+PHP_FUNCTION(mb_strrchr)
+{
+       int n, len, mblen;
+       mbfl_string haystack, needle, result, *ret = NULL;
+       char *enc_name = NULL;
+       int enc_name_len;
+       zend_bool part = 0;
+
+       mbfl_string_init(&haystack);
+       mbfl_string_init(&needle);
+       haystack.no_language = MBSTRG(current_language);
+       haystack.no_encoding = MBSTRG(current_internal_encoding);
+       needle.no_language = MBSTRG(current_language);
+       needle.no_encoding = MBSTRG(current_internal_encoding);
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bs", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &part, &enc_name, &enc_name_len) == FAILURE) {
+               RETURN_FALSE;
+       }
+
+       if (enc_name != NULL) {
+               haystack.no_encoding = needle.no_encoding = mbfl_name2no_encoding(enc_name);
+               if (haystack.no_encoding == mbfl_no_encoding_invalid) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", enc_name);
+                       RETURN_FALSE;
+               }
+       }
+
+       if (haystack.len <= 0) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty haystack");
+               RETURN_FALSE;
+       }
+       if (needle.len <= 0) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Empty needle");
+               RETURN_FALSE;
+       }
+       n = mbfl_strpos(&haystack, &needle, 0, 1);
+       if (n >= 0) {
+               mblen = mbfl_strlen(&haystack);
+               if (part) {
+                       ret = mbfl_substr(&haystack, &result, 0, n);
+                       if (ret != NULL) {
+                               RETVAL_STRINGL((char *)ret->val, ret->len, 0);
+                       } else {
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       len = (mblen - n);
+                       ret = mbfl_substr(&haystack, &result, n, len);
+                       if (ret != NULL) {
+                               RETVAL_STRINGL((char *)ret->val, ret->len, 0);
+                       } else {
+                               RETVAL_FALSE;
+                       }
+               }
+       } else {
+               RETVAL_FALSE;
+       }
+}
+/* }}} */
+
 /* {{{ proto int mb_substr_count(string haystack, string needle [, string encoding])
    Count the number of substring occurrences */
 PHP_FUNCTION(mb_substr_count)

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index cad6fa9b1b4865f76f94d8f938acaf22215e87cb..bd408ea182a528212a15e941fbbf570026b3a28c 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -106,6 +106,8 @@ PHP_FUNCTION(mb_strpos);
 PHP_FUNCTION(mb_strrpos);
 PHP_FUNCTION(mb_stripos);
 PHP_FUNCTION(mb_strripos);
+PHP_FUNCTION(mb_strstr);
+PHP_FUNCTION(mb_strrchr);
 PHP_FUNCTION(mb_substr_count);
 PHP_FUNCTION(mb_substr);
 PHP_FUNCTION(mb_strcut);