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

Removed some duplicate code out of addclashes

Browse source 
# Not TSRM-safe, I am afraid...
@- addcslashes now warns when charlist is invalid. The returned string
@  remained the same (Jeroen)
This commit is contained in:
Jeroen van Wolffelaar 2001-08-05 23:08:19 +00:00
parent b3a7b945fa
commit dce78d75d6
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/standard/string.c
View file

@ -2316,6 +2316,8 @@ PHPAPI void php_stripcslashes(char *str, int *len)
*/ */
PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_free, char *what, int wlength) PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_free, char *what, int wlength)
{ {
/* TSRMLS_FETCH(); (causes parse error -> ?) */
char flags[256]; char flags[256];
char *new_str = emalloc((length?length:(length=strlen(str)))*4+1); char *new_str = emalloc((length?length:(length=strlen(str)))*4+1);
char *source,*target; char *source,*target;
@ -2331,14 +2333,7 @@ PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_
length = strlen(str); length = strlen(str);
} }
memset(flags, '\0', sizeof(flags)); php_charmask(what, wlength, flags TSRMLS_CC);
for (source=what,end=source+wlength; (c=*source) || source<end; source++) {
if (source+3<end && *(source+1) == '.' && *(source+2) == '.' && (unsigned char)*(source+3)>=(unsigned char)c) {
memset(flags+c, 1, (unsigned char)*(source+3)-(unsigned char)c+1);
source+=3;
} else
flags[(unsigned char)c]=1;
}
for (source=str,end=source+length,target=new_str; (c=*source) || source<end; source++) { for (source=str,end=source+length,target=new_str; (c=*source) || source<end; source++) {
if (flags[(unsigned char)c]) { if (flags[(unsigned char)c]) {