Bump to version 1.22.1
[platform/upstream/busybox.git] / coreutils / df.c
index d95aff3..5e9a867 100644 (file)
@@ -5,7 +5,7 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * based on original code by (I think) Bruce Perens <bruce@pixar.com>.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 _NOT_ compliant -- option -t missing. */
  * 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>
 #include <sys/vfs.h>
 #include "libbb.h"
+#include "unicode.h"
 
 #if !ENABLE_FEATURE_HUMAN_READABLE
 static unsigned long kscale(unsigned long b, unsigned long bs)
@@ -34,7 +69,7 @@ static unsigned long kscale(unsigned long b, unsigned long bs)
 #endif
 
 int df_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int df_main(int argc, char **argv)
+int df_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned long blocks_used;
        unsigned blocks_percent_used;
@@ -57,6 +92,8 @@ int df_main(int argc, char **argv)
        const char *disp_units_hdr = NULL;
        char *chp;
 
+       init_unicode();
+
 #if ENABLE_FEATURE_HUMAN_READABLE && ENABLE_FEATURE_DF_FANCY
        opt_complementary = "k-mB:m-Bk:B-km";
 #elif ENABLE_FEATURE_HUMAN_READABLE
@@ -73,9 +110,9 @@ int df_main(int argc, char **argv)
                df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */
 
        /* 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;
 
@@ -89,7 +126,10 @@ int df_main(int argc, char **argv)
        if (disp_units_hdr == NULL) {
 #if ENABLE_FEATURE_HUMAN_READABLE
                disp_units_hdr = xasprintf("%s-blocks",
-                       make_human_readable_str(df_disp_hr, 0, !!(opt & OPT_POSIX)));
+                       /* print df_disp_hr, show no fractionals,
+                        * use suffixes if OPT_POSIX is set in opt */
+                       make_human_readable_str(df_disp_hr, 0, !!(opt & OPT_POSIX))
+               );
 #else
                disp_units_hdr = xasprintf("%lu-blocks", df_disp_hr);
 #endif
@@ -99,7 +139,7 @@ int df_main(int argc, char **argv)
 
        mount_table = NULL;
        argv += optind;
-       if (optind >= argc) {
+       if (!argv[0]) {
                mount_table = setmntent(bb_path_mtab_file, "r");
                if (!mount_table)
                        bb_perror_msg_and_die(bb_path_mtab_file);
@@ -119,7 +159,7 @@ int df_main(int argc, char **argv)
                        mount_point = *argv++;
                        if (!mount_point)
                                break;
-                       mount_entry = find_mount_point(mount_point);
+                       mount_entry = find_mount_point(mount_point, 1);
                        if (!mount_entry) {
                                bb_error_msg("%s: can't find mount point", mount_point);
  set_error:
@@ -154,14 +194,13 @@ int df_main(int argc, char **argv)
                        }
 
                        /* 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;
 
 #ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
-/* ... and also this is the only user of find_block_device */
                        if (strcmp(device, "/dev/root") == 0) {
                                /* Adjusts device to be the real root device,
-                               * or leaves device alone if it can't find it */
+                                * or leaves device alone if it can't find it */
                                device = find_block_device("/");
                                if (!device) {
                                        goto set_error;
@@ -169,25 +208,45 @@ int df_main(int argc, char **argv)
                        }
 #endif
 
-                       if (printf("\n%-20s" + 1, device) > 20)
-                                   printf("\n%-20s", "");
+#if ENABLE_UNICODE_SUPPORT
+                       {
+                               uni_stat_t uni_stat;
+                               char *uni_dev = unicode_conv_to_printable(&uni_stat, device);
+                               if (uni_stat.unicode_width > 20 && !(opt & OPT_POSIX)) {
+                                       printf("%s\n%20s", uni_dev, "");
+                               } else {
+                                       printf("%s%*s", uni_dev, 20 - (int)uni_stat.unicode_width, "");
+                               }
+                               free(uni_dev);
+                       }
+#else
+                       if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
+                               printf("\n%-20s", "");
+#endif
+
 #if ENABLE_FEATURE_HUMAN_READABLE
                        printf(" %9s ",
+                               /* f_blocks x f_bsize / df_disp_hr, show one fractional,
+                                * use suffixes if df_disp_hr == 0 */
                                make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
 
                        printf(" %9s " + 1,
+                               /* EXPR x f_bsize / df_disp_hr, show one fractional,
+                                * use suffixes if df_disp_hr == 0 */
                                make_human_readable_str((s.f_blocks - s.f_bfree),
                                                s.f_bsize, df_disp_hr));
 
                        printf("%9s %3u%% %s\n",
-                                       make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
-                                       blocks_percent_used, mount_point);
+                               /* f_bavail x f_bsize / df_disp_hr, show one fractional,
+                                * use suffixes if df_disp_hr == 0 */
+                               make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
+                               blocks_percent_used, mount_point);
 #else
                        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);
+                               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
                }
        }