X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dus.git;a=blobdiff_plain;f=dus.c;h=f1be9f2fb4d5ae9369ce7a4e4895177ac6c11192;hp=6e39dcaca145dc371296c46a08d2078a074dbf67;hb=8f34c2a3b6f0f23f9125f75d35955df3b01d8140;hpb=c59b1d9a2f8e2f78c175d073baea328952c3310a

diff --git a/dus.c b/dus.c
index 6e39dca..f1be9f2 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 <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #include <dirent.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -99,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) {
@@ -107,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;
 
@@ -125,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);
       }
     }
@@ -272,37 +273,41 @@ 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++) {
@@ -319,25 +324,39 @@ void print_sorted(struct file_with_size *root, int width, int height) {
     }
   }
 
+  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 (%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 <cols>   specificy the number of columns to display. The value -1\n");
+  fprintf(out, "   -d, --ignore-dots\n");
+  fprintf(out, "               ignore files and directories starting with a '.'\n");
+  fprintf(out, "   -f, --fancy\n");
+  fprintf(out, "               display size with float values and K, M and G units.\n");
+  fprintf(out, "   -r, --reverse-order\n");
+  fprintf(out, "               reverse the sorting order.\n");
+  fprintf(out, "   -t, --show-top\n");
+  fprintf(out, "               show the top of the list.\n");
+  fprintf(out, "   -c <cols>, --nb-columns <cols>\n");
+  fprintf(out, "               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 <lines>  same as -c for number of lines.\n");
-  fprintf(out, "   -h          show this help.\n");
-  fprintf(out, "   -m <size>   size min.\n");
+  fprintf(out, "   -l <lines>, --nb-lines <lines>\n");
+  fprintf(out, "               same as -c for number of lines.\n");
+  fprintf(out, "   -h, --help\n");
+  fprintf(out, "               show this help.\n");
+  fprintf(out, "   -m <size>, --size-min <size>\n");
+  fprintf(out, "               set the listed entries minimum size.\n");
   fprintf(out, "\n");
   fprintf(out, "Report bugs and comments to <francois@fleuret.org>\n");
 }
@@ -354,7 +373,21 @@ int main(int argc, char **argv) {
   setlocale (LC_ALL, "");
 
   while (1) {
-    c = getopt(argc, argv, "dfrtl:c:m:hdu");
+    int option_index = 0;
+    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 }
+    };
+
+    c = getopt_long(argc, argv, "dfrtl:c:m:hd",
+                    long_options, &option_index);
     if (c == -1)
       break;