X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dus.git;a=blobdiff_plain;f=dus.c;h=d361712c3660110a1d97753aa68446ccfb40a12a;hp=736b136f795c6d7953259a7a80a0a7666745b06a;hb=d98a016c96a3c0593838532465178b1ae82efabc;hpb=934e451507e97423741a3e38eb591a095c46726b diff --git a/dus.c b/dus.c index 736b136..d361712 100644 --- a/dus.c +++ b/dus.c @@ -22,12 +22,13 @@ * */ -#define VERSION_NUMBER "1.1alpha" +#define VERSION_NUMBER "1.1" #define _BSD_SOURCE #include #include +#include #include #include #include @@ -88,7 +89,7 @@ int ignore_entry(const char *name) { } void print_size_sum(size_sum_t s) { - char tmp[100]; + char tmp[128]; char *a = tmp + sizeof(tmp)/sizeof(char); *(--a) = '\0'; if(s) { @@ -99,15 +100,15 @@ 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) { +size_sum_t entry_size(const char *name) { DIR *dir; struct dirent *dir_e; struct stat dummy; size_sum_t result; - char subname[BUFFER_SIZE]; + char subname[PATH_MAX]; result = 0; @@ -125,8 +126,8 @@ 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); - result += file_or_dir_size(subname); + snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name); + result += entry_size(subname); } } closedir(dir); @@ -166,26 +167,26 @@ size_sum_t atoss(const char *string) { /**********************************************************************/ -struct file_with_size { - char *filename; +struct entry_node { + struct entry_node *next; + char *name; size_sum_t size; - struct file_with_size *next; }; -struct file_with_size *create(char *name, struct file_with_size *current) { - struct file_with_size *result; - result = safe_malloc(sizeof(struct file_with_size)); - result->filename = strdup(name); - result->size = file_or_dir_size(name); - result->next = current; +struct entry_node *push_entry(char *name, struct entry_node *head) { + struct entry_node *result; + result = safe_malloc(sizeof(struct entry_node)); + result->name = strdup(name); + result->size = entry_size(name); + result->next = head; return result; } -void destroy(struct file_with_size *node) { - struct file_with_size *next; +void destroy_entry_list(struct entry_node *node) { + struct entry_node *next; while(node) { next = node->next; - free(node->filename); + free(node->name); free(node); node = next; } @@ -194,10 +195,10 @@ void destroy(struct file_with_size *node) { /**********************************************************************/ int compare_files(const void *x1, const void *x2) { - const struct file_with_size **f1, **f2; + const struct entry_node **f1, **f2; - f1 = (const struct file_with_size **) x1; - f2 = (const struct file_with_size **) x2; + f1 = (const struct entry_node **) x1; + f2 = (const struct entry_node **) x2; if(reverse_sorting) { if((*f1)->size < (*f2)->size) { @@ -241,7 +242,7 @@ void raw_print(char *buffer, char *filename, size_sum_t size) { *(b++) = ' '; - sprintf(b, " %s\n", filename); + sprintf(b, "%s\n", filename); } void fancy_print(char *buffer, char *filename, size_sum_t size) { @@ -268,95 +269,127 @@ void fancy_print(char *buffer, char *filename, size_sum_t size) { } } -void print_sorted(struct file_with_size *root, int width, int height) { +void print_sorted(struct entry_node *root, int width, int height) { char line[BUFFER_SIZE]; - struct file_with_size *node; - struct file_with_size **nodes; - int nb, n, first, last; + struct entry_node *node; + struct entry_node **nodes; + int nb_nodes, n, first, last; - nb = 0; + nb_nodes = 0; for(node = root; node; node = node->next) { - nb++; + if(size_min < 0 || node->size >= size_min) { + nb_nodes++; + } } - nodes = safe_malloc(nb * sizeof(struct file_with_size *)); + nodes = safe_malloc(nb_nodes * sizeof(struct entry_node *)); n = 0; for(node = root; node; node = node->next) { - nodes[n++] = node; + if(size_min < 0 || node->size >= size_min) { + nodes[n++] = node; + } } - qsort(nodes, nb, sizeof(struct file_with_size *), compare_files); + qsort(nodes, nb_nodes, sizeof(struct entry_node *), compare_files); first = 0; - last = nb; + last = nb_nodes; if(forced_height) { height = forced_height; } - if(height > 0 && height < nb) { - first = nb - height; + if(forced_width) { + width = forced_width; + } + + 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(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); + if(fancy_size_display) { + fancy_print(line, nodes[n]->name, nodes[n]->size); + } else { + raw_print(line, nodes[n]->name, nodes[n]->size); + } + if(width >= 1 && width + 1 < BUFFER_SIZE && line[width]) { + line[width] = '\n'; + line[width + 1] = '\0'; } + printf(line); + } + + if(height >= 0 && nb_nodes > height && show_top && !forced_height) { + printf("...\n"); } free(nodes); } + /**********************************************************************/ -void print_help(FILE *out) { + +void usage(FILE *out) { fprintf(out, "Usage: dus [OPTION]... [FILE]...\n"); 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"); - fprintf(out, " -f display size with float values and K, M and G units.\n"); - fprintf(out, " -r reverse the sorting order.\n"); - fprintf(out, " -t show the top of the list.\n"); - fprintf(out, " -c specificy the number of columns to display. The value -1\n"); - fprintf(out, " corresponds to no constraint. By default the command\n"); - fprintf(out, " uses the tty width, or no constraint if the stdout is\n"); - 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"); + /* 01234567890123456789012345678901234567890123456789012345678901234567890123456789*/ + fprintf(out, " -d, --ignore-dots ignore files and directories starting with a '.'\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"); + fprintf(out, " -t, --show-top show the top of the list.\n"); + fprintf(out, " -c , --nb-columns \n"); + fprintf(out, " specificy the number of columns to display. The\n"); + fprintf(out, " value -1 corresponds to no constraint. By default\n"); + fprintf(out, " the command uses the tty width, or no constraint\n"); + 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, "\n"); - fprintf(out, "Report bugs and comments to \n"); + fprintf(out, "Report bugs and comments to .\n"); } /**********************************************************************/ +static struct option long_options[] = { + { "ignore-dots", no_argument, 0, 'd' }, + { "reverse-order", no_argument, 0, 'r' }, + { "show-top", no_argument, 0, 't' }, + { "help", no_argument, 0, 'h' }, + { "fancy", no_argument, 0, 'f' }, + { "nb-columns", 1, 0, 'c' }, + { "nb-lines", 1, 0, 'l' }, + { "size-min", 1, 0, 'm' }, + { 0, 0, 0, 0 } +}; + int main(int argc, char **argv) { int c; - struct file_with_size *root; + struct entry_node *root; + struct winsize win; root = 0; setlocale (LC_ALL, ""); - while (1) { - c = getopt(argc, argv, "dfrtl:c:m:hdu"); - if (c == -1) - break; - + while ((c = getopt_long(argc, argv, "dfrtl:c:m:hd", + long_options, NULL)) != -1) { switch (c) { case 'd': @@ -388,20 +421,20 @@ int main(int argc, char **argv) { break; case 'h': - print_help(stdout); + usage(stdout); exit(EXIT_SUCCESS); break; default: - print_help(stderr); + usage(stderr); exit(EXIT_FAILURE); } } if (optind < argc) { while (optind < argc) { - root = create(argv[optind++], root); + root = push_entry(argv[optind++], root); } } else { DIR *dir; @@ -410,7 +443,7 @@ int main(int argc, char **argv) { if(dir) { while((dir_e = readdir(dir))) { if(!ignore_entry(dir_e->d_name)) { - root = create(dir_e->d_name, root); + root = push_entry(dir_e->d_name, root); } } closedir(dir); @@ -420,18 +453,14 @@ 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); } - destroy(root); + destroy_entry_list(root); exit(EXIT_SUCCESS); }