summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/db/db.c12
-rw-r--r--ext/interbase/interbase.c4
-rw-r--r--ext/msql/php_msql.c4
-rw-r--r--ext/mysql/php_mysql.c4
-rw-r--r--ext/pgsql/pgsql.c2
-rw-r--r--ext/standard/exec.c2
-rw-r--r--ext/standard/file.c10
-rw-r--r--ext/standard/php3_string.h4
-rw-r--r--ext/standard/post.c16
-rw-r--r--ext/standard/string.c8
-rw-r--r--ext/sybase/sybase.c2
-rw-r--r--ext/sybase_ct/php_sybase_ct.c2
-rw-r--r--ext/zlib/zlib.c8
-rw-r--r--main/php3_compat.h3
14 files changed, 42 insertions, 39 deletions
diff --git a/ext/db/db.c b/ext/db/db.c
index 915b926ad9..dbce69658a 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -485,8 +485,8 @@ int _php3_dbminsert(dbm_info *info, char *key, char *value) {
int ret;
DBM_TYPE dbf;
- _php3_stripslashes(key,NULL);
- _php3_stripslashes(value,NULL);
+ php_stripslashes(key,NULL);
+ php_stripslashes(value,NULL);
value_datum.dptr = estrdup(value);
value_datum.dsize = strlen(value);
@@ -540,8 +540,8 @@ int _php3_dbmreplace(dbm_info *info, char *key, char *value) {
PLS_FETCH();
if (PG(magic_quotes_runtime)) {
- _php3_stripslashes(key,NULL);
- _php3_stripslashes(value,NULL);
+ php_stripslashes(key,NULL);
+ php_stripslashes(value,NULL);
}
value_datum.dptr = estrdup(value);
@@ -632,7 +632,7 @@ char *_php3_dbmfetch(dbm_info *info, char *key) {
ret = NULL;
if (ret && PG(magic_quotes_runtime)) {
- ret = _php3_addslashes(ret, value_datum.dsize, NULL, 1);
+ ret = php_addslashes(ret, value_datum.dsize, NULL, 1);
}
return(ret);
}
@@ -847,7 +847,7 @@ char *_php3_dbmnextkey(dbm_info *info, char *key) {
else ret=NULL;
if (ret && PG(magic_quotes_runtime)) {
- ret = _php3_addslashes(ret, ret_datum.dsize, NULL, 1);
+ ret = php_addslashes(ret, ret_datum.dsize, NULL, 1);
}
return(ret);
}
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 78f3f858a7..1f12608629 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -774,7 +774,7 @@ PHP_FUNCTION(ibase_fetch_row)
collen = sprintf(char_data, "%*.*s", len, len, ibase_result->sqlda->sqlvar[i].sqldata);
if (PG(magic_quotes_runtime)) {
int newlen;
- char *tmp = _php3_addslashes(char_data, collen, &newlen, 0);
+ char *tmp = php_addslashes(char_data, collen, &newlen, 0);
add_get_index_stringl(return_value, i, tmp, newlen, (void **) &pval_ptr, 0);
} else {
add_get_index_stringl(return_value, i, char_data, collen, (void **) &pval_ptr, 1);
@@ -790,7 +790,7 @@ PHP_FUNCTION(ibase_fetch_row)
collen = sprintf(char_data, "%*.*s", vchar->var_len, vchar->var_len, vchar->var_str);
if (PG(magic_quotes_runtime)) {
int newlen;
- char *tmp = _php3_addslashes(char_data, collen, &newlen, 0);
+ char *tmp = php_addslashes(char_data, collen, &newlen, 0);
add_get_index_stringl(return_value, i, tmp, newlen, (void **) &pval_ptr, 0);
} else {
add_get_index_stringl(return_value, i, char_data, collen, (void **) &pval_ptr, 1);
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 9857631b57..d374624458 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -837,7 +837,7 @@ DLEXPORT PHP_FUNCTION(msql_result)
if (sql_row[field_offset]) {
if (PG(magic_quotes_runtime)) {
- return_value->value.str.val = _php3_addslashes(sql_row[field_offset],0,&return_value->value.str.len,0);
+ return_value->value.str.val = php_addslashes(sql_row[field_offset],0,&return_value->value.str.len,0);
} else {
return_value->value.str.len = (sql_row[field_offset]?strlen(sql_row[field_offset]):0);
return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
@@ -938,7 +938,7 @@ static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
int should_copy;
if (PG(magic_quotes_runtime)) {
- data = _php3_addslashes(msql_row[i], 0, &data_len, 0);
+ data = php_addslashes(msql_row[i], 0, &data_len, 0);
should_copy = 0;
} else {
data = msql_row[i];
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index f1ddd716ac..436b1bd871 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1257,7 +1257,7 @@ PHP_FUNCTION(mysql_result)
if (sql_row[field_offset]) {
if (PG(magic_quotes_runtime)) {
- return_value->value.str.val = _php3_addslashes(sql_row[field_offset],sql_row_lengths[field_offset],&return_value->value.str.len,0);
+ return_value->value.str.val = php_addslashes(sql_row[field_offset],sql_row_lengths[field_offset],&return_value->value.str.len,0);
} else {
return_value->value.str.len = sql_row_lengths[field_offset];
return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
@@ -1364,7 +1364,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
int should_copy;
if (PG(magic_quotes_runtime)) {
- data = _php3_addslashes(mysql_row[i],mysql_row_lengths[i],&data_len,0);
+ data = php_addslashes(mysql_row[i],mysql_row_lengths[i],&data_len,0);
should_copy = 0;
} else {
data = mysql_row[i];
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 0a4088b27e..884eaf9441 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -923,7 +923,7 @@ static void php3_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
int should_copy;
if (PG(magic_quotes_runtime)) {
- data = _php3_addslashes(element,element_len,&data_len,0);
+ data = php_addslashes(element,element_len,&data_len,0);
should_copy = 0;
} else {
data = element;
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index df0d3f9cd8..50de415568 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -196,7 +196,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
if (PG(magic_quotes_runtime) && type!=3) {
int len;
- tmp = _php3_addslashes(buf, 0, &len, 0);
+ tmp = php_addslashes(buf, 0, &len, 0);
RETVAL_STRINGL(tmp,len,0);
} else {
RETVAL_STRING(buf,1);
diff --git a/ext/standard/file.c b/ext/standard/file.c
index b9e481a42c..4dfc129e73 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -382,7 +382,7 @@ PHP_FUNCTION(get_meta_tags)
}
if(*var_name && val) {
if (PG(magic_quotes_runtime)) {
- slashed = _php3_addslashes(val,0,&len,0);
+ slashed = php_addslashes(val,0,&len,0);
} else {
slashed = estrndup(val,strlen(val));
}
@@ -451,7 +451,7 @@ PHP_FUNCTION(file)
if (PG(magic_quotes_runtime)) {
int len;
- slashed = _php3_addslashes(buf,0,&len,0); /* 0 = don't free source string */
+ slashed = php_addslashes(buf,0,&len,0); /* 0 = don't free source string */
add_index_stringl(return_value, i++, slashed, len, 0);
} else {
add_index_string(return_value, i++, buf, 1);
@@ -858,7 +858,7 @@ PHP_FUNCTION(fgets)
RETVAL_FALSE;
} else {
if (PG(magic_quotes_runtime)) {
- return_value->value.str.val = _php3_addslashes(buf,0,&return_value->value.str.len,1);
+ return_value->value.str.val = php_addslashes(buf,0,&return_value->value.str.len,1);
} else {
return_value->value.str.val = buf;
return_value->value.str.len = strlen(return_value->value.str.val);
@@ -1009,7 +1009,7 @@ PHP_FUNCTION(fwrite)
/* strip slashes only if the length wasn't specified explicitly */
if (!arg3 && PG(magic_quotes_runtime)) {
- _php3_stripslashes(arg2->value.str.val,&num_bytes);
+ php_stripslashes(arg2->value.str.val,&num_bytes);
}
if (issock){
@@ -1466,7 +1466,7 @@ PHP_FUNCTION(fread)
return_value->value.str.len = SOCK_FREAD(return_value->value.str.val, len, socketd);
}
if (PG(magic_quotes_runtime)) {
- return_value->value.str.val = _php3_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
+ return_value->value.str.val = php_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
}
return_value->type = IS_STRING;
}
diff --git a/ext/standard/php3_string.h b/ext/standard/php3_string.h
index 26e88c5499..fb662bbe16 100644
--- a/ext/standard/php3_string.h
+++ b/ext/standard/php3_string.h
@@ -88,8 +88,8 @@ PHP_FUNCTION(strip_tags);
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 *_php3_addslashes(char *string, int length, int *new_length, int freeit);
-extern PHPAPI void _php3_stripslashes(char *string, int *len);
+extern PHPAPI char *php_addslashes(char *string, int length, int *new_length, int freeit);
+extern PHPAPI void php_stripslashes(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,
diff --git a/ext/standard/post.c b/ext/standard/post.c
index 146d8b25f6..04010d32a2 100644
--- a/ext/standard/post.c
+++ b/ext/standard/post.c
@@ -168,7 +168,7 @@ void _php3_parse_gpc_data(char *val, char *var, pval *track_vars_array)
if (var_type == GPC_INDEXED_ARRAY) {
ind = php3_get_ident_index(var);
if (PG(magic_quotes_gpc)) {
- ret = _php3_addslashes(ind, 0, NULL, 1);
+ ret = php_addslashes(ind, 0, NULL, 1);
} else {
ret = ind;
}
@@ -200,7 +200,7 @@ void _php3_parse_gpc_data(char *val, char *var, pval *track_vars_array)
val_len = strlen(val);
if (PG(magic_quotes_gpc)) {
- val = _php3_addslashes(val, val_len, &val_len, 0);
+ val = php_addslashes(val, val_len, &val_len, 0);
} else {
val = estrndup(val, val_len);
}
@@ -438,7 +438,7 @@ PHPAPI void php3_TreatHeaders(void)
if (user) {
if (PG(magic_quotes_gpc)) {
- escaped_str = _php3_addslashes(user, 0, &len, 0);
+ escaped_str = php_addslashes(user, 0, &len, 0);
SET_VAR_STRINGL("PHP_AUTH_USER", escaped_str, len);
} else {
SET_VAR_STRING("PHP_AUTH_USER", estrdup(user));
@@ -446,7 +446,7 @@ PHPAPI void php3_TreatHeaders(void)
}
if (t) {
if (PG(magic_quotes_gpc)) {
- escaped_str = _php3_addslashes(t, 0, &len, 0);
+ escaped_str = php_addslashes(t, 0, &len, 0);
SET_VAR_STRINGL("PHP_AUTH_PW", escaped_str, len);
} else {
SET_VAR_STRING("PHP_AUTH_PW", estrdup(t));
@@ -454,7 +454,7 @@ PHPAPI void php3_TreatHeaders(void)
}
if (type) {
if (PG(magic_quotes_gpc)) {
- escaped_str = _php3_addslashes(type, 0, &len, 0);
+ escaped_str = php_addslashes(type, 0, &len, 0);
SET_VAR_STRINGL("PHP_AUTH_TYPE", escaped_str, len);
} else {
SET_VAR_STRING("PHP_AUTH_TYPE", estrdup(type));
@@ -473,11 +473,11 @@ PHPAPI void php3_TreatHeaders(void)
if((l->paramc > 1)&&!strcasecmp(l->params[0], "REMOTE_PW")){
type = "Basic";
if (PG(magic_quotes_gpc)) {
- escaped_str = _php3_addslashes(type, 0, &len, 0);
+ escaped_str = php_addslashes(type, 0, &len, 0);
SET_VAR_STRINGL("PHP_AUTH_TYPE", escaped_str, len);
- escaped_str = _php3_addslashes(l->params[1], 0, &len, 0);
+ escaped_str = php_addslashes(l->params[1], 0, &len, 0);
SET_VAR_STRINGL("PHP_AUTH_PW", escaped_str, len);
- escaped_str = _php3_addslashes(req->remote_user, 0, &len, 0);
+ escaped_str = php_addslashes(req->remote_user, 0, &len, 0);
SET_VAR_STRINGL("PHP_AUTH_USER", escaped_str, len);
} else {
diff --git a/ext/standard/string.c b/ext/standard/string.c
index b85433e262..f88e4750b8 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1165,7 +1165,7 @@ PHP_FUNCTION(similar_text)
/* be careful, this edits the string in-place */
-PHPAPI void _php3_stripslashes(char *string, int *len)
+PHPAPI void php_stripslashes(char *string, int *len)
{
char *s, *t;
int l;
@@ -1223,7 +1223,7 @@ PHP_FUNCTION(addslashes)
WRONG_PARAM_COUNT;
}
convert_to_string(str);
- return_value->value.str.val = _php3_addslashes(str->value.str.val,str->value.str.len,&return_value->value.str.len,0);
+ 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;
}
/* }}} */
@@ -1241,7 +1241,7 @@ PHP_FUNCTION(stripslashes)
/* let RETVAL do the estrdup() */
RETVAL_STRING(str->value.str.val,1);
- _php3_stripslashes(return_value->value.str.val,&return_value->value.str.len);
+ php_stripslashes(return_value->value.str.val,&return_value->value.str.len);
}
/* }}} */
@@ -1263,7 +1263,7 @@ char *strerror(int errnum)
#endif
-PHPAPI char *_php3_addslashes(char *str, int length, int *new_length, int should_free)
+PHPAPI char *php_addslashes(char *str, int length, int *new_length, int should_free)
{
/* maximum string length, worst case situation */
char *new_str = (char *) emalloc((length?length:(length=strlen(str)))*2+1);
diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c
index c289fc5cc7..95a48562b7 100644
--- a/ext/sybase/sybase.c
+++ b/ext/sybase/sybase.c
@@ -926,7 +926,7 @@ static PHP_FUNCTION(sybase_fetch_hash)
*tmp = result->data[result->cur_row][i];
pval_copy_constructor(tmp);
if (PG(magic_quotes_runtime) && tmp->type == IS_STRING) {
- tmp->value.str.val = _php3_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1);
+ tmp->value.str.val = php_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1);
}
zend_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval *), NULL);
tmp->refcount++;
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 12a9120ad3..8580896932 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1261,7 +1261,7 @@ static void php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
INIT_PZVAL(tmp);
pval_copy_constructor(tmp);
if (PG(magic_quotes_runtime) && tmp->type == IS_STRING) {
- tmp->value.str.val = _php3_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1);
+ tmp->value.str.val = php_addslashes(tmp->value.str.val,tmp->value.str.len,&tmp->value.str.len,1);
}
zend_hash_index_update(return_value->value.ht, i, (void *) &tmp, sizeof(pval *), NULL);
zend_hash_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, (void *) &tmp, sizeof(pval *), NULL);
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 26d37f93b3..70a6fec772 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -360,7 +360,7 @@ PHP_FUNCTION(gzfile) {
if (PG(magic_quotes_runtime)) {
int len;
- slashed = _php3_addslashes(buf,0,&len,0); /* 0 = don't free source string */
+ slashed = php_addslashes(buf,0,&len,0); /* 0 = don't free source string */
add_index_stringl(return_value, i++, slashed, len, 0);
} else {
add_index_string(return_value, i++, buf, 1);
@@ -498,7 +498,7 @@ PHP_FUNCTION(gzgets) {
RETVAL_FALSE;
} else {
if (PG(magic_quotes_runtime)) {
- return_value->value.str.val = _php3_addslashes(buf,0,&return_value->value.str.len,1);
+ return_value->value.str.val = php_addslashes(buf,0,&return_value->value.str.len,1);
} else {
return_value->value.str.val = buf;
return_value->value.str.len = strlen(return_value->value.str.val);
@@ -703,7 +703,7 @@ PHP_FUNCTION(gzwrite) {
/* strip slashes only if the length wasn't specified explicitly */
if (!arg3 && PG(magic_quotes_runtime)) {
- _php3_stripslashes(arg2->value.str.val,&num_bytes);
+ php_stripslashes(arg2->value.str.val,&num_bytes);
}
ret = gzwrite(zp, arg2->value.str.val,num_bytes);
@@ -901,7 +901,7 @@ PHP_FUNCTION(gzread)
return_value->value.str.val[return_value->value.str.len] = 0;
if (PG(magic_quotes_runtime)) {
- return_value->value.str.val = _php3_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
+ return_value->value.str.val = php_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
}
return_value->type = IS_STRING;
}
diff --git a/main/php3_compat.h b/main/php3_compat.h
index 85242e323e..1b8db14617 100644
--- a/main/php3_compat.h
+++ b/main/php3_compat.h
@@ -86,4 +86,7 @@
#define function_entry zend_function_entry
+#define _php3_addslashes php_addslashes
+#define _php3_stripslashes php_stripslashes
+
#endif /* _PHP3_COMPAT_H */
View Lorry Controller Status