Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Added addcslashes(), stripcslashes(). 

Reverted addslashes() to the very original behaviour.
experimetnal/RETURN_REF_PATCH
Jakub Skopal 27 years ago
parent
8aa0c92bc6
commit
5cc16d86b0
3 changed files with 127 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ext/standard/basic_functions.c
  2. 5
      ext/standard/php3_string.h
  3. 193
      ext/standard/string.c

2
ext/standard/basic_functions.c
View File

@ -154,6 +154,7 @@ function_entry basic_functions[] = {
PHP_FE(basename, NULL)
PHP_FE(dirname, NULL)
PHP_FE(stripslashes, NULL)
PHP_FE(stripcslashes, NULL)
PHP_FE(strstr, NULL)
PHP_FE(stristr, NULL)
PHP_FE(strrchr, NULL)
@ -163,6 +164,7 @@ function_entry basic_functions[] = {
PHP_FE(ucwords, NULL)
PHP_FE(strtr, NULL)
PHP_FE(addslashes, NULL)
PHP_FE(addcslashes, NULL)
PHP_FE(chop, NULL)
PHP_FE(str_replace, NULL)
PHP_FE(chunk_split, NULL)

5
ext/standard/php3_string.h
View File

@ -72,7 +72,9 @@ PHP_FUNCTION(hebrev);
PHP_FUNCTION(hebrevc);
PHP_FUNCTION(user_sprintf);
PHP_FUNCTION(user_printf);
PHP_FUNCTION(addcslashes);
PHP_FUNCTION(addslashes);
PHP_FUNCTION(stripcslashes);
PHP_FUNCTION(stripslashes);
PHP_FUNCTION(chr);
PHP_FUNCTION(ord);
@ -89,8 +91,9 @@ extern PHPAPI char *_php3_strtoupper(char *s);
extern PHPAPI char *_php3_strtolower(char *s);
extern PHPAPI char *_php3_strtr(char *string, int len, char *str_from, char *str_to, int trlen);
extern PHPAPI char *php_addslashes(char *string, int length, int *new_length, int freeit);
extern PHPAPI char *php_addslashes_ex(char *string, int length, int *new_length, int freeit, char *what, int wlength);
extern PHPAPI char *php_addcslashes(char *string, int length, int *new_length, int freeit, char *what, int wlength);
extern PHPAPI void php_stripslashes(char *string, int *len);
extern PHPAPI void php_stripcslashes(char *string, int *len);
extern PHPAPI void _php3_dirname(char *str, int len);
extern PHPAPI char *php3i_stristr(unsigned char *s, unsigned char *t);
extern PHPAPI char *_php3_str_to_str(char *haystack, int length, char *needle,

193
ext/standard/string.c
View File

@ -1213,26 +1213,56 @@ PHPAPI void php_stripslashes(char *string, int *len)
}
}
/* {{{ proto string addcslashes(string str, string charlist)
Escape all chars mentioned in charlist with backslash. It creates
octal representations if asked to backslash characters with 8th bit set
or with ASCII<32 (except '\n', '\r', '\t' etc...) */
PHP_FUNCTION(addcslashes)
{
pval *str, *what;
if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &str, &what) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string(str);
convert_to_string(what);
return_value->value.str.val = php_addcslashes(str->value.str.val,str->value.str.len,&return_value->value.str.len,0,what->value.str.val,what->value.str.len);
return_value->type = IS_STRING;
}
/* }}} */
/* {{{ proto string addslashes(string str)
Escape single quote, double quotes and backslash characters in a string with backslashes */
PHP_FUNCTION(addslashes)
{
pval *str,*what;
pval *str;
if ((ARG_COUNT(ht) != 1 && ARG_COUNT(ht) != 2) || getParameters(ht, ARG_COUNT(ht), &str, &what) == FAILURE) {
if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &str) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string(str);
if (ARG_COUNT(ht) == 1) {
return_value->value.str.val = php_addslashes(str->value.str.val,str->value.str.len,&return_value->value.str.len,0);
} else {
convert_to_string(what);
return_value->value.str.val = php_addslashes_ex(str->value.str.val,str->value.str.len,&return_value->value.str.len,0,what->value.str.val,what->value.str.len);
}
return_value->value.str.val = php_addslashes(str->value.str.val,str->value.str.len,&return_value->value.str.len,0);
return_value->type = IS_STRING;
}
/* }}} */
/* {{{ proto string stripcslashes(string str)
Strip backslashes from a string. Uses C-style conventions*/
PHP_FUNCTION(stripcslashes)
{
pval *str;
if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &str) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string(str);
/* let RETVAL do the estrdup() */
RETVAL_STRING(str->value.str.val,1);
php_stripcslashes(return_value->value.str.val,&return_value->value.str.len);
}
/* }}} */
/* {{{ proto string stripslashes(string str)
Strip backslashes from a string */
PHP_FUNCTION(stripslashes)
@ -1267,20 +1297,70 @@ char *strerror(int errnum)
#endif
#endif
PHPAPI char *php_addslashes_ex(char *str, int length, int *new_length, int should_free, char *what, int wlength)
PHPAPI void php_stripcslashes(char *str, int *len)
{
char *source,*target,*end;
int nlen = *len, i;
char numtmp[4];
for (source=str,end=str+nlen,target=str; source<end; source++) {
if (*source == '\\' && source+1<end) {
source++;
switch (*source) {
case 'n': *target++='\n'; nlen--; break;
case 'r': *target++='\r'; nlen--; break;
case 'a': *target++='\a'; nlen--; break;
case 't': *target++='\t'; nlen--; break;
case 'v': *target++='\v'; nlen--; break;
case 'b': *target++='\b'; nlen--; break;
case 'f': *target++='\f'; nlen--; break;
case '\\': *target++='\\'; nlen--; break;
case 'x': if (source+1<end && isxdigit(*(source+1))) {
numtmp[0] = *++source;
if (source+1<end && isxdigit(*(source+1))) {
numtmp[1] = *++source;
numtmp[2] = '\0';
nlen-=3;
} else {
numtmp[1] = '\0';
nlen-=2;
}
*target++=strtol(numtmp, NULL, 16);
break;
}
/* break is left intentionally */
default: i=0;
while (source<end && *source>='0' && *source<='7' && i<3) {
numtmp[i++] = *source++;
}
if (i) {
numtmp[i]='\0';
*target++=strtol(numtmp, NULL, 8);
nlen-=i;
source--;
} else {
*target++='\\';
*target++=*source;
}
}
} else {
*target++=*source;
}
}
*target='\0';
*len = nlen;
}
PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_free, char *what, int wlength)
{
int newlen;
char flags[256];
char *new_str;
char *new_str = emalloc((length?length:(length=strlen(str)))*4+1);
char *source,*target;
char *end;
char c;
PLS_FETCH();
if (!what) {
what = "\'\"\\";
wlength = 4;
}
int newlen;
if (!wlength) {
wlength = strlen(what);
@ -1292,52 +1372,40 @@ PHPAPI char *php_addslashes_ex(char *str, int length, int *new_length, int shoul
memset(flags, '\0', sizeof(flags));
for (source=what,end=source+wlength; (c=*source) || source<end; source++) {
flags[c]=1;
}
newlen = length+1;
for (source=str,end=source+length; (c=*source) || source<end; source++) {
if (flags[c]) {
if (c<32 || c>126) {
switch (c) {
case '\n':
case '\t':
case '\r': newlen++; break;
default: newlen+=3;
}
} else {
newlen++;
}
}
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;
}
new_str = (char *)emalloc(newlen);
for (source=str,end=source+length,target=new_str; (c=*source) || source<end; source++) {
if (flags[c]) {
if (c<32 || c>126) {
if (flags[(unsigned char)c]) {
if ((unsigned char)c<32 || (unsigned char)c>126) {
*target++ = '\\';
switch (c) {
case '\n': *target++ = 'n'; break;
case '\t': *target++ = 't'; break;
case '\r': *target++ = 'r'; break;
default: target += sprintf(target, "%03o", c);
}
} else {
if (c=='\'' && PG(magic_quotes_sybase)) {
*target++ = '\'';
*target++ = '\'';
} else {
*target++ = '\\';
*target++ = c;
case '\a': *target++ = 'a'; break;
case '\v': *target++ = 'v'; break;
case '\b': *target++ = 'b'; break;
case '\f': *target++ = 'f'; break;
default: target += sprintf(target, "%03o", (unsigned char)c);
}
}
} else
*target++ = c;
continue;
}
*target++ = '\\';
}
*target++ = c;
}
*target = 0;
newlen = target-new_str;
if (target-new_str<length*4) {
new_str = erealloc(new_str, newlen+1);
}
if (new_length) {
*new_length = target - new_str;
*new_length = newlen;
}
if (should_free) {
STR_FREE(str);
@ -1348,35 +1416,16 @@ PHPAPI char *php_addslashes_ex(char *str, int length, int *new_length, int shoul
PHPAPI char *php_addslashes(char *str, int length, int *new_length, int should_free)
{
/* maximum string length, worst case situation */
char *new_str;
char *new_str = (char *) emalloc((length?length:(length=strlen(str)))*2+1);
char *source,*target;
char *end;
char c;
int newlen;
PLS_FETCH();
if (!length) {
length = strlen(str);
}
newlen = length+1;
for (source=str,end=source+length; (c = *source) || source<end; source++) {
switch(c) {
case '\0': newlen+=3; break;
case '\'':
case '\"':
case '\\': newlen++; break;
}
}
new_str = (char *)emalloc(newlen);
for (source=str,end=source+length,target=new_str; (c = *source) || source<end; source++) {
switch(c) {
case '\0':
*target++ = '\\'; /* what if somebody escapes "foo\0"."12bar"? */
*target++ = '0'; /* we have to add \000 instead of just \0. */
*target++ = '0';
*target++ = '\\';
*target++ = '0';
break;
case '\'':

Write Preview
Loading…
Cancel
Save