*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-
-/* BB_AUDIT SUSv3 _NOT_ compliant -- option -t missing. */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/df.html */
-
/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
*
* Size reduction. Removed floating point dependency. Added error checking
*
* Implement -P and -B; better coreutils compat; cleanup
*/
+//config:config DF
+//config: bool "df (6.8 kb)"
+//config: default y
+//config: help
+//config: df reports the amount of disk space used and available
+//config: on filesystems.
+//config:
+//config:config FEATURE_DF_FANCY
+//config: bool "Enable -a, -i, -B"
+//config: default y
+//config: depends on DF
+//config: help
+//config: -a Show all filesystems
+//config: -i Inodes
+//config: -B <SIZE> Blocksize
+
+//applet:IF_DF(APPLET_NOEXEC(df, df, BB_DIR_BIN, BB_SUID_DROP, df))
+
+//kbuild:lib-$(CONFIG_DF) += df.o
+
+/* BB_AUDIT SUSv3 _NOT_ compliant -- option -t missing. */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/df.html */
//usage:#define df_trivial_usage
//usage: "[-Pk"
//usage: IF_FEATURE_HUMAN_READABLE("mh")
+//usage: "T"
//usage: IF_FEATURE_DF_FANCY("ai] [-B SIZE")
//usage: "] [FILESYSTEM]..."
//usage:#define df_full_usage "\n\n"
//usage: "\n -m 1M-byte blocks"
//usage: "\n -h Human readable (e.g. 1K 243M 2G)"
//usage: )
+//usage: "\n -T Print filesystem type"
//usage: IF_FEATURE_DF_FANCY(
//usage: "\n -a Show all filesystems"
//usage: "\n -i Inodes"
//usage: "/dev/sda3 17381728 17107080 274648 98% /\n"
#include <mntent.h>
-#include <sys/vfs.h>
+#include <sys/statvfs.h>
#include "libbb.h"
#include "unicode.h"
int df_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int df_main(int argc UNUSED_PARAM, char **argv)
{
- unsigned long blocks_used;
- unsigned blocks_percent_used;
unsigned long df_disp_hr = 1024;
int status = EXIT_SUCCESS;
unsigned opt;
FILE *mount_table;
struct mntent *mount_entry;
- struct statfs s;
+ struct statvfs s;
enum {
OPT_KILO = (1 << 0),
OPT_POSIX = (1 << 1),
- OPT_ALL = (1 << 2) * ENABLE_FEATURE_DF_FANCY,
- OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
- OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
- OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
- OPT_MEGA = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+ OPT_FSTYPE = (1 << 2),
+ OPT_ALL = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
+ OPT_INODE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
+ OPT_BSIZE = (1 << 5) * ENABLE_FEATURE_DF_FANCY,
+ OPT_HUMAN = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+ OPT_MEGA = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
};
const char *disp_units_hdr = NULL;
char *chp;
init_unicode();
+ opt = getopt32(argv, "^"
+ "kPT"
+ IF_FEATURE_DF_FANCY("aiB:")
+ IF_FEATURE_HUMAN_READABLE("hm")
+ "\0"
#if ENABLE_FEATURE_HUMAN_READABLE && ENABLE_FEATURE_DF_FANCY
- opt_complementary = "k-mB:m-Bk:B-km";
+ "k-mB:m-Bk:B-km"
#elif ENABLE_FEATURE_HUMAN_READABLE
- opt_complementary = "k-m:m-k";
+ "k-m:m-k"
#endif
- opt = getopt32(argv, "kP"
- IF_FEATURE_DF_FANCY("aiB:")
- IF_FEATURE_HUMAN_READABLE("hm")
- IF_FEATURE_DF_FANCY(, &chp));
+ IF_FEATURE_DF_FANCY(, &chp)
+ );
if (opt & OPT_MEGA)
df_disp_hr = 1024*1024;
- if (opt & OPT_BSIZE)
- df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */
+ if (opt & OPT_BSIZE) {
+ /* GNU coreutils 8.25 accepts "-BMiB" form too */
+ int i;
+ for (i = 0; kmg_i_suffixes[i].suffix[0]; i++) {
+ if (strcmp(kmg_i_suffixes[i].suffix, chp) == 0) {
+ df_disp_hr = kmg_i_suffixes[i].mult;
+ goto got_it;
+ }
+ }
+ /* Range used to disallow 0 */
+ df_disp_hr = xatoul_range_sfx(chp, 1, ULONG_MAX, kmg_i_suffixes);
+ got_it: ;
+ }
/* From the manpage of df from coreutils-6.10:
- Disk space is shown in 1K blocks by default, unless the environment
- variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
- */
+ * Disk space is shown in 1K blocks by default, unless the environment
+ * variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
+ */
if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
df_disp_hr = 512;
disp_units_hdr = xasprintf("%lu-blocks", df_disp_hr);
#endif
}
- printf("Filesystem %-15sUsed Available %s Mounted on\n",
- disp_units_hdr, (opt & OPT_POSIX) ? "Capacity" : "Use%");
+
+ printf("Filesystem %s%-15sUsed Available %s Mounted on\n",
+ (opt & OPT_FSTYPE) ? "Type " : "",
+ disp_units_hdr,
+ (opt & OPT_POSIX) ? "Capacity" : "Use%");
mount_table = NULL;
argv += optind;
if (!argv[0]) {
mount_table = setmntent(bb_path_mtab_file, "r");
if (!mount_table)
- bb_perror_msg_and_die(bb_path_mtab_file);
+ bb_simple_perror_msg_and_die(bb_path_mtab_file);
}
while (1) {
const char *device;
const char *mount_point;
+ const char *fs_type;
if (mount_table) {
mount_entry = getmntent(mount_table);
}
device = mount_entry->mnt_fsname;
+
+ /* GNU coreutils 6.10 skips certain mounts, try to be compatible */
+ if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0)
+ continue;
+
mount_point = mount_entry->mnt_dir;
+ fs_type = mount_entry->mnt_type;
- if (statfs(mount_point, &s) != 0) {
+ if (statvfs(mount_point, &s) != 0) {
bb_simple_perror_msg(mount_point);
goto set_error;
}
+ /* Some uclibc versions were seen to lose f_frsize
+ * (kernel does return it, but then uclibc does not copy it)
+ */
+ if (s.f_frsize == 0)
+ s.f_frsize = s.f_bsize;
if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) {
+ unsigned long long blocks_used;
+ unsigned long long blocks_total;
+ unsigned blocks_percent_used;
+
if (opt & OPT_INODE) {
s.f_blocks = s.f_files;
s.f_bavail = s.f_bfree = s.f_ffree;
- s.f_bsize = 1;
-
+ s.f_frsize = 1;
if (df_disp_hr)
df_disp_hr = 1;
}
blocks_used = s.f_blocks - s.f_bfree;
- blocks_percent_used = 0;
- if (blocks_used + s.f_bavail) {
- blocks_percent_used = (blocks_used * 100ULL
- + (blocks_used + s.f_bavail)/2
- ) / (blocks_used + s.f_bavail);
+ blocks_total = blocks_used + s.f_bavail;
+ blocks_percent_used = blocks_total; /* 0% if blocks_total == 0, else... */
+ if (blocks_total != 0) {
+ /* Downscale sizes for narrower division */
+ unsigned u;
+ while (blocks_total >= INT_MAX / 101) {
+ blocks_total >>= 1;
+ blocks_used >>= 1;
+ }
+ u = (unsigned)blocks_used * 100u + (unsigned)blocks_total / 2;
+ blocks_percent_used = u / (unsigned)blocks_total;
}
- /* GNU coreutils 6.10 skips certain mounts, try to be compatible. */
- if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0)
- continue;
-
#ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
if (strcmp(device, "/dev/root") == 0) {
/* Adjusts device to be the real root device,
printf("%s%*s", uni_dev, 20 - (int)uni_stat.unicode_width, "");
}
free(uni_dev);
+ if (opt & OPT_FSTYPE) {
+ char *uni_type = unicode_conv_to_printable(&uni_stat, fs_type);
+ if (uni_stat.unicode_width > 10 && !(opt & OPT_POSIX))
+ printf(" %s\n%31s", uni_type, "");
+ else
+ printf(" %s%*s", uni_type, 10 - (int)uni_stat.unicode_width, "");
+ free(uni_type);
+ }
}
#else
if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
- printf("\n%-20s", "");
+ printf("\n%-20s", "");
+ if (opt & OPT_FSTYPE) {
+ if (printf(" %-10s", fs_type) > 11 && !(opt & OPT_POSIX))
+ printf("\n%-30s", "");
+ }
#endif
#if ENABLE_FEATURE_HUMAN_READABLE
printf(" %9s ",
- /* f_blocks x f_bsize / df_disp_hr, show one fractional,
+ /* f_blocks x f_frsize / df_disp_hr, show one fractional,
* use suffixes if df_disp_hr == 0 */
- make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
+ make_human_readable_str(s.f_blocks, s.f_frsize, df_disp_hr));
printf(" %9s " + 1,
- /* EXPR x f_bsize / df_disp_hr, show one fractional,
+ /* EXPR x f_frsize / df_disp_hr, show one fractional,
* use suffixes if df_disp_hr == 0 */
make_human_readable_str((s.f_blocks - s.f_bfree),
- s.f_bsize, df_disp_hr));
+ s.f_frsize, df_disp_hr));
printf("%9s %3u%% %s\n",
- /* f_bavail x f_bsize / df_disp_hr, show one fractional,
+ /* f_bavail x f_frsize / df_disp_hr, show one fractional,
* use suffixes if df_disp_hr == 0 */
- make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
+ make_human_readable_str(s.f_bavail, s.f_frsize, df_disp_hr),
blocks_percent_used, mount_point);
#else
printf(" %9lu %9lu %9lu %3u%% %s\n",
- kscale(s.f_blocks, s.f_bsize),
- kscale(s.f_blocks - s.f_bfree, s.f_bsize),
- kscale(s.f_bavail, s.f_bsize),
+ kscale(s.f_blocks, s.f_frsize),
+ kscale(s.f_blocks - s.f_bfree, s.f_frsize),
+ kscale(s.f_bavail, s.f_frsize),
blocks_percent_used, mount_point);
#endif
}
projects / oweals / busybox.git / blobdiff