[git commit] df: POSIXLY_CORRECT sets _default_ scale, -m/-h overrides it

[Denys Vlasenko]

commit: https://git.busybox.net/busybox/commit/?id=a2a9113f35741f9d01f0b5fd5d45d6387681fdb5
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
df_main                                             1034    1029      -5

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 coreutils/df.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/coreutils/df.c b/coreutils/df.c
index debb86867..a659353c0 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";