diff options
Diffstat (limited to 'TSRM/tsrm_virtual_cwd.c')
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 70 |
1 files changed, 25 insertions, 45 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index 39c825ff75..3db3c4cf9d 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -198,10 +198,9 @@ CWD_API void virtual_cwd_shutdown(void) free(main_cwd_state.cwd); /* Don't use CWD_STATE_FREE because the non global states will probably use emalloc()/efree() */ } -CWD_API char *virtual_getcwd_ex(size_t *length) +CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC) { cwd_state *state; - TSRMLS_FETCH(); state = &CWDG(cwd); @@ -234,12 +233,12 @@ CWD_API char *virtual_getcwd_ex(size_t *length) /* Same semantics as UNIX getcwd() */ -CWD_API char *virtual_getcwd(char *buf, size_t size) +CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC) { size_t length; char *cwd; - cwd = virtual_getcwd_ex(&length); + cwd = virtual_getcwd_ex(&length TSRMLS_CC); if (buf == NULL) { return cwd; @@ -403,14 +402,12 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func return (ret); } -CWD_API int virtual_chdir(const char *path) +CWD_API int virtual_chdir(const char *path TSRMLS_DC) { - TSRMLS_FETCH(); - return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok)?-1:0; } -CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path)) +CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC) { int length = strlen(path); char *temp; @@ -437,16 +434,15 @@ CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path #if VIRTUAL_CWD_DEBUG fprintf (stderr, "Changing directory to %s\n", temp); #endif - retval = p_chdir(temp); + retval = p_chdir(temp TSRMLS_CC); tsrm_free_alloca(temp); return retval; } -CWD_API char *virtual_realpath(const char *path, char *real_path) +CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC) { cwd_state new_state; int retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); retval = virtual_file_ex(&new_state, path, NULL); @@ -461,11 +457,10 @@ CWD_API char *virtual_realpath(const char *path, char *real_path) return NULL; } -CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path) +CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path TSRMLS_DC) { cwd_state new_state; int retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); retval = virtual_file_ex(&new_state, path, verify_path); @@ -476,16 +471,15 @@ CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_f } -CWD_API int virtual_filepath(const char *path, char **filepath) +CWD_API int virtual_filepath(const char *path, char **filepath TSRMLS_DC) { - return virtual_filepath_ex(path, filepath, php_is_file_ok); + return virtual_filepath_ex(path, filepath, php_is_file_ok TSRMLS_CC); } -CWD_API FILE *virtual_fopen(const char *path, const char *mode) +CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC) { cwd_state new_state; FILE *f; - TSRMLS_FETCH(); if (path[0] == '\0') { /* Fail to open empty path */ return NULL; @@ -501,11 +495,10 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode) } #if HAVE_UTIME -CWD_API int virtual_utime(const char *filename, struct utimbuf *buf) +CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC) { cwd_state new_state; int ret; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, filename, NULL); @@ -517,11 +510,10 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf) } #endif -CWD_API int virtual_chmod(const char *filename, mode_t mode) +CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC) { cwd_state new_state; int ret; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, filename, NULL); @@ -533,11 +525,10 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode) } #ifndef TSRM_WIN32 -CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group) +CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC) { cwd_state new_state; int ret; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, filename, NULL); @@ -549,11 +540,10 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group) } #endif -CWD_API int virtual_open(const char *path, int flags, ...) +CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...) { cwd_state new_state; int f; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, path, NULL); @@ -574,11 +564,10 @@ CWD_API int virtual_open(const char *path, int flags, ...) return f; } -CWD_API int virtual_creat(const char *path, mode_t mode) +CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC) { cwd_state new_state; int f; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, path, NULL); @@ -589,12 +578,11 @@ CWD_API int virtual_creat(const char *path, mode_t mode) return f; } -CWD_API int virtual_rename(char *oldname, char *newname) +CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC) { cwd_state old_state; cwd_state new_state; int retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&old_state, &CWDG(cwd)); virtual_file_ex(&old_state, oldname, NULL); @@ -612,11 +600,10 @@ CWD_API int virtual_rename(char *oldname, char *newname) return retval; } -CWD_API int virtual_stat(const char *path, struct stat *buf) +CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC) { cwd_state new_state; int retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, path, NULL); @@ -629,11 +616,10 @@ CWD_API int virtual_stat(const char *path, struct stat *buf) #ifndef TSRM_WIN32 -CWD_API int virtual_lstat(const char *path, struct stat *buf) +CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC) { cwd_state new_state; int retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, path, NULL); @@ -646,11 +632,10 @@ CWD_API int virtual_lstat(const char *path, struct stat *buf) #endif -CWD_API int virtual_unlink(const char *path) +CWD_API int virtual_unlink(const char *path TSRMLS_DC) { cwd_state new_state; int retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, path, NULL); @@ -661,11 +646,10 @@ CWD_API int virtual_unlink(const char *path) return retval; } -CWD_API int virtual_mkdir(const char *pathname, mode_t mode) +CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC) { cwd_state new_state; int retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, pathname, NULL); @@ -679,11 +663,10 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode) return retval; } -CWD_API int virtual_rmdir(const char *pathname) +CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC) { cwd_state new_state; int retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, pathname, NULL); @@ -698,11 +681,10 @@ CWD_API int virtual_rmdir(const char *pathname) DIR *opendir(const char *name); #endif -CWD_API DIR *virtual_opendir(const char *pathname) +CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC) { cwd_state new_state; DIR *retval; - TSRMLS_FETCH(); CWD_STATE_COPY(&new_state, &CWDG(cwd)); virtual_file_ex(&new_state, pathname, NULL); @@ -715,13 +697,12 @@ CWD_API DIR *virtual_opendir(const char *pathname) #ifndef TSRM_WIN32 -CWD_API FILE *virtual_popen(const char *command, const char *type) +CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC) { int command_length; char *command_line; char *ptr; FILE *retval; - TSRMLS_FETCH(); command_length = strlen(command); @@ -755,12 +736,11 @@ CWD_API FILE *virtual_popen(const char *command, const char *type) /* On Windows the trick of prepending "cd cwd; " doesn't work so we need to perform a real chdir() and mutex it */ -CWD_API FILE *virtual_popen(const char *command, const char *type) +CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC) { char prev_cwd[MAXPATHLEN]; char *getcwd_result; FILE *retval; - TSRMLS_FETCH(); getcwd_result = getcwd(prev_cwd, MAXPATHLEN); if (!getcwd_result) { |