diff options
Diffstat (limited to 'ext/standard/file.c')
| -rw-r--r-- | ext/standard/file.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 60e0b30d9a..d4cd4fae3d 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -412,11 +412,11 @@ PHP_FUNCTION(get_meta_tags) } convert_to_string_ex(filename); - fp = php3_fopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); + fp = php_fopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); if (!fp && !socketd) { if (issock != BAD_URL) { char *tmp = estrdup((*filename)->value.str.val); - php3_strip_url_passwd(tmp); + php_strip_url_passwd(tmp); php_error(E_WARNING,"get_meta_tags(\"%s\") - %s", tmp, strerror(errno)); efree(tmp); } @@ -542,11 +542,11 @@ PHP_FUNCTION(file) } convert_to_string_ex(filename); - fp = php3_fopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); + fp = php_fopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); if (!fp && !socketd) { if (issock != BAD_URL) { char *tmp = estrdup((*filename)->value.str.val); - php3_strip_url_passwd(tmp); + php_strip_url_passwd(tmp); php_error(E_WARNING,"file(\"%s\") - %s", tmp, strerror(errno)); efree(tmp); } @@ -659,11 +659,11 @@ PHP_FUNCTION(fopen) * We need a better way of returning error messages from * php3_fopen__wrapper(). */ - fp = php3_fopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); + fp = php_fopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); if (!fp && !socketd) { if (issock != BAD_URL) { char *tmp = estrdup((*arg1)->value.str.val); - php3_strip_url_passwd(tmp); + php_strip_url_passwd(tmp); php_error(E_WARNING,"fopen(\"%s\",\"%s\") - %s", tmp, p, strerror(errno)); efree(tmp); } @@ -1210,7 +1210,7 @@ PHP_FUNCTION(mkdir) convert_to_string_ex(arg1); convert_to_long_ex(arg2); mode = (*arg2)->value.lval; - if (PG(safe_mode) &&(!_php3_checkuid((*arg1)->value.str.val,3))) { + if (PG(safe_mode) &&(!php_checkuid((*arg1)->value.str.val,3))) { RETURN_FALSE; } ret = mkdir((*arg1)->value.str.val,mode); @@ -1235,7 +1235,7 @@ PHP_FUNCTION(rmdir) WRONG_PARAM_COUNT; } convert_to_string_ex(arg1); - if (PG(safe_mode) &&(!_php3_checkuid((*arg1)->value.str.val,1))) { + if (PG(safe_mode) &&(!php_checkuid((*arg1)->value.str.val,1))) { RETURN_FALSE; } ret = rmdir((*arg1)->value.str.val); @@ -1325,13 +1325,13 @@ PHP_FUNCTION(readfile) /* * We need a better way of returning error messages from - * php3_fopen_wrapper(). + * php_fopen_wrapper(). */ - fp = php3_fopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); + fp = php_fopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); if (!fp && !socketd){ if (issock != BAD_URL) { char *tmp = estrdup((*arg1)->value.str.val); - php3_strip_url_passwd(tmp); + php_strip_url_passwd(tmp); php_error(E_WARNING,"readfile(\"%s\") - %s", tmp, strerror(errno)); efree(tmp); } @@ -1429,7 +1429,7 @@ PHP_FUNCTION(rename) old_name = (*old_arg)->value.str.val; new_name = (*new_arg)->value.str.val; - if (PG(safe_mode) &&(!_php3_checkuid(old_name, 2))) { + if (PG(safe_mode) &&(!php_checkuid(old_name, 2))) { RETURN_FALSE; } ret = rename(old_name, new_name); @@ -1460,7 +1460,7 @@ PHP_FUNCTION(copy) convert_to_string_ex(source); convert_to_string_ex(target); - if (PG(safe_mode) &&(!_php3_checkuid((*source)->value.str.val,2))) { + if (PG(safe_mode) &&(!php_checkuid((*source)->value.str.val,2))) { RETURN_FALSE; } |