|
 |
290507 |
diff --git a/src/util/fsspace.c b/src/util/fsspace.c
|
|
|
290507 |
index 50a4aa7..beef3db 100644
|
|
|
290507 |
--- a/src/util/fsspace.c
|
|
|
290507 |
+++ b/src/util/fsspace.c
|
|
|
290507 |
@@ -91,8 +91,15 @@ void fsspace(const char *path, struct fsspace * sp)
|
|
|
290507 |
|
|
|
290507 |
if (statvfs(path, &fsbuf) < 0)
|
|
|
290507 |
msg_fatal("statvfs %s: %m", path);
|
|
|
290507 |
- sp->block_size = fsbuf.f_frsize;
|
|
|
290507 |
- sp->block_free = fsbuf.f_bavail;
|
|
|
290507 |
+ if (fsbuf.f_frsize > 0)
|
|
|
290507 |
+ sp->block_size = fsbuf.f_frsize;
|
|
|
290507 |
+ else
|
|
|
290507 |
+ sp->block_size = fsbuf.f_bsize;
|
|
|
290507 |
+ /* 4G of FS blocks is surely enough space to put a mail in */
|
|
|
290507 |
+ sp->block_free = 0;
|
|
|
290507 |
+ sp->block_free = ~sp->block_free;
|
|
|
290507 |
+ if (fsbuf.f_bavail < sp->block_free)
|
|
|
290507 |
+ sp->block_free = fsbuf.f_bavail;
|
|
|
290507 |
#endif
|
|
|
290507 |
if (msg_verbose)
|
|
|
290507 |
msg_info("%s: %s: block size %lu, blocks free %lu",
|
|
|
290507 |
diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
|
|
|
290507 |
index a8d2571..ad07498 100644
|
|
|
290507 |
--- a/src/util/sys_defs.h
|
|
|
290507 |
+++ b/src/util/sys_defs.h
|
|
|
290507 |
@@ -769,8 +769,8 @@ extern int initgroups(const char *, int);
|
|
|
290507 |
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
|
|
|
290507 |
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
|
|
|
290507 |
#define FIONREAD_IN_TERMIOS_H
|
|
|
290507 |
-#define USE_STATFS
|
|
|
290507 |
-#define STATFS_IN_SYS_VFS_H
|
|
|
290507 |
+#define USE_STATVFS
|
|
|
290507 |
+#define STATVFS_IN_SYS_STATVFS_H
|
|
|
290507 |
#define PREPEND_PLUS_TO_OPTSTRING
|
|
|
290507 |
#define HAS_POSIX_REGEXP
|
|
|
290507 |
#define HAS_DLOPEN
|