cvs: /php4 php3_compat.h /php4/dl/mssql mssql.c /php4/ext/db db.c /php4/ext/interbase interbase.c /php4/ext/msql php_msql.c /php4/ext/mysql
php_mysql.c /php4/ext/pgsql pgsql.c /php4/ext/standard exec.c file.c php3_string.h post.c string.c /php4/ext/sybase sybase.c /php4/ext/sybase_ct
php_sybase_ct.c /php4/ext/zlib zlib.c

zeev Sat Sep 4 09:18:57 1999 EDT Modified files: /php4 php3_compat.h /php4/dl/mssql mssql.c /php4/ext/db db.c /php4/ext/interbase interbase.c /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/pgsql pgsql.c /php4/ext/standard exec.c file.c php3_string.h post.c string.c /php4/ext/sybase sybase.c /php4/ext/sybase_ct php_sybase_ct.c /php4/ext/zlib zlib.c Log: Index: php4/php3_compat.h diff -u php4/php3_compat.h:1.4 php4/php3_compat.h:1.5 --- php4/php3_compat.h:1.4 Mon Aug 2 15:16:34 1999 +++ php4/php3_compat.h Sat Sep 4 09:18:54 1999 @@ -86,4 +86,7 @@ #define function_entry zend_function_entry +#define _php3_addslashes php_addslashes +#define _php3_stripslashes php_stripslashes + #endif /* _PHP3_COMPAT_H */ Index: php4/dl/mssql/mssql.c diff -u php4/dl/mssql/mssql.c:1.6 php4/dl/mssql/mssql.c:1.7 --- php4/dl/mssql/mssql.c:1.6 Mon Aug 2 15:16:38 1999 +++ php4/dl/mssql/mssql.c Sat Sep 4 09:18:54 1999 @@ -1045,7 +1045,7 @@ tmp = result->data[result->cur_row][i]; pval_copy_constructor(&tmp); if (msSQL_GLOBAL(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), (void **) &pvalue_ptr); zend_hash_pointer_update(return_value->value.ht, result->fields[i].name, strlen(result->fields[i].name)+1, pvalue_ptr); Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.7 php4/ext/db/db.c:1.8 --- php4/ext/db/db.c:1.7 Mon Aug 2 15:16:39 1999 +++ php4/ext/db/db.c Sat Sep 4 09:18:54 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.7 1999/08/02 19:16:39 zeev Exp $ */ +/* $Id: db.c,v 1.8 1999/09/04 13:18:54 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL #ifdef PHP_31 @@ -485,8 +485,8 @@ 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 @@ 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 @@ 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 @@ 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); } Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.7 php4/ext/interbase/interbase.c:1.8 --- php4/ext/interbase/interbase.c:1.7 Mon Aug 2 15:16:42 1999 +++ php4/ext/interbase/interbase.c Sat Sep 4 09:18:54 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.7 1999/08/02 19:16:42 zeev Exp $ */ +/* $Id: interbase.c,v 1.8 1999/09/04 13:18:54 zeev Exp $ */ /* TODO: A lot... */ @@ -774,7 +774,7 @@ 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 @@ 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); Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.2 php4/ext/msql/php_msql.c:1.3 --- php4/ext/msql/php_msql.c:1.2 Sat Sep 4 07:05:33 1999 +++ php4/ext/msql/php_msql.c Sat Sep 4 09:18:55 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.2 1999/09/04 11:05:33 zeev Exp $ */ +/* $Id: php_msql.c,v 1.3 1999/09/04 13:18:55 zeev Exp $ */ #include "php.h" #if COMPILE_DL @@ -837,7 +837,7 @@ 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 @@ 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]; Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.1 php4/ext/mysql/php_mysql.c:1.2 --- php4/ext/mysql/php_mysql.c:1.1 Fri Sep 3 15:54:12 1999 +++ php4/ext/mysql/php_mysql.c Sat Sep 4 09:18:55 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.1 1999/09/03 19:54:12 zeev Exp $ */ +/* $Id: php_mysql.c,v 1.2 1999/09/04 13:18:55 zeev Exp $ */ /* TODO: @@ -1257,7 +1257,7 @@ 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 @@ 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]; Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.16 php4/ext/pgsql/pgsql.c:1.17 --- php4/ext/pgsql/pgsql.c:1.16 Fri Sep 3 10:58:51 1999 +++ php4/ext/pgsql/pgsql.c Sat Sep 4 09:18:55 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.16 1999/09/03 14:58:51 gorgo Exp $ */ +/* $Id: pgsql.c,v 1.17 1999/09/04 13:18:55 zeev Exp $ */ #include <stdlib.h> @@ -923,7 +923,7 @@ 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; Index: php4/ext/standard/exec.c diff -u php4/ext/standard/exec.c:1.13 php4/ext/standard/exec.c:1.14 --- php4/ext/standard/exec.c:1.13 Wed Aug 18 13:23:01 1999 +++ php4/ext/standard/exec.c Sat Sep 4 09:18:55 1999 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.13 1999/08/18 17:23:01 andrey Exp $ */ +/* $Id: exec.c,v 1.14 1999/09/04 13:18:55 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -196,7 +196,7 @@ 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); Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.25 php4/ext/standard/file.c:1.26 --- php4/ext/standard/file.c:1.25 Sat Aug 28 09:53:46 1999 +++ php4/ext/standard/file.c Sat Sep 4 09:18:56 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.25 1999/08/28 13:53:46 sas Exp $ */ +/* $Id: file.c,v 1.26 1999/09/04 13:18:56 zeev Exp $ */ /* Synced with php3 revision 1.218 1999-06-16 [ssb] */ @@ -382,7 +382,7 @@ } 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 @@ 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 @@ 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 @@ /* 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 @@ 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; } Index: php4/ext/standard/php3_string.h diff -u php4/ext/standard/php3_string.h:1.10 php4/ext/standard/php3_string.h:1.11 --- php4/ext/standard/php3_string.h:1.10 Sat Jul 24 18:16:54 1999 +++ php4/ext/standard/php3_string.h Sat Sep 4 09:18:56 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php3_string.h,v 1.10 1999/07/24 22:16:54 andrey Exp $ */ +/* $Id: php3_string.h,v 1.11 1999/09/04 13:18:56 zeev Exp $ */ /* Synced with php3 revision 1.43 1999-06-16 [ssb] */ @@ -88,8 +88,8 @@ 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, Index: php4/ext/standard/post.c diff -u php4/ext/standard/post.c:1.17 php4/ext/standard/post.c:1.18 --- php4/ext/standard/post.c:1.17 Mon Aug 2 15:16:50 1999 +++ php4/ext/standard/post.c Sat Sep 4 09:18:56 1999 @@ -168,7 +168,7 @@ 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 @@ 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 @@ 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 @@ } 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 @@ } 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 @@ 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 { Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.29 php4/ext/standard/string.c:1.30 --- php4/ext/standard/string.c:1.29 Thu Aug 12 06:53:29 1999 +++ php4/ext/standard/string.c Sat Sep 4 09:18:56 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.29 1999/08/12 10:53:29 verdy_p Exp $ */ +/* $Id: string.c,v 1.30 1999/09/04 13:18:56 zeev Exp $ */ /* Synced with php3 revision 1.193 1999-06-16 [ssb] */ @@ -1165,7 +1165,7 @@ /* 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 @@ 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 @@ /* 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 @@ #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); Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.12 php4/ext/sybase/sybase.c:1.13 --- php4/ext/sybase/sybase.c:1.12 Mon Aug 2 15:16:51 1999 +++ php4/ext/sybase/sybase.c Sat Sep 4 09:18:56 1999 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.12 1999/08/02 19:16:51 zeev Exp $ */ +/* $Id: sybase.c,v 1.13 1999/09/04 13:18:56 zeev Exp $ */ #include "php.h" @@ -926,7 +926,7 @@ *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++; Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.2 php4/ext/sybase_ct/php_sybase_ct.c:1.3 --- php4/ext/sybase_ct/php_sybase_ct.c:1.2 Sat Sep 4 09:03:09 1999 +++ php4/ext/sybase_ct/php_sybase_ct.c Sat Sep 4 09:18:56 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.2 1999/09/04 13:03:09 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.3 1999/09/04 13:18:56 zeev Exp $ */ #include "php.h" @@ -1261,7 +1261,7 @@ 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); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.9 php4/ext/zlib/zlib.c:1.10 --- php4/ext/zlib/zlib.c:1.9 Mon Aug 9 16:18:00 1999 +++ php4/ext/zlib/zlib.c Sat Sep 4 09:18:57 1999 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.9 1999/08/09 20:18:00 eschmid Exp $ */ +/* $Id: zlib.c,v 1.10 1999/09/04 13:18:57 zeev Exp $ */ #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE #endif @@ -360,7 +360,7 @@ 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 @@ 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 @@ /* 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 @@ 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; }