aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-03-19 03:56:20 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-03-19 03:56:20 +0000
commit0354aba9a14e3c28934af505688acbb62437d95e (patch)
tree9ca3b7a142812718a43ad06a5ac2183bbabc077f /coreutils
parent7f88e34e1a19fca5eb29f5cfb57c54f1ecd5c4a9 (diff)
downloadbusybox-0354aba9a14e3c28934af505688acbb62437d95e.tar.gz
busybox-0354aba9a14e3c28934af505688acbb62437d95e.tar.bz2
df: fix FEATURE_DF_FANCY=off, FEATURE_HUMAN_READABLE=on case.
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/df.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/coreutils/df.c b/coreutils/df.c
index 1c7d6cb38..dfd6e0b41 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -44,8 +44,7 @@ int df_main(int argc, char **argv)
FILE *mount_table;
struct mntent *mount_entry;
struct statfs s;
- static const char ignored_mounts[] ALIGN1 =
- "rootfs\0";
+ static const char ignored_mounts[] ALIGN1 = "rootfs\0";
enum {
OPT_KILO = (1 << 0),
@@ -53,8 +52,8 @@ int df_main(int argc, char **argv)
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 << 5) * ENABLE_FEATURE_HUMAN_READABLE,
- OPT_MEGA = (1 << 6) * ENABLE_FEATURE_HUMAN_READABLE,
+ 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,
};
const char *disp_units_hdr = NULL;
char *chp;
@@ -124,7 +123,7 @@ int df_main(int argc, char **argv)
mount_entry = find_mount_point(mount_point, bb_path_mtab_file);
if (!mount_entry) {
bb_error_msg("%s: can't find mount point", mount_point);
- SET_ERROR:
+ set_error:
status = EXIT_FAILURE;
continue;
}
@@ -135,7 +134,7 @@ int df_main(int argc, char **argv)
if (statfs(mount_point, &s) != 0) {
bb_simple_perror_msg(mount_point);
- goto SET_ERROR;
+ goto set_error;
}
if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) {
@@ -166,7 +165,7 @@ int df_main(int argc, char **argv)
* or leaves device alone if it can't find it */
device = find_block_device("/");
if (!device) {
- goto SET_ERROR;
+ goto set_error;
}
}
#endif