Fix misspelling of `stabilize'.
[oweals/busybox.git] / df.c
diff --git a/df.c b/df.c
index 07e61d87d64d354f91848918b4d53ff5d9402182..8cb13fa6d8f7de1f91b52ec6f7f3187f65a56d5b 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>.
  *
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <mntent.h>
-#include <sys/stat.h>
 #include <sys/vfs.h>
-
-static const char df_usage[] = "df [filesystem ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nPrint the filesystem space used and space available.\n"
-#endif
-       ;
+#include <getopt.h>
+#include "busybox.h"
 
 extern const char mtab_file[]; /* Defined in utility.c */
+#ifdef BB_FEATURE_HUMAN_READABLE
+static unsigned long df_disp_hr = KILOBYTE; 
+#endif
 
-static int df(char *device, const char *mountPoint)
+static int do_df(char *device, const char *mount_point)
 {
        struct statfs s;
        long blocks_used;
        long blocks_percent_used;
 
-       if (statfs(mountPoint, &s) != 0) {
-               perror(mountPoint);
+       if (statfs(mount_point, &s) != 0) {
+               perror_msg("%s", mount_point);
                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);
+                       device = find_real_root_device_name(device);
+                       if(device==NULL)
+                               return FALSE;
                }
-               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
+               printf("%-20s %9s ", device,
+                               make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
+
+               printf("%9s ",
+                               make_human_readable_str( (s.f_blocks - s.f_bfree), s.f_bsize, df_disp_hr));
 
+               printf("%9s %3ld%% %s\n",
+                               make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
+                               blocks_percent_used, mount_point);
+#else
+               printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
+                               device,
+                               (long) (s.f_blocks * (s.f_bsize / (double)KILOBYTE)),
+                               (long) ((s.f_blocks - s.f_bfree)*(s.f_bsize/(double)KILOBYTE)),
+                               (long) (s.f_bavail * (s.f_bsize / (double)KILOBYTE)),
+                               blocks_percent_used, mount_point);
+#endif
        }
 
        return TRUE;
@@ -70,45 +86,67 @@ static int df(char *device, const char *mountPoint)
 
 extern int df_main(int argc, char **argv)
 {
-       printf("%-20s %-14s %s %s %s %s\n", "Filesystem",
-                  "1k-blocks", "Used", "Available", "Use%", "Mounted on");
-
-       if (argc > 1) {
-               struct mntent *mountEntry;
-               int status;
+       int status = EXIT_SUCCESS;
+       int opt = 0;
+       int i = 0;
+       char disp_units_hdr[80] = "1k-blocks"; /* default display is kilobytes */
 
-               if (**(argv + 1) == '-') {
-                       usage(df_usage);
+       while ((opt = getopt(argc, argv, "k"
+#ifdef BB_FEATURE_HUMAN_READABLE
+       "hm"
+#endif
+)) > 0)
+       {
+               switch (opt) {
+#ifdef BB_FEATURE_HUMAN_READABLE
+                       case 'h':
+                               df_disp_hr = 0;
+                               strcpy(disp_units_hdr, "     Size");
+                               break;
+                       case 'm':
+                               df_disp_hr = MEGABYTE;
+                               strcpy(disp_units_hdr, "1M-blocks");
+                               break;
+#endif
+                       case 'k':
+                               /* default display is kilobytes */
+                               break;
+                       default:
+                                         show_usage();
                }
-               while (argc > 1) {
-                       if ((mountEntry = findMountPoint(argv[1], mtab_file)) == 0) {
-                               fprintf(stderr, "%s: can't find mount point.\n", argv[1]);
-                               exit(FALSE);
-                       }
-                       status = df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
-                       if (status != 0)
-                               exit(status);
-                       argc--;
-                       argv++;
+       }
+
+       printf("%-20s %-14s %s %s %s %s\n", "Filesystem", disp_units_hdr,
+              "Used", "Available", "Use%", "Mounted on");
+
+       if(optind < argc) {
+               struct mntent *mount_entry;
+               for(i = optind; i < argc; i++)
+               {
+                       if ((mount_entry = find_mount_point(argv[i], mtab_file)) == 0) {
+                               error_msg("%s: can't find mount point.", argv[i]);
+                               status = EXIT_FAILURE;
+                       } else if (!do_df(mount_entry->mnt_fsname, mount_entry->mnt_dir))
+                               status = EXIT_FAILURE;
                }
-               exit(TRUE);
        } else {
-               FILE *mountTable;
-               struct mntent *mountEntry;
+               FILE *mount_table;
+               struct mntent *mount_entry;
 
-               mountTable = setmntent(mtab_file, "r");
-               if (mountTable == 0) {
-                       perror(mtab_file);
-                       exit(FALSE);
+               mount_table = setmntent(mtab_file, "r");
+               if (mount_table == 0) {
+                       perror_msg("%s", mtab_file);
+                       return EXIT_FAILURE;
                }
 
-               while ((mountEntry = getmntent(mountTable))) {
-                       df(mountEntry->mnt_fsname, mountEntry->mnt_dir);
+               while ((mount_entry = getmntent(mount_table))) {
+                       if (!do_df(mount_entry->mnt_fsname, mount_entry->mnt_dir))
+                               status = EXIT_FAILURE;
                }
-               endmntent(mountTable);
+               endmntent(mount_table);
        }
 
-       exit(TRUE);
+       return status;
 }
 
 /*