Added "..." to tty display when the list is truncated.

[dus.git] / dus.c

diff --git a/dus.c b/dus.c
index 736b136..40d5a16 100644 (file)
--- 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,9 +324,15 @@ 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);
@@ -347,6 +358,7 @@ void print_help(FILE *out) {
 int main(int argc, char **argv) {
   int c;
   struct file_with_size *root;
+  struct winsize win;
 
   root = 0;
 
@@ -420,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);