diff options
| author | Denys Vlasenko | 2021-06-20 14:46:19 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2021-06-20 14:46:19 +0200 |
| commit | a2a9113f35741f9d01f0b5fd5d45d6387681fdb5 (patch) | |
| tree | f0533b6ae732209c79b489591410a3ffc9d02028 | |
| parent | d71c7892ac56939cfcf3fa699ee8b0195631ee5a (diff) | |
| download | busybox-a2a9113f35741f9d01f0b5fd5d45d6387681fdb5.zip busybox-a2a9113f35741f9d01f0b5fd5d45d6387681fdb5.tar.gz | |
df: POSIXLY_CORRECT sets _default_ scale, -m/-h overrides it
function old new delta
df_main 1034 1029 -5
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/df.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/df.c b/coreutils/df.c index debb868..a659353 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -113,6 +113,13 @@ int df_main(int argc UNUSED_PARAM, char **argv) init_unicode(); + /* 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. + */ + if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */ + df_disp_hr = 512; + opt = getopt32(argv, "^" "kPT" IF_FEATURE_DF_FANCY("aiB:") @@ -142,13 +149,6 @@ int df_main(int argc UNUSED_PARAM, char **argv) 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. - */ - if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */ - df_disp_hr = 512; - if (opt & OPT_HUMAN) { df_disp_hr = 0; disp_units_hdr = " Size"; |