From 1b4869300af6847dbd25b76f1a4a2f45baddb9c1 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 12 Dec 2013 08:50:21 -0600
Subject: [PATCH] Modified NSH 'df -h' command to do some saner conversions. 
 From Ken Pettit

---
 ChangeLog.txt        | 5 +++++
 nshlib/nsh_mntcmds.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 30a579c64..ffcbcf14a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -744,3 +744,8 @@
 	  specify FAT12, FAT16, or FAT32 (2013-12-5).
 
 6.33 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+	* apps/nshlib/nsh_mntcmds.c:  Modified the df -h logic to eliminate
+	  truncating numbers in conversion (like 7900 -> 7M).  From Ken
+	  Pettit (2013-12-12).
+
diff --git a/nshlib/nsh_mntcmds.c b/nshlib/nsh_mntcmds.c
index b8a97477b..ee242bece 100644
--- a/nshlib/nsh_mntcmds.c
+++ b/nshlib/nsh_mntcmds.c
@@ -194,7 +194,7 @@ static int df_man_readable_handler(FAR const char *mountpoint,
   /* Find the label for size */
 
   which = 0;
-  while (size >= 1024)
+  while (size >= 9999 || (size & 0x3FF) == 0 && size)
     {
       which++;
       size >>= 10;
@@ -204,7 +204,7 @@ static int df_man_readable_handler(FAR const char *mountpoint,
   /* Find the label for free */
 
   which = 0;
-  while (free >= 1024)
+  while (free >= 9999 || (free & 0x3FF) == 0 && size)
     {
       which++;
       free >>= 10;
@@ -214,7 +214,7 @@ static int df_man_readable_handler(FAR const char *mountpoint,
   /* Find the label for used */
 
   which = 0;
-  while (used >= 1024)
+  while (used >= 9999 || (used & 0x3FF) == 0 && size)
     {
       which++;
       used >>= 10;