hyanantha Fri Jul 15 05:29:21 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard file.h filestat.c link.c pageinfo.c syslog.c
Log:
ext/standard/file.h NetWare LibC has fnmatch and realpath implemented.
ext/standard/filestat.c Removing redundant CLIB_STAT_PATCH and fixing some
NetWare specific stat structure.
ext/standard/link.c Removing redundant CLIB_STAT_PATCH.
ext/standard/pageinfo.c Removing redundant CLIB_STAT_PATCH and fixing some
NetWare specific stat structure.
ext/standard/syslog.c Except LOG_SYSLOG NetWare LibC has other macros defined.
-- Kamesh
http://cvs.php.net/diff.php/php-src/ext/standard/file.h?r1=1.90&r2=1.90.2.1&ty=u
Index: php-src/ext/standard/file.h
diff -u php-src/ext/standard/file.h:1.90 php-src/ext/standard/file.h:1.90.2.1
--- php-src/ext/standard/file.h:1.90 Mon Jun 21 17:08:05 2004
+++ php-src/ext/standard/file.h Fri Jul 15 05:29:18 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.h,v 1.90 2004/06/21 21:08:05 pollita Exp $ */
+/* $Id: file.h,v 1.90.2.1 2005/07/15 09:29:18 hyanantha Exp $ */
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
@@ -59,7 +59,7 @@
PHP_FUNCTION(flock);
PHP_FUNCTION(fd_set);
PHP_FUNCTION(fd_isset);
-#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
+#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS)
PHP_FUNCTION(realpath);
PHP_FUNCTION(fnmatch);
#endif
http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.130.2.3&r2=1.130.2.4&ty=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.130.2.3
php-src/ext/standard/filestat.c:1.130.2.4
--- php-src/ext/standard/filestat.c:1.130.2.3 Tue Jun 28 11:14:22 2005
+++ php-src/ext/standard/filestat.c Fri Jul 15 05:29:18 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.130.2.3 2005/06/28 15:14:22 hyanantha Exp $ */
+/* $Id: filestat.c,v 1.130.2.4 2005/07/15 09:29:18 hyanantha Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -464,11 +464,7 @@
{
pval **filename, **filetime, **fileatime;
int ret;
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- struct stat_libc sb;
-#else
struct stat sb;
-#endif
FILE *file;
struct utimbuf newtimebuf;
struct utimbuf *newtime = NULL;
@@ -550,11 +546,7 @@
{
zval *stat_dev, *stat_ino, *stat_mode, *stat_nlink, *stat_uid,
*stat_gid, *stat_rdev,
*stat_size, *stat_atime, *stat_mtime, *stat_ctime,
*stat_blksize, *stat_blocks;
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- struct stat_libc *stat_sb;
-#else
struct stat *stat_sb;
-#endif
php_stream_statbuf ssb;
int flags = 0, rmask=S_IROTH, wmask=S_IWOTH, xmask=S_IXOTH; /* access
rights defaults to other */
char *stat_sb_names[13]={"dev", "ino", "mode", "nlink", "uid", "gid",
"rdev",
@@ -644,19 +636,19 @@
RETURN_LONG((long)ssb.sb.st_gid);
case FS_ATIME:
#ifdef NETWARE
- RETURN_LONG((long)((stat_sb->st_atime).tv_sec));
+ RETURN_LONG((long)ssb.sb.st_atime.tv_sec);
#else
RETURN_LONG((long)ssb.sb.st_atime);
#endif
case FS_MTIME:
#ifdef NETWARE
- RETURN_LONG((long)((stat_sb->st_mtime).tv_sec));
+ RETURN_LONG((long)ssb.sb.st_mtime.tv_sec);
#else
RETURN_LONG((long)ssb.sb.st_mtime);
#endif
case FS_CTIME:
#ifdef NETWARE
- RETURN_LONG((long)((stat_sb->st_ctime).tv_sec));
+ RETURN_LONG((long)ssb.sb.st_ctime.tv_sec);
#else
RETURN_LONG((long)ssb.sb.st_ctime);
#endif
http://cvs.php.net/diff.php/php-src/ext/standard/link.c?r1=1.48.2.2&r2=1.48.2.3&ty=u
Index: php-src/ext/standard/link.c
diff -u php-src/ext/standard/link.c:1.48.2.2
php-src/ext/standard/link.c:1.48.2.3
--- php-src/ext/standard/link.c:1.48.2.2 Fri Mar 11 03:51:08 2005
+++ php-src/ext/standard/link.c Fri Jul 15 05:29:19 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: link.c,v 1.48.2.2 2005/03/11 08:51:08 hyanantha Exp $ */
+/* $Id: link.c,v 1.48.2.3 2005/07/15 09:29:19 hyanantha Exp $ */
#include "php.h"
#include "php_filestat.h"
@@ -89,11 +89,7 @@
PHP_FUNCTION(linkinfo)
{
zval **filename;
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- struct stat_libc sb;
-#else
struct stat sb;
-#endif
int ret;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) ==
FAILURE) {
http://cvs.php.net/diff.php/php-src/ext/standard/pageinfo.c?r1=1.37.2.1&r2=1.37.2.2&ty=u
Index: php-src/ext/standard/pageinfo.c
diff -u php-src/ext/standard/pageinfo.c:1.37.2.1
php-src/ext/standard/pageinfo.c:1.37.2.2
--- php-src/ext/standard/pageinfo.c:1.37.2.1 Thu Mar 10 07:26:14 2005
+++ php-src/ext/standard/pageinfo.c Fri Jul 15 05:29:19 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pageinfo.c,v 1.37.2.1 2005/03/10 12:26:14 hyanantha Exp $ */
+/* $Id: pageinfo.c,v 1.37.2.2 2005/07/15 09:29:19 hyanantha Exp $ */
#include "php.h"
#include "pageinfo.h"
@@ -59,11 +59,7 @@
*/
PHPAPI void php_statpage(TSRMLS_D)
{
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- struct stat_libc *pstat;
-#else
struct stat *pstat;
-#endif
pstat = sapi_get_stat(TSRMLS_C);
@@ -73,7 +69,7 @@
BG(page_gid) = pstat->st_gid;
BG(page_inode) = pstat->st_ino;
#ifdef NETWARE
- BG(page_mtime) = (pstat->st_mtime).tv_nsec;
+ BG(page_mtime) = (pstat->st_mtime).tv_sec;
#else
BG(page_mtime) = pstat->st_mtime;
#endif
http://cvs.php.net/diff.php/php-src/ext/standard/syslog.c?r1=1.46.2.1&r2=1.46.2.2&ty=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.46.2.1
php-src/ext/standard/syslog.c:1.46.2.2
--- php-src/ext/standard/syslog.c:1.46.2.1 Fri Jul 30 10:39:18 2004
+++ php-src/ext/standard/syslog.c Fri Jul 15 05:29:19 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: syslog.c,v 1.46.2.1 2004/07/30 14:39:18 wez Exp $ */
+/* $Id: syslog.c,v 1.46.2.2 2005/07/15 09:29:19 hyanantha Exp $ */
#include "php.h"
@@ -75,7 +75,7 @@
/* AIX doesn't have LOG_AUTHPRIV */
REGISTER_LONG_CONSTANT("LOG_AUTHPRIV", LOG_AUTHPRIV, CONST_CS |
CONST_PERSISTENT);
#endif
-#if !defined(PHP_WIN32) && !defined(NETWARE)
+#ifndef PHP_WIN32
REGISTER_LONG_CONSTANT("LOG_LOCAL0", LOG_LOCAL0, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("LOG_LOCAL1", LOG_LOCAL1, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("LOG_LOCAL2", LOG_LOCAL2, CONST_CS |
CONST_PERSISTENT);
@@ -144,7 +144,9 @@
SET_VAR_LONG("LOG_MAIL", LOG_MAIL); /* log to email */
SET_VAR_LONG("LOG_DAEMON", LOG_DAEMON); /* other system daemons */
SET_VAR_LONG("LOG_AUTH", LOG_AUTH);
+#ifndef NETWARE
SET_VAR_LONG("LOG_SYSLOG", LOG_SYSLOG);
+#endif
SET_VAR_LONG("LOG_LPR", LOG_LPR);
#ifdef LOG_NEWS
/* No LOG_NEWS on HP-UX */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
