Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/df.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/df.c (modified) (4 diffs)

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

@@ -19 +19 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <mntent.h>
 #include <sys/vfs.h>
-#include "busybox.h"
+#include "libbb.h"
 
-#ifndef CONFIG_FEATURE_HUMAN_READABLE
-static long kscale(long b, long bs)
+#if !ENABLE_FEATURE_HUMAN_READABLE
+static unsigned long kscale(unsigned long b, unsigned long bs)
 {
-    return ( b * (long long) bs + KILOBYTE/2 ) / KILOBYTE;
+    return (b * (unsigned long long) bs + 1024/2) / 1024;
 }
 #endif
 
+int df_main(int argc, char **argv);
 int df_main(int argc, char **argv)
 {
-    long blocks_used;
-    long blocks_percent_used;
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    unsigned long df_disp_hr = KILOBYTE;
+    unsigned long blocks_used;
+    unsigned blocks_percent_used;
+#if ENABLE_FEATURE_HUMAN_READABLE
+    unsigned df_disp_hr = 1024;
 #endif
     int status = EXIT_SUCCESS;
-    unsigned long opt;
+    unsigned opt;
     FILE *mount_table;
     struct mntent *mount_entry;
     struct statfs s;
-    static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
-    const char *disp_units_hdr = hdr_1k;
+    /* default display is kilobytes */
+    const char *disp_units_hdr = "1k-blocks";
 
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-    bb_opt_complementally = "h-km:k-hm:m-hk";
-    opt = bb_getopt_ulflags(argc, argv, "hmk");
-    if(opt & 1) {
-                df_disp_hr = 0;
-                disp_units_hdr = "     Size";
+#if ENABLE_FEATURE_HUMAN_READABLE
+    opt_complementary = "h-km:k-hm:m-hk";
+    opt = getopt32(argv, "hmk");
+    if (opt & 1) {
+        df_disp_hr = 0;
+        disp_units_hdr = "     Size";
     }
-    if(opt & 2) {
-                df_disp_hr = MEGABYTE;
-                disp_units_hdr = "1M-blocks";
+    if (opt & 2) {
+        df_disp_hr = 1024*1024;
+        disp_units_hdr = "1M-blocks";
     }
 #else
-    opt = bb_getopt_ulflags(argc, argv, "k");
+    opt = getopt32(argv, "k");
 #endif
 
-    bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n",
+    printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n",
               "", disp_units_hdr);
 
@@ -70 +67 @@
     argv += optind;
     if (optind >= argc) {
-        if (!(mount_table = setmntent(bb_path_mtab_file, "r"))) {
+        mount_table = setmntent(bb_path_mtab_file, "r");
+        if (!mount_table) {
             bb_perror_msg_and_die(bb_path_mtab_file);
         }
     }
 
-    do {
+    while (1) {
         const char *device;
         const char *mount_point;
 
         if (mount_table) {
-            if (!(mount_entry = getmntent(mount_table))) {
+            mount_entry = getmntent(mount_table);
+            if (!mount_entry) {
                 endmntent(mount_table);
                 break;
             }
         } else {
-            if (!(mount_point = *argv++)) {
+            mount_point = *argv++;
+            if (!mount_point) {
                 break;
             }
-            if (!(mount_entry = find_mount_point(mount_point, bb_path_mtab_file))) {
-                bb_error_msg("%s: can't find mount point.", mount_point);
-            SET_ERROR:
+            mount_entry = find_mount_point(mount_point, bb_path_mtab_file);
+            if (!mount_entry) {
+                bb_error_msg("%s: can't find mount point", mount_point);
+ SET_ERROR:
                 status = EXIT_FAILURE;
                 continue;
@@ -108 +109 @@
             blocks_percent_used = 0;
             if (blocks_used + s.f_bavail) {
-                blocks_percent_used = (((long long) blocks_used) * 100
-                                       + (blocks_used + s.f_bavail)/2
-                                       ) / (blocks_used + s.f_bavail);
+                blocks_percent_used = (blocks_used * 100ULL
+                        + (blocks_used + s.f_bavail)/2
+                        ) / (blocks_used + s.f_bavail);
             }
 
@@ -118 +119 @@
                 /* Adjusts device to be the real root device,
                 * or leaves device alone if it can't find it */
-                if ((device = find_block_device("/")) == NULL) {
+                device = find_block_device("/");
+                if (!device) {
                     goto SET_ERROR;
                 }
             }
 
-#ifdef CONFIG_FEATURE_HUMAN_READABLE
-            bb_printf("%-20s %9s ", device,
-                      make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
+            if (printf("\n%-20s" + 1, device) > 20)
+                    printf("\n%-20s", "");
+#if ENABLE_FEATURE_HUMAN_READABLE
+            printf(" %9s ",
+                make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
 
-            bb_printf("%9s ",
-                      make_human_readable_str( (s.f_blocks - s.f_bfree),
-                                              s.f_bsize, df_disp_hr));
+            printf(" %9s " + 1,
+                make_human_readable_str((s.f_blocks - s.f_bfree),
+                        s.f_bsize, df_disp_hr));
 
-            bb_printf("%9s %3ld%% %s\n",
-                      make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
-                      blocks_percent_used, mount_point);
+            printf("%9s %3u%% %s\n",
+                    make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
+                    blocks_percent_used, mount_point);
 #else
-            bb_printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
-                      device,
-                      kscale(s.f_blocks, s.f_bsize),
-                      kscale(s.f_blocks-s.f_bfree, s.f_bsize),
-                      kscale(s.f_bavail, s.f_bsize),
-                      blocks_percent_used, mount_point);
+            printf(" %9lu %9lu %9lu %3u%% %s\n",
+                    kscale(s.f_blocks, s.f_bsize),
+                    kscale(s.f_blocks-s.f_bfree, s.f_bsize),
+                    kscale(s.f_bavail, s.f_bsize),
+                    blocks_percent_used, mount_point);
 #endif
         }
+    }
 
-    } while (1);
-
-    bb_fflush_stdout_and_exit(status);
+    fflush_stdout_and_exit(status);
 }