diff options
| author | Anantha Kesari H Y <hyanantha@php.net> | 2005-07-16 12:14:45 +0000 |
|---|---|---|
| committer | Anantha Kesari H Y <hyanantha@php.net> | 2005-07-16 12:14:45 +0000 |
| commit | 41ce6784688b36d0f239c49c97a46498c147a748 (patch) | |
| tree | 66c729fa48d5be23763d52c469d2fab48a6fcb0a | |
| parent | 05b895cd3915063084e789f7bc67e845977daead (diff) | |
| download | php-git-41ce6784688b36d0f239c49c97a46498c147a748.tar.gz | |
main/fopen_wrappers.c
NetWare file names are case insensitive
main/main.c
NetWare has no sendmail binary. It uses the smart host mailing code avaiolable in php distro. Could not find a better place to put this than main/main.c.
main/php_open_temporary_file.c,v
Removed the unused variable in NetWare block.
main/php_streams.h
Removing the redundant CLIB_STAT_PATCH
main/safe_mode.c
NetWare has no uid.
-- Kamesh
| -rw-r--r-- | main/fopen_wrappers.c | 2 | ||||
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/php_open_temporary_file.c | 4 | ||||
| -rwxr-xr-x | main/php_streams.h | 4 | ||||
| -rw-r--r-- | main/safe_mode.c | 5 |
5 files changed, 7 insertions, 10 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index a60016942b..a31a63472d 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -124,7 +124,7 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path } /* Check the path */ -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || defined(NETWARE) if (strncasecmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) { #else if (strncmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) { diff --git a/main/main.c b/main/main.c index 86369c4efa..8b1bd3e5fc 100644 --- a/main/main.c +++ b/main/main.c @@ -222,7 +222,7 @@ static PHP_INI_MH(OnUpdateTimeout) # define PHP_SAFE_MODE_EXEC_DIR "" #endif -#ifdef PHP_PROG_SENDMAIL +#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE) # define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i " #else # define DEFAULT_SENDMAIL_PATH NULL diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c index e9c4a0549e..0134623b14 100644 --- a/main/php_open_temporary_file.c +++ b/main/php_open_temporary_file.c @@ -107,10 +107,6 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char ** #endif ; #endif -#ifdef NETWARE - char *file_path = NULL; -#endif - if (!path) { return -1; } diff --git a/main/php_streams.h b/main/php_streams.h index f6ab2d4857..fdf5a1fe61 100755 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -103,11 +103,7 @@ typedef struct _php_stream_filter php_stream_filter; #include "streams/php_stream_filter_api.h" typedef struct _php_stream_statbuf { -#if defined(NETWARE) && defined(CLIB_STAT_PATCH) - struct stat_libc sb; /* regular info */ -#else struct stat sb; /* regular info */ -#endif /* extended info to go here some day: content-type etc. etc. */ } php_stream_statbuf; diff --git a/main/safe_mode.c b/main/safe_mode.c index 12403077d4..dac3ad4526 100644 --- a/main/safe_mode.c +++ b/main/safe_mode.c @@ -190,7 +190,12 @@ PHPAPI int php_checkuid_ex(const char *filename, char *fopen_mode, int mode, int } PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode) { +#ifdef NETWARE + /* NetWare don't have uid*/ + return 1; +#else return php_checkuid_ex(filename, fopen_mode, mode, 0); +#endif } PHPAPI char *php_get_current_user() |