From a05803ca317f043c88c4c7e6a3f5390fbc996697 Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Fri, 26 Feb 2010 18:17:51 +0100 Subject: [PATCH] Added the option parsing. --- dus.c | 137 ++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 104 insertions(+), 33 deletions(-) diff --git a/dus.c b/dus.c index a4b5d0a..3a4d7f4 100644 --- a/dus.c +++ b/dus.c @@ -34,12 +34,22 @@ #include #include #include +#include #define BUFFER_SIZE 4096 typedef int64_t size_sum_t; -int ignore_dotfiles = 1; +/* Yeah, global variables! */ + +int ignore_dotfiles = 0; /* 1 means ignore files and directories + starting with a dot */ + +int forced_height = 0; /* -1 means no height limit, strictly positive + means limit, 0 means not active */ + +int fancy_size_display = 0; /* 1 means to use floating values with K, M and G + as units */ /********************************************************************/ @@ -50,6 +60,21 @@ int ignore_entry(const char *name) { (ignore_dotfiles && name[0] == '.'); } +void print_size_sum(size_sum_t s) { + char tmp[100]; + char *a = tmp + sizeof(tmp)/sizeof(char); + *(--a) = '\0'; + if(s) { + while(s) { + *(--a) = s%10 + '0'; + s /= 10; + } + } else { + *(--a) = '0'; + } + printf(a); +} + size_sum_t file_or_dir_size(const char *name) { DIR *dir; struct dirent *dir_e; @@ -61,7 +86,7 @@ size_sum_t file_or_dir_size(const char *name) { if(lstat(name, &dummy) != 0) { printf("Can not stat %s: %s\n", name, strerror(errno)); - exit (1); + exit(EXIT_FAILURE); } if(S_ISLNK(dummy.st_mode)) { @@ -80,7 +105,6 @@ size_sum_t file_or_dir_size(const char *name) { closedir(dir); } else { if(S_ISREG(dummy.st_mode)) { - /* printf("%d %s\n", dummy.st_size, name); */ result += dummy.st_size; } } @@ -151,35 +175,40 @@ void print_sorted(struct file_with_size *root, int height) { qsort(nodes, nb, sizeof(struct file_with_size *), compare_files); - /* - for(n = 0; n < nb; n++) { - printf("%lld %s\n", - nodes[n]->size, - nodes[n]->filename); + first = 0; + + if(forced_height) { + height = forced_height; } - */ - first = 0; if(height > 0 && height < nb) { first = nb - height; } - for(n = first; n < nb; n++) { - if(nodes[n]->size < 1024) { - printf("% 7d %s\n", - ((int) nodes[n]->size), - nodes[n]->filename); - } else if(nodes[n]->size < 1024 * 1024) { - printf("% 6.1fK %s\n", - ((double) (nodes[n]->size))/(1024.0), - nodes[n]->filename); - } else if(nodes[n]->size < 1024 * 1024 * 1024) { - printf("% 6.1fM %s\n", - ((double) (nodes[n]->size))/(1024.0 * 1024), - nodes[n]->filename); - } else { - printf("% 6.1fG %s\n", - ((double) (nodes[n]->size))/(1024.0 * 1024.0 * 1024.0), - nodes[n]->filename); + + if(fancy_size_display) { + for(n = first; n < nb; n++) { + if(nodes[n]->size < 1024) { + printf("% 7d %s\n", + ((int) nodes[n]->size), + nodes[n]->filename); + } else if(nodes[n]->size < 1024 * 1024) { + printf("% 6.1fK %s\n", + ((double) (nodes[n]->size))/(1024.0), + nodes[n]->filename); + } else if(nodes[n]->size < 1024 * 1024 * 1024) { + printf("% 6.1fM %s\n", + ((double) (nodes[n]->size))/(1024.0 * 1024), + nodes[n]->filename); + } else { + printf("% 6.1fG %s\n", + ((double) (nodes[n]->size))/(1024.0 * 1024.0 * 1024.0), + nodes[n]->filename); + } + } + } else { + for(n = first; n < nb; n++) { + print_size_sum(nodes[n]->size); + printf(" %s\n", nodes[n]->filename); } } @@ -189,16 +218,58 @@ void print_sorted(struct file_with_size *root, int height) { /**********************************************************************/ int main(int argc, char **argv) { - int k; + char c; struct file_with_size *root; root = 0; setlocale (LC_ALL, ""); - if(argc > 1) { - for(k = 1; k < argc; k++) { - root = create(argv[k], root); + while (1) { + c = getopt(argc, argv, "dfl:hdu"); + if (c == -1) + break; + + switch (c) { + + case 'd': + ignore_dotfiles = 1; + break; + + case 'f': + fancy_size_display = 1; + break; + + case 'l': + forced_height = atoi(optarg); + break; + + case 'h': + printf("Usage: dus [OPTION]... [FILE]...\n"); + printf("List files and directories sorted according to their size or content \n"); + printf("size.\n"); + printf("\n"); + printf(" -d do not take into account files starting with a '.'\n"); + printf(" -f display size with float values and K, M and G units.\n"); + printf(" -l specificy the number of lines to display. The value -1\n"); + printf(" corresponds to all the lines. By default the command\n"); + printf(" shows one line less than the number of lines of the TTY,\n"); + printf(" or all the lines if standard output is not a tty\n"); + printf(" -h show this help.\n"); + printf("\n"); + printf("Report bugs and comments to \n"); + exit(EXIT_SUCCESS); + + break; + + default: + exit(EXIT_FAILURE); + } + } + + if (optind < argc) { + while (optind < argc) { + root = create(argv[optind++], root); } } else { DIR *dir; @@ -218,7 +289,7 @@ int main(int argc, char **argv) { struct winsize win; if(ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) { printf("Can not get the tty size: %s\n", strerror(errno)); - exit (1); + exit (EXIT_FAILURE); } print_sorted(root, win.ws_row - 2); } else { @@ -227,5 +298,5 @@ int main(int argc, char **argv) { destroy(root); - exit(0); + exit(EXIT_SUCCESS); } -- 2.20.1