hyanantha Thu Oct 24 07:30:10 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/main safe_mode.c Log: NetWare related changes/modifications. Index: php4/main/safe_mode.c diff -u php4/main/safe_mode.c:1.42.2.2 php4/main/safe_mode.c:1.42.2.3 --- php4/main/safe_mode.c:1.42.2.2 Wed Mar 20 04:02:54 2002 +++ php4/main/safe_mode.c Thu Oct 24 07:30:10 2002 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: safe_mode.c,v 1.42.2.2 2002/03/20 09:02:54 sesser Exp $ */ +/* $Id: safe_mode.c,v 1.42.2.3 2002/10/24 11:30:10 hyanantha Exp $ */ #include "php.h" @@ -45,7 +45,11 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode) { +#if (defined(NETWARE) && defined(CLIB_STAT_PATCH)) + struct stat_libc sb; +#else struct stat sb; +#endif int ret, nofile=0; long uid=0L, gid=0L, duid=0L, dgid=0L; char path[MAXPATHLEN]; @@ -170,7 +174,11 @@ PHPAPI char *php_get_current_user() { struct passwd *pwd; +#if (defined(NETWARE) && defined(CLIB_STAT_PATCH)) + struct stat_libc *pstat; +#else struct stat *pstat; +#endif TSRMLS_FETCH(); if (SG(request_info).current_user) { @@ -181,7 +189,11 @@ USE_SAPI is defined, because cgi will also be interfaced in USE_SAPI */ +#if (defined(NETWARE) && defined(CLIB_STAT_PATCH)) + pstat = (struct stat_libc *)sapi_get_stat(TSRMLS_C); +#else pstat = sapi_get_stat(TSRMLS_C); +#endif if (!pstat) { return empty_string;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php