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

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

@@ -26 +26 @@
 //usage:    "[-Pk"
 //usage:    IF_FEATURE_HUMAN_READABLE("mh")
+//usage:    "T"
 //usage:    IF_FEATURE_DF_FANCY("ai] [-B SIZE")
 //usage:    "] [FILESYSTEM]..."
@@ -36 +37 @@
 //usage:     "\n    -h  Human readable (e.g. 1K 243M 2G)"
 //usage:    )
+//usage:     "\n    -T  Print filesystem type"
 //usage:    IF_FEATURE_DF_FANCY(
 //usage:     "\n    -a  Show all filesystems"
@@ -84 +86 @@
         OPT_KILO  = (1 << 0),
         OPT_POSIX = (1 << 1),
-        OPT_ALL   = (1 << 2) * ENABLE_FEATURE_DF_FANCY,
-        OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
-        OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
-        OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
-        OPT_MEGA  = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+        OPT_FSTYPE  = (1 << 2),
+        OPT_ALL   = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
+        OPT_INODE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
+        OPT_BSIZE = (1 << 5) * ENABLE_FEATURE_DF_FANCY,
+        OPT_HUMAN = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
+        OPT_MEGA  = (1 << (4 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
     };
     const char *disp_units_hdr = NULL;
@@ -100 +103 @@
     opt_complementary = "k-m:m-k";
 #endif
-    opt = getopt32(argv, "kP"
+    opt = getopt32(argv, "kPT"
             IF_FEATURE_DF_FANCY("aiB:")
             IF_FEATURE_HUMAN_READABLE("hm")
@@ -135 +138 @@
 #endif
     }
-    printf("Filesystem           %-15sUsed Available %s Mounted on\n",
-            disp_units_hdr, (opt & OPT_POSIX) ? "Capacity" : "Use%");
+
+    printf("Filesystem           %s%-15sUsed Available %s Mounted on\n",
+            (opt & OPT_FSTYPE) ? "Type       " : "",
+            disp_units_hdr,
+            (opt & OPT_POSIX) ? "Capacity" : "Use%");
 
     mount_table = NULL;
@@ -149 +155 @@
         const char *device;
         const char *mount_point;
+        const char *fs_type;
 
         if (mount_table) {
@@ -171 +178 @@
         device = mount_entry->mnt_fsname;
         mount_point = mount_entry->mnt_dir;
+        fs_type = mount_entry->mnt_type;
 
         if (statfs(mount_point, &s) != 0) {
@@ -219 +227 @@
                 }
                 free(uni_dev);
+                if (opt & OPT_FSTYPE) {
+                    char *uni_type = unicode_conv_to_printable(&uni_stat, fs_type);
+                    if (uni_stat.unicode_width > 10 && !(opt & OPT_POSIX))
+                        printf(" %s\n%31s", uni_type, "");
+                    else
+                        printf(" %s%*s", uni_type, 10 - (int)uni_stat.unicode_width, "");
+                    free(uni_type);
+                }
             }
 #else
             if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
                 printf("\n%-20s", "");
+            if (opt & OPT_FSTYPE) {
+                if (printf(" %-10s", fs_type) > 11 && !(opt & OPT_POSIX))
+                    printf("\n%-30s", "");
+            }
 #endif