cvs: php-src(PHP_5_0) /main fopen_wrappers.c main.c php_open_temporary_file.c php_streams.h safe_mode.c

hyanantha Sat Jul 16 08:14:47 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/main fopen_wrappers.c main.c php_open_temporary_file.c php_streams.h safe_mode.c Log: 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 http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.170.2.3&r2=1.170.2.4&ty=u Index: php-src/main/fopen_wrappers.c diff -u php-src/main/fopen_wrappers.c:1.170.2.3 php-src/main/fopen_wrappers.c:1.170.2.4 --- php-src/main/fopen_wrappers.c:1.170.2.3 Wed Jun 22 07:23:35 2005 +++ php-src/main/fopen_wrappers.c Sat Jul 16 08:14:44 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.c,v 1.170.2.3 2005/06/22 11:23:35 hyanantha Exp $ */ +/* $Id: fopen_wrappers.c,v 1.170.2.4 2005/07/16 12:14:44 hyanantha Exp $ */ /* {{{ includes */ @@ -124,7 +124,7 @@ } /* 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) { http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.20&r2=1.604.2.21&ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.604.2.20 php-src/main/main.c:1.604.2.21 --- php-src/main/main.c:1.604.2.20 Tue Jul 5 10:14:03 2005 +++ php-src/main/main.c Sat Jul 16 08:14:44 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.604.2.20 2005/07/05 14:14:03 dmitry Exp $ */ +/* $Id: main.c,v 1.604.2.21 2005/07/16 12:14:44 hyanantha Exp $ */ /* {{{ includes */ @@ -222,7 +222,7 @@ # 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 http://cvs.php.net/diff.php/php-src/main/php_open_temporary_file.c?r1=1.30.2.3&r2=1.30.2.4&ty=u Index: php-src/main/php_open_temporary_file.c diff -u php-src/main/php_open_temporary_file.c:1.30.2.3 php-src/main/php_open_temporary_file.c:1.30.2.4 --- php-src/main/php_open_temporary_file.c:1.30.2.3 Tue Jun 28 11:27:49 2005 +++ php-src/main/php_open_temporary_file.c Sat Jul 16 08:14:45 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_open_temporary_file.c,v 1.30.2.3 2005/06/28 15:27:49 hyanantha Exp $ */ +/* $Id: php_open_temporary_file.c,v 1.30.2.4 2005/07/16 12:14:45 hyanantha Exp $ */ #include "php.h" @@ -107,10 +107,6 @@ #endif ; #endif -#ifdef NETWARE - char *file_path = NULL; -#endif - if (!path) { return -1; } http://cvs.php.net/diff.php/php-src/main/php_streams.h?r1=1.95.2.4&r2=1.95.2.5&ty=u Index: php-src/main/php_streams.h diff -u php-src/main/php_streams.h:1.95.2.4 php-src/main/php_streams.h:1.95.2.5 --- php-src/main/php_streams.h:1.95.2.4 Mon May 16 04:37:41 2005 +++ php-src/main/php_streams.h Sat Jul 16 08:14:45 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_streams.h,v 1.95.2.4 2005/05/16 08:37:41 tony2001 Exp $ */ +/* $Id: php_streams.h,v 1.95.2.5 2005/07/16 12:14:45 hyanantha Exp $ */ #ifndef PHP_STREAMS_H #define PHP_STREAMS_H @@ -103,11 +103,7 @@ #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; http://cvs.php.net/diff.php/php-src/main/safe_mode.c?r1=1.58.2.1&r2=1.58.2.2&ty=u Index: php-src/main/safe_mode.c diff -u php-src/main/safe_mode.c:1.58.2.1 php-src/main/safe_mode.c:1.58.2.2 --- php-src/main/safe_mode.c:1.58.2.1 Wed Dec 1 17:37:47 2004 +++ php-src/main/safe_mode.c Sat Jul 16 08:14:45 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: safe_mode.c,v 1.58.2.1 2004/12/01 22:37:47 sesser Exp $ */ +/* $Id: safe_mode.c,v 1.58.2.2 2005/07/16 12:14:45 hyanantha Exp $ */ #include "php.h" @@ -190,7 +190,12 @@ } 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()