From: Mark Whitley <markw@lineo.com>
Date: Tue, 20 Feb 2001 21:57:55 +0000 (-0000)
Subject: Small patch from Kent Robotti to show megabytes in human-readable output.
X-Git-Tag: 0_50~187
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d7bdc9deb754b8d52631aaf5d864a5584056b50;p=oweals%2Fbusybox.git

Small patch from Kent Robotti to show megabytes in human-readable output.
---

diff --git a/coreutils/df.c b/coreutils/df.c
index 4ec75333b..8f6ef984b 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -105,7 +105,8 @@ extern int df_main(int argc, char **argv)
 
 	printf("%-20s %-14s %s %s %s %s\n", "Filesystem",
 #ifdef BB_FEATURE_HUMAN_READABLE
-		   (KILOBYTE == disp_hr) ? "1k-blocks" : "     Size",
+			(KILOBYTE == disp_hr) ? "1k-blocks" :
+			(MEGABYTE == disp_hr) ? "1M-blocks" : "     Size",
 #else
 		   "1k-blocks",
 #endif
diff --git a/df.c b/df.c
index 4ec75333b..8f6ef984b 100644
--- a/df.c
+++ b/df.c
@@ -105,7 +105,8 @@ extern int df_main(int argc, char **argv)
 
 	printf("%-20s %-14s %s %s %s %s\n", "Filesystem",
 #ifdef BB_FEATURE_HUMAN_READABLE
-		   (KILOBYTE == disp_hr) ? "1k-blocks" : "     Size",
+			(KILOBYTE == disp_hr) ? "1k-blocks" :
+			(MEGABYTE == disp_hr) ? "1M-blocks" : "     Size",
 #else
 		   "1k-blocks",
 #endif