From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/coreutils/df.c | 224 +++++++++++++++++------------- 1 file changed, 125 insertions(+), 99 deletions(-) (limited to 'release/src/router/busybox/coreutils/df.c') diff --git a/release/src/router/busybox/coreutils/df.c b/release/src/router/busybox/coreutils/df.c index 9c0d13f6..e9a865c1 100644 --- a/release/src/router/busybox/coreutils/df.c +++ b/release/src/router/busybox/coreutils/df.c @@ -2,107 +2,127 @@ /* * Mini df implementation for busybox * - * Copyright (C) 1999-2003 by Erik Andersen + * Copyright (C) 1999-2004 by Erik Andersen * based on original code by (I think) Bruce Perens . * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -/* BB_AUDIT SUSv3 _NOT_ compliant -- options -P and -t missing. Also blocksize. */ +/* BB_AUDIT SUSv3 _NOT_ compliant -- option -t missing. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/df.html */ /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) * * Size reduction. Removed floating point dependency. Added error checking - * on output. Output stats on 0-sized filesystems if specificly listed on + * on output. Output stats on 0-sized filesystems if specifically listed on * the command line. Properly round *-blocks, Used, and Available quantities. + * + * Aug 28, 2008 Bernhard Reutner-Fischer + * + * Implement -P and -B; better coreutils compat; cleanup */ -#include -#include -#include -#include #include #include -#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 -extern int df_main(int argc, char **argv) +int df_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +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; -#endif + unsigned long blocks_used; + unsigned blocks_percent_used; + unsigned long df_disp_hr = 1024; 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; - -#ifdef CONFIG_FEATURE_HUMAN_READABLE - bb_opt_complementaly = "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(opt & 2) { - df_disp_hr = MEGABYTE; - disp_units_hdr = "1M-blocks"; + + enum { + 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, + }; + const char *disp_units_hdr = NULL; + char *chp; + +#if ENABLE_FEATURE_HUMAN_READABLE && ENABLE_FEATURE_DF_FANCY + opt_complementary = "k-mB:m-Bk:B-km"; +#elif ENABLE_FEATURE_HUMAN_READABLE + opt_complementary = "k-m:m-k"; +#endif + opt = getopt32(argv, "kP" + USE_FEATURE_DF_FANCY("aiB:") + USE_FEATURE_HUMAN_READABLE("hm") + USE_FEATURE_DF_FANCY(, &chp)); + if (opt & OPT_MEGA) + df_disp_hr = 1024*1024; + + if (opt & OPT_BSIZE) + 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. + */ + if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */ + df_disp_hr = 512; + + if (opt & OPT_HUMAN) { + df_disp_hr = 0; + disp_units_hdr = " Size"; } + if (opt & OPT_INODE) + disp_units_hdr = " Inodes"; + + 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))); #else - opt = bb_getopt_ulflags(argc, argv, "k"); + disp_units_hdr = xasprintf("%lu-blocks", df_disp_hr); #endif - - bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n", - "", disp_units_hdr); + } + printf("Filesystem %-15sUsed Available %s Mounted on\n", + disp_units_hdr, (opt & OPT_POSIX) ? "Capacity" : "Use%"); mount_table = NULL; 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); + if (!mount_entry) { + bb_error_msg("%s: can't find mount point", mount_point); + set_error: status = EXIT_FAILURE; continue; } @@ -112,59 +132,65 @@ extern int df_main(int argc, char **argv) mount_point = mount_entry->mnt_dir; if (statfs(mount_point, &s) != 0) { - bb_perror_msg("%s", mount_point); - goto SET_ERROR; + bb_simple_perror_msg(mount_point); + goto set_error; } - - if ((s.f_blocks > 0) || !mount_table){ + + if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) { + if (opt & OPT_INODE) { + s.f_blocks = s.f_files; + s.f_bavail = s.f_bfree = s.f_ffree; + s.f_bsize = 1; + + if (df_disp_hr) + df_disp_hr = 1; + } blocks_used = s.f_blocks - s.f_bfree; 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); } - - if (strcmp(device, "rootfs") == 0) { + + /* GNU coreutils 6.10 skips certain mounts, try to be compatible. */ + if (strcmp(device, "rootfs") == 0) continue; - } else if (strcmp(device, "/dev/root") == 0) { + +#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 */ - if ((device = find_real_root_device_name(device)) == NULL) { - goto SET_ERROR; + device = find_block_device("/"); + if (!device) { + goto set_error; } } - -#ifdef CONFIG_FEATURE_HUMAN_READABLE - bb_printf("%-21s%9s ", device, - 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)); - - bb_printf("%9s %3ld%% %s\n", - make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr), - blocks_percent_used, mount_point); +#endif + + 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)); + + printf(" %9s " + 1, + 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); #else - bb_printf("%-21s%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); + return status; } - -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ -- cgit v1.2.3-54-g00ecf