clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

I'm not sure what the heck people were thinking here, but it should be

Browse Source 
fixed finally. Please test.
This commit is contained in:
Andrei Zmievski 2006-04-18 05:18:12 +00:00
parent 6b336175a6
commit efd298e2eb
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/standard/string.c
View File

@ -721,10 +721,12 @@ static UChar *php_u_trim(UChar *c, int len, UChar *what, int what_len, zval *ret
} }
if ( wh != ch ) break; if ( wh != ch ) break;
} else { } else {
if ( u_isWhitespace(ch) == FALSE ) break; if ( u_isWhitespace(ch) == FALSE ) {
U16_BACK_1(c, 0, i); /* U16_NEXT() post-increments 'i' */
break;
}
} }
} }
U16_BACK_1(c, 0, i); /* U16_NEXT() post-increments 'i' */
start = i; start = i;
} }
if ( mode & 2 ) { if ( mode & 2 ) {
@ -737,12 +739,13 @@ static UChar *php_u_trim(UChar *c, int len, UChar *what, int what_len, zval *ret
} }
if ( wh != ch ) break; if ( wh != ch ) break;
} else { } else {
if ( u_isWhitespace(ch) == FALSE ) break; if ( u_isWhitespace(ch) == FALSE ) {
U16_FWD_1(c, i, end); /* U16_PREV() pre-decrements 'i' */
break;
}
} }
} }
end = i; end = i;
} else {
--end;
} }
if ( what ) if ( what )
{ {
@ -751,10 +754,10 @@ static UChar *php_u_trim(UChar *c, int len, UChar *what, int what_len, zval *ret
if ( start < len ) { if ( start < len ) {
if ( return_value ) { if ( return_value ) {
RETVAL_UNICODEL(c+start, end-start+1, 1); RETVAL_UNICODEL(c+start, end-start, 1);
return NULL; return NULL;
} else { } else {
return eustrndup(c+start, end-start+1); return eustrndup(c+start, end-start);
} }
} else { /* Trimmed the whole string */ } else { /* Trimmed the whole string */
if ( return_value ) { if ( return_value ) {