cvs: php4 /main/streams plain_wrapper.c

iliaa Mon Feb 24 20:44:57 2003 EDT Modified files: /php4/main/streams plain_wrapper.c Log: Fixed various compiler warnings. Index: php4/main/streams/plain_wrapper.c diff -u php4/main/streams/plain_wrapper.c:1.5 php4/main/streams/plain_wrapper.c:1.6 --- php4/main/streams/plain_wrapper.c:1.5 Mon Feb 24 20:41:58 2003 +++ php4/main/streams/plain_wrapper.c Mon Feb 24 20:44:57 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: plain_wrapper.c,v 1.5 2003/02/25 01:41:58 iliaa Exp $ */ +/* $Id: plain_wrapper.c,v 1.6 2003/02/25 01:44:57 iliaa Exp $ */ #include "php.h" #include "php_globals.h" @@ -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 @@ 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 @@ 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 @@ } - 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 @@ /* 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 @@ 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 @@ 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 @@ } 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; }