From cad5364599eb5062d59e0c397ed638ddd61a8d5d Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Wed, 19 Mar 2003 09:13:01 +0000 Subject: Major coreutils update. --- coreutils/df.c | 185 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 105 insertions(+), 80 deletions(-) (limited to 'coreutils/df.c') diff --git a/coreutils/df.c b/coreutils/df.c index 0e9e5d61a..7d007a003 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -22,74 +22,45 @@ * */ +/* 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 specificly 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 CONFIG_FEATURE_HUMAN_READABLE -static unsigned long df_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 do_df(char *device, const char *mount_point) +extern int df_main(int argc, char **argv) { - struct statfs s; long blocks_used; long blocks_percent_used; - - 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; - 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 */ - device = find_real_root_device_name(device); - if(device==NULL) - return FALSE; - } #ifdef CONFIG_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); + unsigned long df_disp_hr = KILOBYTE; #endif - } - - return TRUE; -} - -extern int df_main(int argc, char **argv) -{ int status = EXIT_SUCCESS; - int opt = 0; - int i = 0; - char disp_units_hdr[80] = "1k-blocks"; /* default display is kilobytes */ + int 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; while ((opt = getopt(argc, argv, "k" #ifdef CONFIG_FEATURE_HUMAN_READABLE @@ -101,52 +72,106 @@ extern int df_main(int argc, char **argv) #ifdef CONFIG_FEATURE_HUMAN_READABLE case 'h': df_disp_hr = 0; - strcpy(disp_units_hdr, " Size"); + disp_units_hdr = " Size"; break; case 'm': df_disp_hr = MEGABYTE; - strcpy(disp_units_hdr, "1M-blocks"); + disp_units_hdr = "1M-blocks"; break; #endif case 'k': /* default display is kilobytes */ +#ifdef CONFIG_FEATURE_HUMAN_READABLE + df_disp_hr = KILOBYTE; + disp_units_hdr = hdr_1k; +#endif break; default: - show_usage(); + bb_show_usage(); } } - printf("%-20s %-14s %s %s %s %s\n", "Filesystem", disp_units_hdr, - "Used", "Available", "Use%", "Mounted on"); + bb_printf("Filesystem%11s%-15sUsed Available Use%% Mounted on\n", + "", disp_units_hdr); - 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; + 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); } - } else { - FILE *mount_table; - struct mntent *mount_entry; + } - mount_table = setmntent(mtab_file, "r"); - if (mount_table == 0) { - perror_msg("%s", mtab_file); - return EXIT_FAILURE; - } + do { + const char *device; + const char *mount_point; - while ((mount_entry = getmntent(mount_table))) { - if (!do_df(mount_entry->mnt_fsname, mount_entry->mnt_dir)) + 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; + } } - endmntent(mount_table); - } - return status; + device = mount_entry->mnt_fsname; + mount_point = mount_entry->mnt_dir; + + if (statfs(mount_point, &s) != 0) { + bb_perror_msg("%s", mount_point); + goto SET_ERROR; + } + + 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, "/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; + } + } + +#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); +#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); +#endif + } + + } while (1); + + bb_fflush_stdout_and_exit(status); } /* -- cgit v1.2.3