Patch bass ackwards behavior of hr flag.

3 files changed, 15 insertions, 12 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 4c23b2b80..b5c845952 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -201,7 +201,7 @@ struct sysinfo {
 };
 extern int sysinfo (struct sysinfo* info);
 
-const char *make_human_readable_str(unsigned long val, unsigned long hr);
+const char *make_human_readable_str(unsigned long val, unsigned long not_hr);
 enum {
         KILOBYTE = 1024,
         MEGABYTE = (KILOBYTE*1024),
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index 1d7a90e55..36783fac7 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -31,20 +31,23 @@
 static char buffer[10];
 static const char *suffixes[] = { "", "k", "M", "G", "T" };
 
-const char *make_human_readable_str(unsigned long val, unsigned long hr)
+const char *make_human_readable_str(unsigned long val, unsigned long not_hr)
 {
         int suffix, base;
 
-        for (suffix = 0, base = 1; suffix < 5; suffix++, base <<= 10) {
-                if (val < (base << 10)) {
-                        if (suffix && val < 10 * base)
-                                sprintf(buffer, "%lu.%lu%s", val / base,
-                                                (val % base) * 10 / base, suffixes[suffix]);
-                        else
-                                sprintf(buffer, "%lu%s", val / base, suffixes[suffix]);
-                        break;
+        if (not_hr)
+                sprintf(buffer, "%lu", val);
+        else
+                for (suffix = 0, base = 1; suffix < 5; suffix++, base <<= 10) {
+                        if (val < (base << 10)) {
+                                if (suffix && val < 10 * base)
+                                        sprintf(buffer, "%lu.%lu%s", val / base,
+                                                        (val % base) * 10 / base, suffixes[suffix]);
+                                else
+                                        sprintf(buffer, "%lu%s", val / base, suffixes[suffix]);
+                                break;
+                        }
                 }
-        }
 
         return buffer;
 }
diff --git a/libbb/libbb.h b/libbb/libbb.h
index 4c23b2b80..b5c845952 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -201,7 +201,7 @@ struct sysinfo {
 };
 extern int sysinfo (struct sysinfo* info);
 
-const char *make_human_readable_str(unsigned long val, unsigned long hr);
+const char *make_human_readable_str(unsigned long val, unsigned long not_hr);
 enum {
         KILOBYTE = 1024,
         MEGABYTE = (KILOBYTE*1024),