Thought of another janitorial item for the list.

[oweals/busybox.git] / df.c

diff --git a/df.c b/df.c
index 969a5b982b6a1d01ccf5c0c79415d9468f394c96..0d1e17608108a0f3065281544a25921a3dc73bcb 100644 (file)
--- a/df.c
+++ b/df.c
@@ -2,7 +2,7 @@
 /*
  * Mini df implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  * based on original code by (I think) Bruce Perens <bruce@pixar.com>.
  *
@@ -22,40 +22,76 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <mntent.h>
 #include <sys/vfs.h>
+#include <getopt.h>
+#include "busybox.h"
 
 extern const char mtab_file[]; /* Defined in utility.c */
+#ifdef BB_FEATURE_HUMAN_READABLE
+unsigned long disp_hr = KILOBYTE; 
+#endif
 
 static int df(char *device, const char *mountPoint)
 {
        struct statfs s;
        long blocks_used;
        long blocks_percent_used;
+#ifdef BB_FEATURE_HUMAN_READABLE
+       long divisor, base;
+#endif 
 
        if (statfs(mountPoint, &s) != 0) {
-               perrorMsg("%s", mountPoint);
+               perror_msg("%s", mountPoint);
                return FALSE;
        }
 
        if (s.f_blocks > 0) {
                blocks_used = s.f_blocks - s.f_bfree;
-               blocks_percent_used = (long)
-                       (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
+               if(blocks_used == 0)
+                       blocks_percent_used = 0;
+               else {
+                       blocks_percent_used = (long)
+                         (blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
+               }
                if (strcmp(device, "/dev/root") == 0) {
                        /* Adjusts device to be the real root device,
                         * or leaves device alone if it can't find it */
                        find_real_root_device_name( device);
                }
-               printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
-                          device,
-                          (long) (s.f_blocks * (s.f_bsize / 1024.0)),
-                          (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0)),
-                          (long) (s.f_bavail * (s.f_bsize / 1024.0)),
-                          blocks_percent_used, mountPoint);
+#ifdef BB_FEATURE_HUMAN_READABLE
+               switch (disp_hr) {
+                       case MEGABYTE:
+                               divisor = KILOBYTE;
+                               base = KILOBYTE;
+                               break;
+                       case KILOBYTE:
+                               divisor = KILOBYTE;
+                               base = 1;
+                               break;
+                       default:
+                               divisor = KILOBYTE;
+                               base = 0;
+               }
 
+               printf("%-20s %9s ", device,
+                          format((s.f_blocks * (s.f_bsize / divisor)), base));
+               printf("%9s ",
+                          format(((s.f_blocks - s.f_bfree) * 
+                                          (s.f_bsize / divisor)), base));
+               printf("%9s %3ld%% %s\n",
+                          format((s.f_bavail * (s.f_bsize / divisor)), base),
+                          blocks_percent_used, mountPoint);
+#else
+               printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
+                               device,
+                               (long) (s.f_blocks * (s.f_bsize / KILOBYTE)),
+                               (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / KILOBYTE)),
+                               (long) (s.f_bavail * (s.f_bsize / KILOBYTE)),
+                               blocks_percent_used, mountPoint);
+#endif
        }
 
        return TRUE;
@@ -64,24 +100,46 @@ static int df(char *device, const char *mountPoint)
 extern int df_main(int argc, char **argv)
 {
        int status = EXIT_SUCCESS;
+       int opt = 0;
+       int i = 0;
+
+       while ((opt = getopt(argc, argv, 
+#ifdef BB_FEATURE_HUMAN_READABLE
+       "hm"
+#endif
+       "k"
+)) > 0)
+       {
+               switch (opt) {
+#ifdef BB_FEATURE_HUMAN_READABLE
+                       case 'h': disp_hr = 0;         break;
+                       case 'm': disp_hr = MEGABYTE;  break;
+#endif
+                       case 'k': break;
+                       default:
+                                         show_usage();
+               }
+       }
 
        printf("%-20s %-14s %s %s %s %s\n", "Filesystem",
-                  "1k-blocks", "Used", "Available", "Use%", "Mounted on");
+#ifdef BB_FEATURE_HUMAN_READABLE
+                       (KILOBYTE == disp_hr) ? "1k-blocks" :
+                       (MEGABYTE == disp_hr) ? "1M-blocks" : "     Size",
+#else
+                  "1k-blocks",
+#endif
+              "Used", "Available", "Use%", "Mounted on");
 
-       if (argc > 1) {
-               struct mntent *mountEntry;
 
-               if (**(argv + 1) == '-') {
-                       usage(df_usage);
-               }
-               while (argc > 1) {
-                       if ((mountEntry = findMountPoint(argv[1], mtab_file)) == 0) {
-                               errorMsg("%s: can't find mount point.\n", argv[1]);
+       if(optind < argc) {
+               struct mntent *mountEntry;
+               for(i = optind; i < argc; i++)
+               {
+                       if ((mountEntry = find_mount_point(argv[i], mtab_file)) == 0) {
+                               error_msg("%s: can't find mount point.", argv[i]);
                                status = EXIT_FAILURE;
                        } else if (!df(mountEntry->mnt_fsname, mountEntry->mnt_dir))
                                status = EXIT_FAILURE;
-                       argc--;
-                       argv++;
                }
        } else {
                FILE *mountTable;
@@ -89,7 +147,7 @@ extern int df_main(int argc, char **argv)
 
                mountTable = setmntent(mtab_file, "r");
                if (mountTable == 0) {
-                       perrorMsg("%s", mtab_file);
+                       perror_msg("%s", mtab_file);
                        return EXIT_FAILURE;
                }