Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/df.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/df.c (modified) (5 diffs)

branches/3.2/mindi-busybox/coreutils/df.c

@@ -22 +22 @@
  * Implement -P and -B; better coreutils compat; cleanup
  */
+
+//usage:#define df_trivial_usage
+//usage:    "[-Pk"
+//usage:    IF_FEATURE_HUMAN_READABLE("mh")
+//usage:    IF_FEATURE_DF_FANCY("ai] [-B SIZE")
+//usage:    "] [FILESYSTEM]..."
+//usage:#define df_full_usage "\n\n"
+//usage:       "Print filesystem usage statistics\n"
+//usage:     "\n    -P  POSIX output format"
+//usage:     "\n    -k  1024-byte blocks (default)"
+//usage:    IF_FEATURE_HUMAN_READABLE(
+//usage:     "\n    -m  1M-byte blocks"
+//usage:     "\n    -h  Human readable (e.g. 1K 243M 2G)"
+//usage:    )
+//usage:    IF_FEATURE_DF_FANCY(
+//usage:     "\n    -a  Show all filesystems"
+//usage:     "\n    -i  Inodes"
+//usage:     "\n    -B SIZE Blocksize"
+//usage:    )
+//usage:
+//usage:#define df_example_usage
+//usage:       "$ df\n"
+//usage:       "Filesystem           1K-blocks      Used Available Use% Mounted on\n"
+//usage:       "/dev/sda3              8690864   8553540    137324  98% /\n"
+//usage:       "/dev/sda1                64216     36364     27852  57% /boot\n"
+//usage:       "$ df /dev/sda3\n"
+//usage:       "Filesystem           1K-blocks      Used Available Use% Mounted on\n"
+//usage:       "/dev/sda3              8690864   8553540    137324  98% /\n"
+//usage:       "$ POSIXLY_CORRECT=sure df /dev/sda3\n"
+//usage:       "Filesystem         512B-blocks      Used Available Use% Mounted on\n"
+//usage:       "/dev/sda3             17381728  17107080    274648  98% /\n"
+//usage:       "$ POSIXLY_CORRECT=yep df -P /dev/sda3\n"
+//usage:       "Filesystem          512-blocks      Used Available Capacity Mounted on\n"
+//usage:       "/dev/sda3             17381728  17107080    274648      98% /\n"
 
 #include <mntent.h>
@@ -77 +111 @@
 
     /* From the manpage of df from coreutils-6.10:
-       Disk space is shown in 1K blocks by default, unless the environment
-       variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
-    */
+     * Disk space is shown in 1K blocks by default, unless the environment
+     * variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
+     */
     if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
         df_disp_hr = 512;
@@ -161 +195 @@
 
             /* GNU coreutils 6.10 skips certain mounts, try to be compatible.  */
-            if (strcmp(device, "rootfs") == 0)
+            if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0)
                 continue;
 
@@ -179 +213 @@
                 uni_stat_t uni_stat;
                 char *uni_dev = unicode_conv_to_printable(&uni_stat, device);
-                if (uni_stat.unicode_width > 20) {
+                if (uni_stat.unicode_width > 20 && !(opt & OPT_POSIX)) {
                     printf("%s\n%20s", uni_dev, "");
                 } else {
@@ -187 +221 @@
             }
 #else
-            if (printf("\n%-20s" + 1, device) > 20)
-                    printf("\n%-20s", "");
+            if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
+                printf("\n%-20s", "");
 #endif