Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/human_readable.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/human_readable.c (modified) (7 diffs)

branches/3.3/mindi-busybox/libbb/human_readable.c

@@ -15 +15 @@
  *      The base ten "bytes" output could be handled similarly.
  *
- *   2) This routine always outputs a decimal point and a tenths digit when
- *      display_unit != 0.  Hence, it isn't uncommon for the returned string
+ *   2) This routine outputs a decimal point and a tenths digit when
+ *      display_unit == 0.  Hence, it isn't uncommon for the returned string
  *      to have a length of 5 or 6.
  *
- *      It might be nice to add a flag to indicate no decimal digits in
- *      that case.  This could be either an additional parameter, or a
- *      special value of display_unit.  Such a flag would also be nice for du.
- *
- *      Some code to omit the decimal point and tenths digit is sketched out
- *      and "#if 0"'d below.
+ *      If block_size is also 0, no decimal digits are printed.
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
@@ -37 +32 @@
         '\0', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'
     };
-
-    static char *str;
 
     unsigned frac; /* 0..9 - the fractional digit */
@@ -82 +75 @@
     }
 
-    if (!str) {
-        /* sufficient for any width of val */
-        str = xmalloc(sizeof(val)*3 + 2 + 3);
-    }
-    sprintf(str, fmt, val, frac, *u);
-    return str;
+    return auto_string(xasprintf(fmt, val, frac, *u));
 }
 
@@ -95 +83 @@
 /* Convert unsigned long long value into compact 5-char representation.
  * String is not terminated (buf[5] is untouched) */
-void FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale)
+char* FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale)
 {
     const char *fmt;
@@ -146 +134 @@
         buf[4] = scale[idx]; /* typically scale = " kmgt..." */
     }
+    return buf + 5;
 }
 
@@ -151 +140 @@
  * representation. Examples: "1234", "1.2k", " 27M", "123T"
  * String is not terminated (buf[4] is untouched) */
-void FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale)
+char* FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale)
 {
     const char *fmt;
@@ -195 +184 @@
         buf[3] = scale[idx]; /* typically scale = " kmgt..." */
     }
+    return buf + 4;
 }