diff options
author | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
commit | bdeb220f48825642f84cdbf3ff23a30613c92e86 (patch) | |
tree | 1a6cf34d20420e4815b4becb21311a4457d84103 /main/fopen_wrappers.c | |
parent | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff) | |
download | php-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz |
first shot remove TSRMLS_* things
Diffstat (limited to 'main/fopen_wrappers.c')
-rw-r--r-- | main/fopen_wrappers.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index b5b12eba56..9a53276be0 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -118,7 +118,7 @@ PHPAPI ZEND_INI_MH(OnUpdateBaseDir) *end = '\0'; end++; } - if (php_check_open_basedir_ex(ptr, 0 TSRMLS_CC) != 0) { + if (php_check_open_basedir_ex(ptr, 0) != 0) { /* At least one portion of this open_basedir is less restrictive than the prior one, FAIL */ efree(pathbuf); return FAILURE; @@ -139,7 +139,7 @@ PHPAPI ZEND_INI_MH(OnUpdateBaseDir) open_basedir. Returns -1 if error or not in the open_basedir, else 0. When open_basedir is NULL, always return 0. */ -PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path TSRMLS_DC) +PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path) { char resolved_name[MAXPATHLEN]; char resolved_basedir[MAXPATHLEN]; @@ -164,7 +164,7 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path } /* normalize and expand path */ - if (expand_filepath(path, resolved_name TSRMLS_CC) == NULL) { + if (expand_filepath(path, resolved_name) == NULL) { return -1; } @@ -225,7 +225,7 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path } /* Resolve open_basedir to resolved_basedir */ - if (expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL) { + if (expand_filepath(local_open_basedir, resolved_basedir) != NULL) { int basedir_len = (int)strlen(basedir); /* Handler for basedirs that end with a / */ resolved_basedir_len = (int)strlen(resolved_basedir); @@ -284,14 +284,14 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path } /* }}} */ -PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC) +PHPAPI int php_check_open_basedir(const char *path) { - return php_check_open_basedir_ex(path, 1 TSRMLS_CC); + return php_check_open_basedir_ex(path, 1); } /* {{{ php_check_open_basedir */ -PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC) +PHPAPI int php_check_open_basedir_ex(const char *path, int warn) { /* Only check when open_basedir is available */ if (PG(open_basedir) && *PG(open_basedir)) { @@ -302,7 +302,7 @@ PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC) /* Check if the path is too long so we can give a more useful error * message. */ if (strlen(path) > (MAXPATHLEN - 1)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "File name is longer than the maximum allowed path length on this platform (%d): %s", MAXPATHLEN, path); + php_error_docref(NULL, E_WARNING, "File name is longer than the maximum allowed path length on this platform (%d): %s", MAXPATHLEN, path); errno = EINVAL; return -1; } @@ -318,7 +318,7 @@ PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC) end++; } - if (php_check_specific_open_basedir(ptr, path TSRMLS_CC) == 0) { + if (php_check_specific_open_basedir(ptr, path) == 0) { efree(pathbuf); return 0; } @@ -326,7 +326,7 @@ PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC) ptr = end; } if (warn) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s)", path, PG(open_basedir)); + php_error_docref(NULL, E_WARNING, "open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s)", path, PG(open_basedir)); } efree(pathbuf); errno = EPERM; /* we deny permission to open it */ @@ -340,16 +340,16 @@ PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC) /* {{{ php_fopen_and_set_opened_path */ -static FILE *php_fopen_and_set_opened_path(const char *path, const char *mode, char **opened_path TSRMLS_DC) +static FILE *php_fopen_and_set_opened_path(const char *path, const char *mode, char **opened_path) { FILE *fp; - if (php_check_open_basedir((char *)path TSRMLS_CC)) { + if (php_check_open_basedir((char *)path)) { return NULL; } fp = VCWD_FOPEN(path, mode); if (fp && opened_path) { - *opened_path = expand_filepath_with_mode(path, NULL, NULL, 0, CWD_EXPAND TSRMLS_CC); + *opened_path = expand_filepath_with_mode(path, NULL, NULL, 0, CWD_EXPAND); } return fp; } @@ -357,7 +357,7 @@ static FILE *php_fopen_and_set_opened_path(const char *path, const char *mode, c /* {{{ php_fopen_primary_script */ -PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC) +PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle) { char *path_info; char *filename = NULL; @@ -429,7 +429,7 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC) if (filename) { - resolved_path = zend_resolve_path(filename, (int)strlen(filename) TSRMLS_CC); + resolved_path = zend_resolve_path(filename, (int)strlen(filename)); } if (!resolved_path) { @@ -452,7 +452,7 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC) orig_display_errors = PG(display_errors); PG(display_errors) = 0; - if (zend_stream_open(filename, file_handle TSRMLS_CC) == FAILURE) { + if (zend_stream_open(filename, file_handle) == FAILURE) { PG(display_errors) = orig_display_errors; if (SG(request_info).path_translated != filename) { if (filename) { @@ -481,7 +481,7 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC) /* {{{ php_resolve_path * Returns the realpath for given filename according to include path */ -PHPAPI char *php_resolve_path(const char *filename, int filename_length, const char *path TSRMLS_DC) +PHPAPI char *php_resolve_path(const char *filename, int filename_length, const char *path) { char resolved_path[MAXPATHLEN]; char trypath[MAXPATHLEN]; @@ -496,9 +496,9 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c /* Don't resolve paths which contain protocol (except of file://) */ for (p = filename; isalnum((int)*p) || *p == '+' || *p == '-' || *p == '.'; p++); if ((*p == ':') && (p - filename > 1) && (p[1] == '/') && (p[2] == '/')) { - wrapper = php_stream_locate_url_wrapper(filename, &actual_path, STREAM_OPEN_FOR_INCLUDE TSRMLS_CC); + wrapper = php_stream_locate_url_wrapper(filename, &actual_path, STREAM_OPEN_FOR_INCLUDE); if (wrapper == &php_plain_files_wrapper) { - if (tsrm_realpath(actual_path, resolved_path TSRMLS_CC)) { + if (tsrm_realpath(actual_path, resolved_path)) { return estrdup(resolved_path); } } @@ -511,7 +511,7 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c IS_ABSOLUTE_PATH(filename, filename_length) || !path || !*path) { - if (tsrm_realpath(filename, resolved_path TSRMLS_CC)) { + if (tsrm_realpath(filename, resolved_path)) { return estrdup(resolved_path); } else { return NULL; @@ -554,29 +554,29 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c } actual_path = trypath; if (is_stream_wrapper) { - wrapper = php_stream_locate_url_wrapper(trypath, &actual_path, STREAM_OPEN_FOR_INCLUDE TSRMLS_CC); + wrapper = php_stream_locate_url_wrapper(trypath, &actual_path, STREAM_OPEN_FOR_INCLUDE); if (!wrapper) { continue; } else if (wrapper != &php_plain_files_wrapper) { if (wrapper->wops->url_stat) { php_stream_statbuf ssb; - if (SUCCESS == wrapper->wops->url_stat(wrapper, trypath, 0, &ssb, NULL TSRMLS_CC)) { + if (SUCCESS == wrapper->wops->url_stat(wrapper, trypath, 0, &ssb, NULL)) { return estrdup(trypath); } } continue; } } - if (tsrm_realpath(actual_path, resolved_path TSRMLS_CC)) { + if (tsrm_realpath(actual_path, resolved_path)) { return estrdup(resolved_path); } } /* end provided path */ /* check in calling scripts' current working directory as a fall back case */ - if (zend_is_executing(TSRMLS_C)) { - const char *exec_fname = zend_get_executed_filename(TSRMLS_C); + if (zend_is_executing()) { + const char *exec_fname = zend_get_executed_filename(); int exec_fname_length = (int)strlen(exec_fname); while ((--exec_fname_length >= 0) && !IS_SLASH(exec_fname[exec_fname_length])); @@ -590,14 +590,14 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c /* Check for stream wrapper */ for (p = trypath; isalnum((int)*p) || *p == '+' || *p == '-' || *p == '.'; p++); if ((*p == ':') && (p - trypath > 1) && (p[1] == '/') && (p[2] == '/')) { - wrapper = php_stream_locate_url_wrapper(trypath, &actual_path, STREAM_OPEN_FOR_INCLUDE TSRMLS_CC); + wrapper = php_stream_locate_url_wrapper(trypath, &actual_path, STREAM_OPEN_FOR_INCLUDE); if (!wrapper) { return NULL; } else if (wrapper != &php_plain_files_wrapper) { if (wrapper->wops->url_stat) { php_stream_statbuf ssb; - if (SUCCESS == wrapper->wops->url_stat(wrapper, trypath, 0, &ssb, NULL TSRMLS_CC)) { + if (SUCCESS == wrapper->wops->url_stat(wrapper, trypath, 0, &ssb, NULL)) { return estrdup(trypath); } } @@ -605,7 +605,7 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c } } - if (tsrm_realpath(actual_path, resolved_path TSRMLS_CC)) { + if (tsrm_realpath(actual_path, resolved_path)) { return estrdup(resolved_path); } } @@ -619,7 +619,7 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c * Tries to open a file with a PATH-style list of directories. * If the filename starts with "." or "/", the path is ignored. */ -PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const char *path, char **opened_path TSRMLS_DC) +PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const char *path, char **opened_path) { char *pathbuf, *ptr, *end; const char *exec_fname; @@ -645,15 +645,15 @@ PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const c || IS_ABSOLUTE_PATH(filename, filename_length) || (!path || (path && !*path)) ) { - return php_fopen_and_set_opened_path(filename, mode, opened_path TSRMLS_CC); + return php_fopen_and_set_opened_path(filename, mode, opened_path); } /* check in provided path */ /* append the calling scripts' current working directory * as a fall back case */ - if (zend_is_executing(TSRMLS_C)) { - exec_fname = zend_get_executed_filename(TSRMLS_C); + if (zend_is_executing()) { + exec_fname = zend_get_executed_filename(); exec_fname_length = (int)strlen(exec_fname); path_length = (int)strlen(path); @@ -681,9 +681,9 @@ PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const c end++; } if (snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename) >= MAXPATHLEN) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s/%s path was truncated to %d", ptr, filename, MAXPATHLEN); + php_error_docref(NULL, E_NOTICE, "%s/%s path was truncated to %d", ptr, filename, MAXPATHLEN); } - fp = php_fopen_and_set_opened_path(trypath, mode, opened_path TSRMLS_CC); + fp = php_fopen_and_set_opened_path(trypath, mode, opened_path); if (fp) { efree(pathbuf); return fp; @@ -738,23 +738,23 @@ PHPAPI char *php_strip_url_passwd(char *url) /* {{{ expand_filepath */ -PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC) +PHPAPI char *expand_filepath(const char *filepath, char *real_path) { - return expand_filepath_ex(filepath, real_path, NULL, 0 TSRMLS_CC); + return expand_filepath_ex(filepath, real_path, NULL, 0); } /* }}} */ /* {{{ expand_filepath_ex */ -PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len TSRMLS_DC) +PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len) { - return expand_filepath_with_mode(filepath, real_path, relative_to, relative_to_len, CWD_FILEPATH TSRMLS_CC); + return expand_filepath_with_mode(filepath, real_path, relative_to, relative_to_len, CWD_FILEPATH); } /* }}} */ /* {{{ expand_filepath_use_realpath */ -PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len, int realpath_mode TSRMLS_DC) +PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, const char *relative_to, size_t relative_to_len, int realpath_mode) { cwd_state new_state; char cwd[MAXPATHLEN]; @@ -810,7 +810,7 @@ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, co new_state.cwd = estrdup(cwd); new_state.cwd_length = (int)strlen(cwd); - if (virtual_file_ex(&new_state, filepath, NULL, realpath_mode TSRMLS_CC)) { + if (virtual_file_ex(&new_state, filepath, NULL, realpath_mode)) { efree(new_state.cwd); return NULL; } |