Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/du.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/coreutils/du.c (modified) (5 diffs)

branches/3.3/mindi-busybox/coreutils/du.c

@@ -59 +59 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 enum {
@@ -76 +77 @@
 struct globals {
 #if ENABLE_FEATURE_HUMAN_READABLE
-    unsigned long disp_hr;
+    unsigned long disp_unit;
 #else
     unsigned disp_k;
@@ -86 +87 @@
     dev_t dir_dev;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
-
-
-/* FIXME? coreutils' du rounds sizes up:
- * for example,  1025k file is shown as "2" by du -m.
- * We round to nearest.
- */
+#define G (*(struct globals*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
+
+
 static void print(unsigned long long size, const char *filename)
 {
     /* TODO - May not want to defer error checking here. */
 #if ENABLE_FEATURE_HUMAN_READABLE
+# if ENABLE_DESKTOP
+    /* ~30 bytes of code for extra comtat:
+     * coreutils' du rounds sizes up:
+     * for example,  1025k file is shown as "2" by du -m.
+     * We round to nearest if human-readable [too hard to fix],
+     * else (fixed scale such as -m), we round up. To that end,
+     * add yet another half of the unit before displaying:
+     */
+    if (G.disp_unit)
+        size += (G.disp_unit-1) / (unsigned)(512 * 2);
+# endif
     printf("%s\t%s\n",
-            /* size x 512 / G.disp_hr, show one fractional,
-             * use suffixes if G.disp_hr == 0 */
-            make_human_readable_str(size, 512, G.disp_hr),
+            /* size x 512 / G.disp_unit.
+             * If G.disp_unit == 0, show one fractional
+             * and use suffixes
+             */
+            make_human_readable_str(size, 512, G.disp_unit),
             filename);
 #else
@@ -200 +210 @@
 
 #if ENABLE_FEATURE_HUMAN_READABLE
-    IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_hr = 1024;)
-    IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_hr = 512;)
+    IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_unit = 1024;)
+    IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_unit = 512;)
     if (getenv("POSIXLY_CORRECT"))  /* TODO - a new libbb function? */
-        G.disp_hr = 512;
+        G.disp_unit = 512;
 #else
     IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_k = 1;)
@@ -221 +231 @@
     argv += optind;
     if (opt & OPT_h_for_humans) {
-        G.disp_hr = 0;
+        G.disp_unit = 0;
     }
     if (opt & OPT_m_mbytes) {
-        G.disp_hr = 1024*1024;
+        G.disp_unit = 1024*1024;
     }
     if (opt & OPT_k_kbytes) {
-        G.disp_hr = 1024;
+        G.disp_unit = 1024;
     }
 #else