diff options
| author | James Clarke <jrtc27@jrtc27.com> | 2017-10-07 18:53:20 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-10-30 15:30:59 +0100 |
| commit | d1535216ca27047e3962d61b975bd2a638aa45a2 (patch) | |
| tree | 05a51eabd29d6db7c0885e798c05d43195f186ac /coreutils/df.c | |
| parent | 24e17b43858e165ba8384e2aa7403cecd899ad2d (diff) | |
| download | busybox-w32-d1535216ca27047e3962d61b975bd2a638aa45a2.tar.gz busybox-w32-d1535216ca27047e3962d61b975bd2a638aa45a2.tar.bz2 busybox-w32-d1535216ca27047e3962d61b975bd2a638aa45a2.zip | |
df: Use statvfs instead of non-standard statfs
Platforms differ on what their implementations of statfs include.
Importantly, FreeBSD's does not include a f_frsize member inside struct
statfs. However, statvfs is specified by POSIX and includes everything
we need, so we can just use that instead.
Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/df.c')
| -rw-r--r-- | coreutils/df.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coreutils/df.c b/coreutils/df.c index 121da970b..4076b5fec 100644 --- a/coreutils/df.c +++ b/coreutils/df.c | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | //usage: "/dev/sda3 17381728 17107080 274648 98% /\n" | 77 | //usage: "/dev/sda3 17381728 17107080 274648 98% /\n" |
| 78 | 78 | ||
| 79 | #include <mntent.h> | 79 | #include <mntent.h> |
| 80 | #include <sys/vfs.h> | 80 | #include <sys/statvfs.h> |
| 81 | #include "libbb.h" | 81 | #include "libbb.h" |
| 82 | #include "unicode.h" | 82 | #include "unicode.h" |
| 83 | 83 | ||
| @@ -98,7 +98,7 @@ int df_main(int argc UNUSED_PARAM, char **argv) | |||
| 98 | unsigned opt; | 98 | unsigned opt; |
| 99 | FILE *mount_table; | 99 | FILE *mount_table; |
| 100 | struct mntent *mount_entry; | 100 | struct mntent *mount_entry; |
| 101 | struct statfs s; | 101 | struct statvfs s; |
| 102 | 102 | ||
| 103 | enum { | 103 | enum { |
| 104 | OPT_KILO = (1 << 0), | 104 | OPT_KILO = (1 << 0), |
| @@ -211,7 +211,7 @@ int df_main(int argc UNUSED_PARAM, char **argv) | |||
| 211 | mount_point = mount_entry->mnt_dir; | 211 | mount_point = mount_entry->mnt_dir; |
| 212 | fs_type = mount_entry->mnt_type; | 212 | fs_type = mount_entry->mnt_type; |
| 213 | 213 | ||
| 214 | if (statfs(mount_point, &s) != 0) { | 214 | if (statvfs(mount_point, &s) != 0) { |
| 215 | bb_simple_perror_msg(mount_point); | 215 | bb_simple_perror_msg(mount_point); |
| 216 | goto set_error; | 216 | goto set_error; |
| 217 | } | 217 | } |