diff options
| author | Ari Sundholm <ari@tuxera.com> | 2014-09-18 15:41:57 +0300 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-09-20 18:55:17 +0200 |
| commit | fbdc167f27193fd7e00f85537af122eba674fe95 (patch) | |
| tree | b365bdda62f9aa0d705dbcfaf97a7d3e436a1f12 /coreutils/df.c | |
| parent | cd7a38a87d54f5421b379870ff866676f31923b2 (diff) | |
| download | busybox-w32-fbdc167f27193fd7e00f85537af122eba674fe95.tar.gz busybox-w32-fbdc167f27193fd7e00f85537af122eba674fe95.tar.bz2 busybox-w32-fbdc167f27193fd7e00f85537af122eba674fe95.zip | |
df: fix -T option when ENABLE_FEATURE_HUMAN_READABLE=0
Signed-off-by: Ari Sundholm <ari@tuxera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/df.c')
| -rw-r--r-- | coreutils/df.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/coreutils/df.c b/coreutils/df.c index 7a82fee83..d79c11a6c 100644 --- a/coreutils/df.c +++ b/coreutils/df.c | |||
| @@ -85,12 +85,12 @@ int df_main(int argc UNUSED_PARAM, char **argv) | |||
| 85 | enum { | 85 | enum { |
| 86 | OPT_KILO = (1 << 0), | 86 | OPT_KILO = (1 << 0), |
| 87 | OPT_POSIX = (1 << 1), | 87 | OPT_POSIX = (1 << 1), |
| 88 | OPT_ALL = (1 << 2) * ENABLE_FEATURE_DF_FANCY, | 88 | OPT_FSTYPE = (1 << 2), |
| 89 | OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY, | 89 | OPT_ALL = (1 << 3) * ENABLE_FEATURE_DF_FANCY, |
| 90 | OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY, | 90 | OPT_INODE = (1 << 4) * ENABLE_FEATURE_DF_FANCY, |
| 91 | OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE, | 91 | OPT_BSIZE = (1 << 5) * ENABLE_FEATURE_DF_FANCY, |
| 92 | OPT_MEGA = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE, | 92 | OPT_HUMAN = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE, |
| 93 | OPT_FSTYPE = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)), | 93 | OPT_MEGA = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE, |
| 94 | }; | 94 | }; |
| 95 | const char *disp_units_hdr = NULL; | 95 | const char *disp_units_hdr = NULL; |
| 96 | char *chp; | 96 | char *chp; |
| @@ -102,10 +102,9 @@ int df_main(int argc UNUSED_PARAM, char **argv) | |||
| 102 | #elif ENABLE_FEATURE_HUMAN_READABLE | 102 | #elif ENABLE_FEATURE_HUMAN_READABLE |
| 103 | opt_complementary = "k-m:m-k"; | 103 | opt_complementary = "k-m:m-k"; |
| 104 | #endif | 104 | #endif |
| 105 | opt = getopt32(argv, "kP" | 105 | opt = getopt32(argv, "kPT" |
| 106 | IF_FEATURE_DF_FANCY("aiB:") | 106 | IF_FEATURE_DF_FANCY("aiB:") |
| 107 | IF_FEATURE_HUMAN_READABLE("hm") | 107 | IF_FEATURE_HUMAN_READABLE("hm") |
| 108 | "T" | ||
| 109 | IF_FEATURE_DF_FANCY(, &chp)); | 108 | IF_FEATURE_DF_FANCY(, &chp)); |
| 110 | if (opt & OPT_MEGA) | 109 | if (opt & OPT_MEGA) |
| 111 | df_disp_hr = 1024*1024; | 110 | df_disp_hr = 1024*1024; |