cvs: /php3 ChangeLog /php3/functions filestat.c

thies Tue Aug 17 07:22:04 1999 EDT Modified files: /php3 ChangeLog /php3/functions filestat.c Log: fix for #2076 Index: php3/ChangeLog diff -u php3/ChangeLog:1.740 php3/ChangeLog:1.741 --- php3/ChangeLog:1.740 Tue Aug 17 05:53:14 1999 +++ php3/ChangeLog Tue Aug 17 07:22:03 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???? ??, 1999, Version 3.0.13 +- diskfreespace() fix (Thies) - pdflib 2.01 support (Uwe Steinmann) - fixed mem-leak in sysv-shm (Thies) - Add IMSP module (Chuck Hagenbuch) Index: php3/functions/filestat.c diff -u php3/functions/filestat.c:1.91 php3/functions/filestat.c:1.92 --- php3/functions/filestat.c:1.91 Sat Jul 3 01:40:20 1999 +++ php3/functions/filestat.c Tue Aug 17 07:22:04 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.91 1999/07/03 05:40:20 bjh Exp $ */ +/* $Id: filestat.c,v 1.92 1999/08/17 11:22:04 thies Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -213,7 +213,11 @@ #else /* WINDOWS, OS/2 */ #if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS) if (statvfs(path->value.str.val,&buf)) RETURN_FALSE; - bytesfree = (((double)buf.f_bavail) * ((double)buf.f_frsize)); + if (buf.f_frsize) { + bytesfree = (((double)buf.f_bavail) * ((double)buf.f_frsize)); + } else { + bytesfree = (((double)buf.f_bavail) * ((double)buf.f_bsize)); + } #elif defined(HAVE_SYS_STATFS_H) && defined(HAVE_STATFS) if (statfs(path->value.str.val,&buf)) RETURN_FALSE; bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bavail));