X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=dus.c;h=9d1850cc36af64df4cb615fcc54c6436b4b64cd4;hb=9931cb5194ed160f999e4e2d107a719445e1cf07;hp=91cb0f02389e63b2887dc67fc05cdd11f9f0e0b6;hpb=a60dad8d8db2c660abb1f4f4ceceba8a1440fe94;p=dus.git diff --git a/dus.c b/dus.c index 91cb0f0..9d1850c 100644 --- a/dus.c +++ b/dus.c @@ -66,6 +66,10 @@ size_sum_t size_min = -1; /* -1 means no minimum size, otherwise lower bound on the size to display a file/dir */ +int ignore_protected_files = 0; /* Should we simply ignore files or + directories which are protected + ? */ + /********************************************************************/ /* malloc with error checking. */ @@ -73,7 +77,9 @@ size_sum_t size_min = -1; /* -1 means no minimum size, otherwise lower void *safe_malloc(size_t n) { void *p = malloc(n); if (!p && n != 0) { - fprintf(stderr, "Can not allocate memory: %s\n", strerror(errno)); + fprintf(stderr, + "dus: Can not allocate memory: %s\n", + strerror(errno)); exit(EXIT_FAILURE); } return p; @@ -98,8 +104,14 @@ size_sum_t entry_size(const char *name) { result = 0; if(lstat(name, &dummy) != 0) { - fprintf(stderr, "Can not stat %s: %s\n", name, strerror(errno)); - exit(EXIT_FAILURE); + if(!(errno == EACCES && ignore_protected_files)) { + fprintf(stderr, + "dus: Can not stat %s: %s\n", + name, strerror(errno)); + exit(EXIT_FAILURE); + } else { + return 0; + } } if(S_ISLNK(dummy.st_mode)) { @@ -117,8 +129,12 @@ size_sum_t entry_size(const char *name) { } closedir(dir); } else { - fprintf(stderr, "Can not open directory %s: %s\n", name, strerror(errno)); - exit(EXIT_FAILURE); + if(!(errno == EACCES && ignore_protected_files)) { + fprintf(stderr, + "dus: Can not open directory %s: %s\n", + name, strerror(errno)); + exit(EXIT_FAILURE); + } } } else if(S_ISREG(dummy.st_mode)) { result += dummy.st_size; @@ -136,6 +152,9 @@ size_sum_t atoss(const char *string) { for(c = string; *c; c++) { if(*c >= '0' && *c <= '9') { partial_total = 10 * partial_total + ((int) (*c - '0')); + } else if(*c == 'B' || *c == 'b') { + total += partial_total; + partial_total = 0; } else if(*c == 'K' || *c == 'k') { total += partial_total * 1024; partial_total = 0; @@ -146,9 +165,15 @@ size_sum_t atoss(const char *string) { total += partial_total * 1024 * 1024 * 1024; partial_total = 0; } else { - fprintf(stderr, "Syntax error in %s\n", string); + fprintf(stderr, + "dus: Syntax error in size specification `%s'\n", + string); + exit(EXIT_FAILURE); } } + + total += partial_total; + return total; } @@ -183,7 +208,9 @@ struct entry_node *push_dir_content(char *name, struct entry_node *head) { } closedir(dir); } else { - fprintf(stderr, "Can not open directory %s: %s\n", name, strerror(errno)); + fprintf(stderr, + "dus: Can not open directory %s: %s\n", + name, strerror(errno)); exit (EXIT_FAILURE); } return head; @@ -233,7 +260,8 @@ void raw_print(char *buffer, size_t buffer_size, b = buffer; do { if(b >= buffer + buffer_size) { - fprintf(stderr, "Buffer overflow in raw_print (hu?!).\n"); + fprintf(stderr, + "dus: Buffer overflow in raw_print (hu?!).\n"); exit(EXIT_FAILURE); } *(b++) = size%10 + '0'; @@ -364,7 +392,11 @@ void usage(FILE *out) { fprintf(out, "Lists files and directories according to their size. The sizes are computed by summing recursively exact file sizes through directories. If a given directory has its name appended with '/', it is not listed, but the elements it contains are. If no files or directories are provided as arguments, the current directory is used as default.\n"); fprintf(out, "\n"); /* 01234567890123456789012345678901234567890123456789012345678901234567890123456789*/ + fprintf(out, " -h, --help show this help.\n"); + fprintf(out, " -v, --version prints the version number and exit\n"); fprintf(out, " -d, --ignore-dots ignore files and directories starting with a '.'\n"); + fprintf(out, " -i, --ignore-protected ignore files and directories for which we do not\n"); + fprintf(out, " have permission\n"); fprintf(out, " -f, --fancy display size with float values and K, M and G\n"); fprintf(out, " units.\n"); fprintf(out, " -r, --reverse-order reverse the sorting order.\n"); @@ -376,9 +408,9 @@ void usage(FILE *out) { fprintf(out, " if the stdout is not a tty.\n"); fprintf(out, " -l , --nb-lines \n"); fprintf(out, " same as -c for number of lines.\n"); - fprintf(out, " -h, --help show this help.\n"); fprintf(out, " -m , --size-min \n"); - fprintf(out, " set the listed entries minimum size.\n"); + fprintf(out, " set the listed entries minimum size. The size\n"); + fprintf(out, " can be specified using the G, M, K, and B units.\n"); fprintf(out, "\n"); fprintf(out, "Report bugs and comments to .\n"); } @@ -386,7 +418,9 @@ void usage(FILE *out) { /**********************************************************************/ static struct option long_options[] = { + { "version", no_argument, 0, 'v' }, { "ignore-dots", no_argument, 0, 'd' }, + { "ignore-protected", no_argument, 0, 'i' }, { "reverse-order", no_argument, 0, 'r' }, { "show-top", no_argument, 0, 't' }, { "help", no_argument, 0, 'h' }, @@ -406,14 +440,23 @@ int main(int argc, char **argv) { setlocale (LC_ALL, ""); - while ((c = getopt_long(argc, argv, "dfrtl:c:m:hd", + while ((c = getopt_long(argc, argv, "ivdfrtl:c:m:hd", long_options, NULL)) != -1) { switch (c) { + case 'v': + printf("dus version %s (%s)\n", VERSION_NUMBER, UNAME); + exit(EXIT_SUCCESS); + break; + case 'd': ignore_dotfiles = 1; break; + case 'i': + ignore_protected_files = 1; + break; + case 'f': fancy_size_display = 1; break;