mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-19 18:24:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Really fix nl2br now... it's actaulyl faster now

Browse Source
This commit is contained in:
Derick Rethans 2001-09-09 12:55:48 +00:00
parent 176cd90bd7
commit 61d4f7fe65
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/php_string.h
View File

@ -117,7 +117,7 @@ PHPAPI void php_trim(zval **str, zval *return_value, int mode TSRMLS_DC);
PHPAPI void php_trim2(zval **str, zval **what, zval *return_value, int mode TSRMLS_DC);
PHPAPI void php_strip_tags(char *rbuf, int len, int state, char *allow, int allow_len);
PHPAPI void php_char_to_str(char *str, uint len, char from, char *to, int to_len, pval *result);
PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, pval *result);
PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value);
PHPAPI void php_explode(zval *delim, zval *str, zval *return_value, int limit);

28
ext/standard/string.c
View File

@ -2473,10 +2473,11 @@ PHPAPI char *php_addslashes(char *str, int length, int *new_length, int should_f
/* {{{ php_char_to_str
*/
PHPAPI void php_char_to_str(char *str, uint len, char from, char *to, int to_len, zval *result)
PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, zval *result)
{
int char_count=0;
char *source, *target, *tmp, *source_end=str+len, *tmp_end=NULL;
int char_count = 0;
int replaced = 0;
char *source, *target, *tmp, *source_end=str+len, *tmp_end = NULL;
for (source=str; source<source_end; source++) {
if (*source==from) {
@ -2486,7 +2487,7 @@ PHPAPI void php_char_to_str(char *str, uint len, char from, char *to, int to_len
if (char_count==0) {
ZVAL_STRINGL(result, str, len, 1);
return;
return 0;
}
Z_STRLEN_P(result) = len + (char_count * (to_len - 1));
@ -2495,6 +2496,7 @@ PHPAPI void php_char_to_str(char *str, uint len, char from, char *to, int to_len
for (source = str; source < source_end; source++) {
if (*source == from) {
replaced = 1;
for (tmp = to, tmp_end = tmp+to_len; tmp < tmp_end; tmp++) {
*target = *tmp;
target++;
@ -2505,6 +2507,7 @@ PHPAPI void php_char_to_str(char *str, uint len, char from, char *to, int to_len
}
}
*target = 0;
return replaced;
}
/* }}} */
@ -2992,13 +2995,12 @@ PHP_FUNCTION(nl2br)
if (new_length != (*str)->value.str.len)
RETURN_STRINGL (tmp, new_length, 0);
efree (tmp);
/* Mac style line-endings */
tmp = boyer_str_to_str((*str)->value.str.val, (*str)->value.str.len, "\n\r", 2, "<br />\n\r", 8, &new_length);
if (new_length != (*str)->value.str.len)
RETURN_STRINGL (tmp, new_length, 0);
efree (tmp);
/* Unix style line-endings */
php_char_to_str((*str)->value.str.val,(*str)->value.str.len, '\n',"<br />\n", 7, return_value);
/* Mac / Unix style line-endings */
if (php_char_to_str((*str)->value.str.val,(*str)->value.str.len, '\n',"<br />\n", 7, return_value))
return;
efree (Z_STRVAL_P(return_value));
php_char_to_str((*str)->value.str.val,(*str)->value.str.len, '\r',"<br />\r", 7, return_value);
}
/* }}} */
@ -3786,6 +3788,6 @@ PHP_FUNCTION(sscanf)
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 tw=78 fdm=marker
* vim<600: noet sw=4 ts=4 tw=78
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/