emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

df: POSIXLY_CORRECT sets _default_ scale, -m/-h overrides it

Browse Source 
function                                             old     new   delta
df_main                                             1034    1029      -5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-20 14:46:19 +02:00
parent d71c7892ac
commit a2a9113f35
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
coreutils/df.c
View File

@ -113,6 +113,13 @@ int df_main(int argc UNUSED_PARAM, char **argv)
init_unicode(); 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, "^" opt = getopt32(argv, "^"
"kPT" "kPT"
IF_FEATURE_DF_FANCY("aiB:") IF_FEATURE_DF_FANCY("aiB:")
@ -142,13 +149,6 @@ int df_main(int argc UNUSED_PARAM, char **argv)
got_it: ; 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) { if (opt & OPT_HUMAN) {
df_disp_hr = 0; df_disp_hr = 0;
disp_units_hdr = " Size"; disp_units_hdr = " Size";