From 1d33c27759aadb934dad0836bc31065a6661b14c Mon Sep 17 00:00:00 2001 From: jagapen Date: Wed, 7 Feb 2001 21:30:25 +0000 Subject: [PATCH] Free disk space reporting fixes. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@9039 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSFileManager.m | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f117d9e81..d906e6fc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-02-07 Jonathan Gapen + + * Source/NSFileManager.m: Make disk space report work on FreeBSD. + On all Unix platforms, report disk space available to non-root users. + 2001-02-07 Richard Frith-Macdonald * Source/GSFormat.m: merged in some more fixes by Kai. diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m index 7ec202e15..d4bd49a1c 100644 --- a/Source/NSFileManager.m +++ b/Source/NSFileManager.m @@ -949,7 +949,7 @@ static NSFileManager* defaultManager = nil; return [NSDictionary dictionaryWithObjects: values forKeys: keys count: 5]; #else -#if HAVE_SYS_VFS_H || HAVE_SYS_STATFS_H +#if HAVE_SYS_VFS_H || HAVE_SYS_STATFS_H || HAVE_SYS_MOUNT_H struct stat statbuf; #if HAVE_STATVFS struct statvfs statfsbuf; @@ -980,7 +980,7 @@ static NSFileManager* defaultManager = nil; #endif totalsize = statfsbuf.f_bsize * statfsbuf.f_blocks; - freesize = statfsbuf.f_bsize * statfsbuf.f_bfree; + freesize = statfsbuf.f_bsize * statfsbuf.f_bavail; values[0] = [NSNumber numberWithLongLong: totalsize]; values[1] = [NSNumber numberWithLongLong: freesize];