X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fdu.c;h=b8bbe3d9ef10d0550d31fb349da01065e7718d15;hb=561f9c8585e7cb0882472297f4fd2ed763dc085a;hp=7495f7a7bbc0f24d68fb372ef6e468c6f5e857d6;hpb=68404f13d4bf4826e3609703dad5375763db28ab;p=oweals%2Fbusybox.git diff --git a/coreutils/du.c b/coreutils/du.c index 7495f7a7b..b8bbe3d9e 100644 --- a/coreutils/du.c +++ b/coreutils/du.c @@ -6,7 +6,7 @@ * Copyright (C) 1999,2000,2001 by John Beppu * Copyright (C) 2002 Edward Betts * - * 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 compliant (unless default blocksize set to 1k) */ @@ -23,25 +23,70 @@ * 4) Fixed busybox bug #1284 involving long overflow with human_readable. */ +//usage:#define du_trivial_usage +//usage: "[-aHLdclsx" IF_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..." +//usage:#define du_full_usage "\n\n" +//usage: "Summarize disk space used for each FILE and/or directory.\n" +//usage: "Disk space is printed in units of " +//usage: IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") +//usage: IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") +//usage: " bytes.\n" +//usage: "\n -a Show file sizes too" +//usage: "\n -L Follow all symlinks" +//usage: "\n -H Follow symlinks on command line" +//usage: "\n -d N Limit output to directories (and files with -a) of depth < N" +//usage: "\n -c Show grand total" +//usage: "\n -l Count sizes many times if hard linked" +//usage: "\n -s Display only a total for each argument" +//usage: "\n -x Skip directories on different filesystems" +//usage: IF_FEATURE_HUMAN_READABLE( +//usage: "\n -h Sizes in human readable format (e.g., 1K 243M 2G )" +//usage: "\n -m Sizes in megabytes" +//usage: ) +//usage: "\n -k Sizes in kilobytes" +//usage: IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)") +//usage: +//usage:#define du_example_usage +//usage: "$ du\n" +//usage: "16 ./CVS\n" +//usage: "12 ./kernel-patches/CVS\n" +//usage: "80 ./kernel-patches\n" +//usage: "12 ./tests/CVS\n" +//usage: "36 ./tests\n" +//usage: "12 ./scripts/CVS\n" +//usage: "16 ./scripts\n" +//usage: "12 ./docs/CVS\n" +//usage: "104 ./docs\n" +//usage: "2417 .\n" + #include "libbb.h" +enum { + OPT_a_files_too = (1 << 0), + OPT_H_follow_links = (1 << 1), + OPT_k_kbytes = (1 << 2), + OPT_L_follow_links = (1 << 3), + OPT_s_total_norecurse = (1 << 4), + OPT_x_one_FS = (1 << 5), + OPT_d_maxdepth = (1 << 6), + OPT_l_hardlinks = (1 << 7), + OPT_c_total = (1 << 8), + OPT_h_for_humans = (1 << 9), + OPT_m_mbytes = (1 << 10), +}; + struct globals { #if ENABLE_FEATURE_HUMAN_READABLE unsigned long disp_hr; #else unsigned disp_k; #endif - int max_print_depth; - nlink_t count_hardlinks; - bool status; - bool one_file_system; - int print_files; int slink_depth; int du_depth; dev_t dir_dev; -}; +} FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) @@ -49,14 +94,17 @@ static void print(unsigned long size, const char *filename) { /* TODO - May not want to defer error checking here. */ #if ENABLE_FEATURE_HUMAN_READABLE - printf("%s\t%s\n", make_human_readable_str(size, 512, G.disp_hr), + printf("%s\t%s\n", + /* size x 512 / G.disp_hr, show one fractional, + * use suffixes if G.disp_hr == 0 */ + make_human_readable_str(size, 512, G.disp_hr), filename); #else if (G.disp_k) { size++; size >>= 1; } - printf("%ld\t%s\n", size, filename); + printf("%lu\t%s\n", size, filename); #endif } @@ -72,7 +120,7 @@ static unsigned long du(const char *filename) return 0; } - if (G.one_file_system) { + if (option_mask32 & OPT_x_one_FS) { if (G.du_depth == 0) { G.dir_dev = statbuf.st_dev; } else if (G.dir_dev != statbuf.st_dev) { @@ -83,7 +131,7 @@ static unsigned long du(const char *filename) sum = statbuf.st_blocks; if (S_ISLNK(statbuf.st_mode)) { - if (G.slink_depth > G.du_depth) { /* -H or -L */ + if (G.slink_depth > G.du_depth) { /* -H or -L */ if (stat(filename, &statbuf) != 0) { bb_simple_perror_msg(filename); G.status = EXIT_FAILURE; @@ -91,12 +139,15 @@ static unsigned long du(const char *filename) } sum = statbuf.st_blocks; if (G.slink_depth == 1) { - G.slink_depth = INT_MAX; /* Convert -H to -L. */ + /* Convert -H to -L */ + G.slink_depth = INT_MAX; } } } - if (statbuf.st_nlink > G.count_hardlinks) { + if (!(option_mask32 & OPT_l_hardlinks) + && statbuf.st_nlink > 1 + ) { /* Add files/directories with links only once */ if (is_in_ino_dev_hashtable(&statbuf)) { return 0; @@ -115,14 +166,8 @@ static unsigned long du(const char *filename) return sum; } - newfile = last_char_is(filename, '/'); - if (newfile) - *newfile = '\0'; - while ((entry = readdir(dir))) { - char *name = entry->d_name; - - newfile = concat_subpath_file(filename, name); + newfile = concat_subpath_file(filename, entry->d_name); if (newfile == NULL) continue; ++G.du_depth; @@ -131,8 +176,9 @@ static unsigned long du(const char *filename) free(newfile); } closedir(dir); - } else if (G.du_depth > G.print_files) { - return sum; + } else { + if (!(option_mask32 & OPT_a_files_too) && G.du_depth != 0) + return sum; } if (G.du_depth <= G.max_print_depth) { print(sum, filename); @@ -141,25 +187,22 @@ static unsigned long du(const char *filename) } int du_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int du_main(int argc ATTRIBUTE_UNUSED, char **argv) +int du_main(int argc UNUSED_PARAM, char **argv) { unsigned long total; int slink_depth_save; - bool print_final_total; - char *smax_print_depth; unsigned opt; #if ENABLE_FEATURE_HUMAN_READABLE - USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_hr = 1024;) - SKIP_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_hr = 512;) + IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_hr = 1024;) + IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_hr = 512;) if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */ G.disp_hr = 512; #else - USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_k = 1;) - /* SKIP_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_k = 0;) - G is pre-zeroed */ + IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_k = 1;) + /* IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(G.disp_k = 0;) - G is pre-zeroed */ #endif G.max_print_depth = INT_MAX; - G.count_hardlinks = 1; /* Note: SUSv3 specifies that -a and -s options cannot be used together * in strictly conforming applications. However, it also says that some @@ -168,58 +211,37 @@ int du_main(int argc ATTRIBUTE_UNUSED, char **argv) * ignore -a. This is consistent with -s being equivalent to -d 0. */ #if ENABLE_FEATURE_HUMAN_READABLE - opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s"; - opt = getopt32(argv, "aHkLsx" "d:" "lc" "hm", &smax_print_depth); + opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s:d+"; + opt = getopt32(argv, "aHkLsx" "d:" "lc" "hm", &G.max_print_depth); argv += optind; - if (opt & (1 << 9)) { - /* -h opt */ + if (opt & OPT_h_for_humans) { G.disp_hr = 0; } - if (opt & (1 << 10)) { - /* -m opt */ + if (opt & OPT_m_mbytes) { G.disp_hr = 1024*1024; } - if (opt & (1 << 2)) { - /* -k opt */ + if (opt & OPT_k_kbytes) { G.disp_hr = 1024; } #else - opt_complementary = "H-L:L-H:s-d:d-s"; - opt = getopt32(argv, "aHkLsx" "d:" "lc", &smax_print_depth); + opt_complementary = "H-L:L-H:s-d:d-s:d+"; + opt = getopt32(argv, "aHkLsx" "d:" "lc", &G.max_print_depth); argv += optind; #if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K - if (opt & (1 << 2)) { - /* -k opt */ + if (opt & OPT_k_kbytes) { G.disp_k = 1; } #endif #endif - if (opt & (1 << 0)) { - /* -a opt */ - G.print_files = INT_MAX; - } - if (opt & (1 << 1)) { - /* -H opt */ + if (opt & OPT_H_follow_links) { G.slink_depth = 1; } - if (opt & (1 << 3)) { - /* -L opt */ + if (opt & OPT_L_follow_links) { G.slink_depth = INT_MAX; } - if (opt & (1 << 4)) { - /* -s opt */ + if (opt & OPT_s_total_norecurse) { G.max_print_depth = 0; } - G.one_file_system = opt & (1 << 5); /* -x opt */ - if (opt & (1 << 6)) { - /* -d opt */ - G.max_print_depth = xatoi_u(smax_print_depth); - } - if (opt & (1 << 7)) { - /* -l opt */ - G.count_hardlinks = MAXINT(nlink_t); - } - print_final_total = opt & (1 << 8); /* -c opt */ /* go through remaining args (if any) */ if (!*argv) { @@ -233,12 +255,12 @@ int du_main(int argc ATTRIBUTE_UNUSED, char **argv) total = 0; do { total += du(*argv); + /* otherwise du /dir /dir won't show /dir twice: */ + reset_ino_dev_hashtable(); G.slink_depth = slink_depth_save; } while (*++argv); - if (ENABLE_FEATURE_CLEAN_UP) - reset_ino_dev_hashtable(); - if (print_final_total) + if (opt & OPT_c_total) print(total, "total"); fflush_stdout_and_exit(G.status);