X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdf.c;h=bd487ee9528bd9b71f63c21468d0bd7aaf7ece01;hb=e135a5d746c4f163f191e12b527636b0345e1456;hp=692205a0e252293c463d8a93f5cdd73aa9701d62;hpb=b50da53e0c6e07bbf69ac7ec1730087edf6815a1;p=oweals%2Fbusybox.git diff --git a/coreutils/df.c b/coreutils/df.c index 692205a0e..bd487ee95 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -2,8 +2,7 @@ /* * Mini df implementation for busybox * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written 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 @@ -22,126 +21,144 @@ * */ -#include "busybox.h" +/* BB_AUDIT SUSv3 _NOT_ compliant -- options -P and -t missing. Also blocksize. */ +/* 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 specifically listed on + * the command line. Properly round *-blocks, Used, and Available quantities. + */ + #include #include +#include +#include #include #include -#include +#include "busybox.h" -extern const char mtab_file[]; /* Defined in utility.c */ -#ifdef BB_FEATURE_HUMAN_READABLE -unsigned long disp_hr = KILOBYTE; +#ifndef CONFIG_FEATURE_HUMAN_READABLE +static long kscale(long b, long bs) +{ + return ( b * (long long) bs + KILOBYTE/2 ) / KILOBYTE; +} #endif -static int df(char *device, const char *mountPoint) +int df_main(int argc, char **argv) { - struct statfs s; long blocks_used; long blocks_percent_used; - - if (statfs(mountPoint, &s) != 0) { - perror_msg("%s", mountPoint); - return FALSE; +#ifdef CONFIG_FEATURE_HUMAN_READABLE + unsigned long df_disp_hr = KILOBYTE; +#endif + int status = EXIT_SUCCESS; + unsigned long 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_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(opt & 2) { + df_disp_hr = MEGABYTE; + disp_units_hdr = "1M-blocks"; } - - if (s.f_blocks > 0) { - blocks_used = s.f_blocks - s.f_bfree; - if(0 == blocks_used) - 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); - } -#ifdef BB_FEATURE_HUMAN_READABLE - printf("%-20s %9s", - device, - format((s.f_blocks * s.f_bsize), disp_hr)); - printf(" %9s", format((s.f_blocks - s.f_bfree) * s.f_bsize, disp_hr)); - printf(" %9s %3ld%% %s\n", - format(s.f_bavail * s.f_bsize, disp_hr), - blocks_percent_used, mountPoint); #else - 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); + opt = bb_getopt_ulflags(argc, argv, "k"); #endif + bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n", + "", disp_units_hdr); + + mount_table = NULL; + argv += optind; + if (optind >= argc) { + if (!(mount_table = setmntent(bb_path_mtab_file, "r"))) { + bb_perror_msg_and_die(bb_path_mtab_file); + } } - return TRUE; -} + do { + const char *device; + const char *mount_point; + + if (mount_table) { + if (!(mount_entry = getmntent(mount_table))) { + endmntent(mount_table); + break; + } + } else { + if (!(mount_point = *argv++)) { + 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: + status = EXIT_FAILURE; + continue; + } + } -extern int df_main(int argc, char **argv) -{ - int status = EXIT_SUCCESS; - int opt = 0; - int i = 0; + device = mount_entry->mnt_fsname; + mount_point = mount_entry->mnt_dir; - 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; - case 'k': disp_hr = KILOBYTE; break; -#else - case 'k': break; -#endif - default: - show_usage(); + if (statfs(mount_point, &s) != 0) { + bb_perror_msg("%s", mount_point); + goto SET_ERROR; } - } - printf("%-20s %-14s %s %s %s %s\n", "Filesystem", -#ifdef BB_FEATURE_HUMAN_READABLE - (KILOBYTE == disp_hr) ? "1k-blocks" : " Size", + if ((s.f_blocks > 0) || !mount_table){ + 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); + } + + if (strcmp(device, "rootfs") == 0) { + continue; + } else 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_block_device("/")) == NULL) { + 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)); + + 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); #else - "1k-blocks", + 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); #endif - "Used", "Available", "Use%", "Mounted on"); - - - 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; - } - } else { - FILE *mountTable; - struct mntent *mountEntry; - - mountTable = setmntent(mtab_file, "r"); - if (mountTable == 0) { - perror_msg("%s", mtab_file); - return EXIT_FAILURE; } - while ((mountEntry = getmntent(mountTable))) { - if (!df(mountEntry->mnt_fsname, mountEntry->mnt_dir)) - status = EXIT_FAILURE; - } - endmntent(mountTable); - } + } while (1); - return status; + bb_fflush_stdout_and_exit(status); } /*