diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-02-25 01:44:57 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-02-25 01:44:57 +0000 |
| commit | 5e118977cdc1b92bbafb93674aa44a1823f1dcc0 (patch) | |
| tree | 17cf41395f1ed131885647bec9949f11b6d9083d /main/streams/plain_wrapper.c | |
| parent | 9e0fb1a33cf3e2069a63082ca14e0975b302fc13 (diff) | |
| download | php-git-5e118977cdc1b92bbafb93674aa44a1823f1dcc0.tar.gz | |
Fixed various compiler warnings.
Diffstat (limited to 'main/streams/plain_wrapper.c')
| -rw-r--r-- | main/streams/plain_wrapper.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 0d7d1bba21..f73c2642aa 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -29,6 +29,9 @@ #if HAVE_SYS_WAIT_H #include <sys/wait.h> #endif +#if HAVE_SYS_FILE_H +#include <sys/file.h> +#endif #include "php_streams_int.h" @@ -631,7 +634,7 @@ static php_stream *php_plain_files_dir_opener(php_stream_wrapper *wrapper, char DIR *dir = NULL; php_stream *stream = NULL; - if ((options & STREAM_DISABLE_OPEN_BASEDIR == 0) && php_check_open_basedir(path TSRMLS_CC)) { + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path TSRMLS_CC)) { return NULL; } @@ -665,7 +668,7 @@ static php_stream *php_plain_files_stream_opener(php_stream_wrapper *wrapper, ch return php_stream_fopen_with_path_rel(path, mode, PG(include_path), opened_path, options); } - if ((options & STREAM_DISABLE_OPEN_BASEDIR == 0) && php_check_open_basedir(path TSRMLS_CC)) { + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path TSRMLS_CC)) { return NULL; } @@ -730,7 +733,7 @@ PHPAPI php_stream *_php_stream_fopen_with_path(char *filename, char *mode, char } - if ((options & STREAM_DISABLE_OPEN_BASEDIR == 0) && php_check_open_basedir(filename TSRMLS_CC)) { + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(filename TSRMLS_CC)) { return NULL; } @@ -750,7 +753,7 @@ not_relative_path: /* Absolute path open */ if (IS_ABSOLUTE_PATH(filename, filename_length)) { - if ((options & STREAM_DISABLE_OPEN_BASEDIR == 0) && php_check_open_basedir(filename TSRMLS_CC)) { + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(filename TSRMLS_CC)) { return NULL; } @@ -776,7 +779,7 @@ not_relative_path: free(cwd); - if ((options & STREAM_DISABLE_OPEN_BASEDIR == 0) && php_check_open_basedir(trypath TSRMLS_CC)) { + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(trypath TSRMLS_CC)) { return NULL; } if ((php_check_safe_mode_include_dir(trypath TSRMLS_CC)) == 0) { @@ -792,7 +795,7 @@ not_relative_path: if (!path || (path && !*path)) { - if ((options & STREAM_DISABLE_OPEN_BASEDIR == 0) && php_check_open_basedir(path TSRMLS_CC)) { + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path TSRMLS_CC)) { return NULL; } @@ -837,7 +840,7 @@ not_relative_path: } snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename); - if ((options & STREAM_DISABLE_OPEN_BASEDIR == 0) && php_check_open_basedir(trypath TSRMLS_CC)) { + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(trypath TSRMLS_CC)) { stream = NULL; goto stream_done; } |