X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dus.git;a=blobdiff_plain;f=dus.c;h=5b19766514119eee7d28680e7ceae0c8f042eb4e;hp=9f050717dc9b2a0866803f1f987815a1528bdf6a;hb=acb173574185b068ee9c46d244900c81fa31a947;hpb=9dcd9ccfb923fb815825b354ff51028d206925e1

diff --git a/dus.c b/dus.c
index 9f05071..5b19766 100644
--- a/dus.c
+++ b/dus.c
@@ -1,9 +1,9 @@
 
 /*
- *  dus is a simple utility designed to display the list of files and
- *  directories with disk occupancy, sorted according to it.
+ *  dus is a simple utility to display the files and directories
+ *  according to their total disk occupancy.
  *
- *  Copyright (c) 2009 Francois Fleuret
+ *  Copyright (c) 2010 Francois Fleuret
  *  Written by Francois Fleuret <francois@fleuret.org>
  *
  *  This file is part of dus.
@@ -32,18 +32,23 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
+#include <sys/ioctl.h>
 
-size_t file_or_dir_size(char *name) {
+#define BUFFER_SIZE 1024
+
+typedef int64_t size_sum_t;
+
+size_sum_t file_or_dir_size(char *name) {
   DIR *dir;
   struct dirent *dir_e;
   struct stat dummy;
-  size_t result;
-  char subname[1024];
+  size_sum_t result;
+  char subname[BUFFER_SIZE];
 
   result = 0;
 
   if(lstat(name, &dummy) != 0) {
-    printf("Can not stat %s (%s).\n", name, strerror(errno));
+    printf("Can not stat %s: %s\n", name, strerror(errno));
     exit (1);
   }
 
@@ -57,13 +62,14 @@ size_t file_or_dir_size(char *name) {
     while((dir_e = readdir(dir))) {
       if(strcmp(dir_e->d_name, ".") &&
          strcmp(dir_e->d_name, "..")) {
-        sprintf(subname, "%s/%s", name, dir_e->d_name);
+        snprintf(subname, BUFFER_SIZE, "%s/%s", name, dir_e->d_name);
         result += file_or_dir_size(subname);
       }
     }
     closedir(dir);
   } else {
     if(S_ISREG(dummy.st_mode)) {
+      /* printf("%d %s\n", dummy.st_size, name); */
       result += dummy.st_size;
     }
   }
@@ -75,7 +81,7 @@ size_t file_or_dir_size(char *name) {
 
 struct file_with_size {
   char *filename;
-  size_t size;
+  size_sum_t size;
   struct file_with_size *next;
 };
 
@@ -100,10 +106,26 @@ void destroy(struct file_with_size *node) {
 
 /**********************************************************************/
 
-void print_sorted(struct file_with_size *root) {
+int compare_files(const void *x1, const void *x2) {
+  const struct file_with_size **f1, **f2;
+
+  f1 = (const struct file_with_size **) x1;
+  f2 = (const struct file_with_size **) x2;
+
+  if((*f1)->size < (*f2)->size) {
+    return -1;
+  } else if((*f1)->size > (*f2)->size) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+
+void print_sorted(struct file_with_size *root, int height) {
   struct file_with_size *node;
   struct file_with_size **nodes;
-  int nb, n;
+  int nb, n, first;
 
   nb = 0;
   for(node = root; node; node = node->next) {
@@ -117,8 +139,38 @@ void print_sorted(struct file_with_size *root) {
     nodes[n++] = node;
   }
 
+  qsort(nodes, nb, sizeof(struct file_with_size *), compare_files);
+
+  /*
   for(n = 0; n < nb; n++) {
-    printf("%u %s\n", nodes[n]->size, nodes[n]->filename);
+    printf("%lld %s\n",
+           nodes[n]->size,
+           nodes[n]->filename);
+  }
+  */
+
+  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);
+    }
   }
 
   free(nodes);
@@ -131,11 +183,36 @@ int main(int argc, char **argv) {
   struct file_with_size *root;
 
   root = 0;
-  for(k = 1; k < argc; k++) {
-    root = create(argv[k], root);
+
+  if(argc > 1) {
+    for(k = 1; k < argc; k++) {
+      root = create(argv[k], root);
+    }
+  } else {
+    DIR *dir;
+    struct dirent *dir_e;
+    dir = opendir(".");
+    if(dir) {
+      while((dir_e = readdir(dir))) {
+        if(strcmp(dir_e->d_name, ".") &&
+           strcmp(dir_e->d_name, "..")) {
+          root = create(dir_e->d_name, root);
+        }
+      }
+      closedir(dir);
+    }
   }
 
-  print_sorted(root);
+  if(isatty(STDOUT_FILENO)) {
+    struct winsize win;
+    if(ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
+      printf("Can not get the tty size: %s\n", strerror(errno));
+      exit (1);
+    }
+    print_sorted(root, win.ws_row - 2);
+  } else {
+    print_sorted(root, -1);
+  }
 
   destroy(root);