X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dus.git;a=blobdiff_plain;f=dus.c;h=40d5a16614770dd09130d0bd9e23503d8b5fbc7b;hp=e0b602ef4b929a982b178523ef04f30f4d1760f5;hb=7063266012a2ab0998d1cc7da381f78e014151db;hpb=795c6bdfb9b5d63d404e1ff2e81910ecd7afa2ee diff --git a/dus.c b/dus.c index e0b602e..40d5a16 100644 --- a/dus.c +++ b/dus.c @@ -22,12 +22,13 @@ * */ -#define VERSION_NUMBER "1.0alpha" +#define VERSION_NUMBER "1.1" #define _BSD_SOURCE #include #include +#include #include #include #include @@ -61,6 +62,10 @@ int reverse_sorting = 0; /* 1 means to show the large ones first */ int show_top = 0; /* 1 means to show the top of the sorted list instead of the bottom */ +size_sum_t size_min = -1; /* -1 means no minimum size, otherwise lower + bound on the size to display a + file/dir */ + /********************************************************************/ /* malloc with error checking. */ @@ -95,7 +100,7 @@ void print_size_sum(size_sum_t s) { } else { *(--a) = '0'; } - printf(a); + printf("%s", a); } size_sum_t file_or_dir_size(const char *name) { @@ -103,7 +108,7 @@ size_sum_t file_or_dir_size(const char *name) { struct dirent *dir_e; struct stat dummy; size_sum_t result; - char subname[BUFFER_SIZE]; + char subname[PATH_MAX]; result = 0; @@ -121,7 +126,7 @@ size_sum_t file_or_dir_size(const char *name) { if(dir) { while((dir_e = readdir(dir))) { if(!ignore_entry(dir_e->d_name)) { - snprintf(subname, BUFFER_SIZE, "%s/%s", name, dir_e->d_name); + snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name); result += file_or_dir_size(subname); } } @@ -135,6 +140,31 @@ size_sum_t file_or_dir_size(const char *name) { return result; } +size_sum_t atoss(const char *string) { + size_sum_t total, partial_total; + const char *c; + total = 0; + partial_total = 0; + + for(c = string; *c; c++) { + if(*c >= '0' && *c <= '9') { + partial_total = 10 * partial_total + ((int) (*c - '0')); + } else if(*c == 'K' || *c == 'k') { + total += partial_total * 1024; + partial_total = 0; + } else if(*c == 'M' || *c == 'm') { + total += partial_total * 1024 * 1024; + partial_total = 0; + } else if(*c == 'G' || *c == 'g') { + total += partial_total * 1024 * 1024 * 1024; + partial_total = 0; + } else { + fprintf(stderr, "Syntax error in %s\n", string); + } + } + return total; +} + /**********************************************************************/ struct file_with_size { @@ -218,22 +248,22 @@ void raw_print(char *buffer, char *filename, size_sum_t size) { void fancy_print(char *buffer, char *filename, size_sum_t size) { if(size < 1024) { sprintf(buffer, - "% 7d %s\n", + "% 7d -- %s\n", ((int) size), filename); } else if(size < 1024 * 1024) { sprintf(buffer, - "% 6.1fK %s\n", + "% 6.1fK -- %s\n", ((double) (size))/(1024.0), filename); } else if(size < 1024 * 1024 * 1024) { sprintf(buffer, - "% 6.1fM %s\n", + "% 6.1fM -- %s\n", ((double) (size))/(1024.0 * 1024), filename); } else { sprintf(buffer, - "% 6.1fG %s\n", + "% 6.1fG -- %s\n", ((double) (size))/(1024.0 * 1024.0 * 1024.0), filename); } @@ -243,57 +273,69 @@ void print_sorted(struct file_with_size *root, int width, int height) { char line[BUFFER_SIZE]; struct file_with_size *node; struct file_with_size **nodes; - int nb, n, first, last; + int nb_nodes, n, first, last; - nb = 0; + nb_nodes = 0; for(node = root; node; node = node->next) { - nb++; + nb_nodes++; } - nodes = safe_malloc(nb * sizeof(struct file_with_size *)); + nodes = safe_malloc(nb_nodes * sizeof(struct file_with_size *)); n = 0; for(node = root; node; node = node->next) { nodes[n++] = node; } - qsort(nodes, nb, sizeof(struct file_with_size *), compare_files); + qsort(nodes, nb_nodes, sizeof(struct file_with_size *), compare_files); first = 0; - last = nb; + last = nb_nodes; if(forced_height) { height = forced_height; } - if(height > 0 && height < nb) { - first = nb - height; + if(height >= 0 && nb_nodes > height && !show_top && !forced_height) { + printf("...\n"); + } + + if(height > 0 && height < nb_nodes) { + first = nb_nodes - height; } if(show_top) { n = last; - last = nb - first; - first = nb - n; + last = nb_nodes - first; + first = nb_nodes - n; } for(n = first; n < last; n++) { - if(fancy_size_display) { - fancy_print(line, nodes[n]->filename, nodes[n]->size); - } else { - raw_print(line, nodes[n]->filename, nodes[n]->size); - } - if(width >= 0 && width < BUFFER_SIZE) { - line[width] = '\0'; + if(size_min < 0 || nodes[n]->size >= size_min) { + if(fancy_size_display) { + fancy_print(line, nodes[n]->filename, nodes[n]->size); + } else { + raw_print(line, nodes[n]->filename, nodes[n]->size); + } + if(width >= 0 && width < BUFFER_SIZE) { + line[width] = '\0'; + } + printf(line); } - printf(line); + } + + if(height >= 0 && nb_nodes > height && show_top && !forced_height) { + printf("...\n"); } free(nodes); } + /**********************************************************************/ + void print_help(FILE *out) { fprintf(out, "Usage: dus [OPTION]... [FILE]...\n"); - fprintf(out, "Version %s\n", VERSION_NUMBER); + fprintf(out, "Version %s (%s)\n", VERSION_NUMBER, UNAME); fprintf(out, "List files and directories sorted according to their size or content size. Take the content of the current directory as argument if none is provided.\n"); fprintf(out, "\n"); fprintf(out, " -d ignore files and directories starting with a '.'\n"); @@ -306,6 +348,7 @@ void print_help(FILE *out) { fprintf(out, " not a tty.\n"); fprintf(out, " -l same as -c for number of lines.\n"); fprintf(out, " -h show this help.\n"); + fprintf(out, " -m size min.\n"); fprintf(out, "\n"); fprintf(out, "Report bugs and comments to \n"); } @@ -315,13 +358,14 @@ void print_help(FILE *out) { int main(int argc, char **argv) { int c; struct file_with_size *root; + struct winsize win; root = 0; setlocale (LC_ALL, ""); while (1) { - c = getopt(argc, argv, "dfrtl:c:hdu"); + c = getopt(argc, argv, "dfrtl:c:m:hdu"); if (c == -1) break; @@ -351,6 +395,10 @@ int main(int argc, char **argv) { forced_width = atoi(optarg); break; + case 'm': + size_min = atoss(optarg); + break; + case 'h': print_help(stdout); exit(EXIT_SUCCESS); @@ -384,12 +432,8 @@ int main(int argc, char **argv) { } } - if(isatty(STDOUT_FILENO)) { - struct winsize win; - if(ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) { - fprintf(stderr, "Can not get the tty size: %s\n", strerror(errno)); - exit (EXIT_FAILURE); - } + if(isatty(STDOUT_FILENO) && + !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) { print_sorted(root, win.ws_col, win.ws_row - 2); } else { print_sorted(root, -1, -1);