You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.3 KiB
38 lines
1.3 KiB
3 years ago
|
diff --git a/src/util/fsspace.c b/src/util/fsspace.c
|
||
|
|
index 50a4aa7..beef3db 100644
|
||
|
|
--- a/src/util/fsspace.c
|
||
|
|
+++ b/src/util/fsspace.c
|
||
|
|
@@ -91,8 +91,15 @@ void fsspace(const char *path, struct fsspace * sp)
|
||
|
|
|
||
|
|
if (statvfs(path, &fsbuf) < 0)
|
||
|
|
msg_fatal("statvfs %s: %m", path);
|
||
|
|
- sp->block_size = fsbuf.f_frsize;
|
||
|
|
- sp->block_free = fsbuf.f_bavail;
|
||
|
|
+ if (fsbuf.f_frsize > 0)
|
||
|
|
+ sp->block_size = fsbuf.f_frsize;
|
||
|
|
+ else
|
||
|
|
+ sp->block_size = fsbuf.f_bsize;
|
||
|
|
+ /* 4G of FS blocks is surely enough space to put a mail in */
|
||
|
|
+ sp->block_free = 0;
|
||
|
|
+ sp->block_free = ~sp->block_free;
|
||
|
|
+ if (fsbuf.f_bavail < sp->block_free)
|
||
|
|
+ sp->block_free = fsbuf.f_bavail;
|
||
|
|
#endif
|
||
|
|
if (msg_verbose)
|
||
|
|
msg_info("%s: %s: block size %lu, blocks free %lu",
|
||
|
|
diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
|
||
|
|
index a8d2571..ad07498 100644
|
||
|
|
--- a/src/util/sys_defs.h
|
||
|
|
+++ b/src/util/sys_defs.h
|
||
|
|
@@ -769,8 +769,8 @@ extern int initgroups(const char *, int);
|
||
|
|
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
|
||
|
|
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
|
||
|
|
#define FIONREAD_IN_TERMIOS_H
|
||
|
|
-#define USE_STATFS
|
||
|
|
-#define STATFS_IN_SYS_VFS_H
|
||
|
|
+#define USE_STATVFS
|
||
|
|
+#define STATVFS_IN_SYS_STATVFS_H
|
||
|
|
#define PREPEND_PLUS_TO_OPTSTRING
|
||
|
|
#define HAS_POSIX_REGEXP
|
||
|
|
#define HAS_DLOPEN
|