[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard filestat.c

[Anantha Kesari H Y]

hyanantha               Fri Mar 11 06:20:25 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/standard       filestat.c 
  Log:
  removing redundant NEW_LIBC checks
  In NetWare statfs f_bavail member is known as f_bfree 
  NetWare LibC has pwd.h
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.130.2.1&r2=1.130.2.2&ty=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.130.2.1 
php-src/ext/standard/filestat.c:1.130.2.2
--- php-src/ext/standard/filestat.c:1.130.2.1   Thu Sep  2 05:44:59 2004
+++ php-src/ext/standard/filestat.c     Fri Mar 11 06:20:24 2005
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: filestat.c,v 1.130.2.1 2004/09/02 09:44:59 stas Exp $ */
+/* $Id: filestat.c,v 1.130.2.2 2005/03/11 11:20:24 hyanantha Exp $ */
 
 #include "php.h"
 #include "safe_mode.h"
@@ -58,8 +58,6 @@
 #if HAVE_PWD_H
 # ifdef PHP_WIN32
 #  include "win32/pwd.h"
-# elif defined(NETWARE)
-#  include "netware/pwd.h"
 # else
 #  include <pwd.h>
 # endif
@@ -313,8 +311,12 @@
        }
 #elif (defined(HAVE_SYS_STATFS_H) || defined(HAVE_SYS_MOUNT_H)) && 
defined(HAVE_STATFS)
        if (statfs(Z_STRVAL_PP(path), &buf)) RETURN_FALSE;
+#ifdef NETWARE
+       bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bfree));
+#else
        bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bavail));
 #endif
+#endif
 #endif /* WINDOWS */
 
        RETURN_DOUBLE(bytesfree);
@@ -645,19 +647,19 @@
        case FS_GROUP:
                RETURN_LONG((long)ssb.sb.st_gid);
        case FS_ATIME:
-#if defined(NETWARE) && defined(NEW_LIBC)
+#ifdef NETWARE
                RETURN_LONG((long)((stat_sb->st_atime).tv_sec));
 #else
                RETURN_LONG((long)ssb.sb.st_atime);
 #endif
        case FS_MTIME:
-#if defined(NETWARE) && defined(NEW_LIBC)
+#ifdef NETWARE
                RETURN_LONG((long)((stat_sb->st_mtime).tv_sec));
 #else
                RETURN_LONG((long)ssb.sb.st_mtime);
 #endif
        case FS_CTIME:
-#if defined(NETWARE) && defined(NEW_LIBC)
+#ifdef NETWARE
                RETURN_LONG((long)((stat_sb->st_ctime).tv_sec));
 #else
                RETURN_LONG((long)ssb.sb.st_ctime);
@@ -709,7 +711,7 @@
                MAKE_LONG_ZVAL_INCREF(stat_rdev, -1); 
 #endif
                MAKE_LONG_ZVAL_INCREF(stat_size, stat_sb->st_size);
-#if defined(NETWARE) && defined(NEW_LIBC)
+#ifdef NETWARE
                MAKE_LONG_ZVAL_INCREF(stat_atime, (stat_sb->st_atime).tv_sec);
                MAKE_LONG_ZVAL_INCREF(stat_mtime, (stat_sb->st_mtime).tv_sec);
                MAKE_LONG_ZVAL_INCREF(stat_ctime, (stat_sb->st_ctime).tv_sec);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php