X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dus.git;a=blobdiff_plain;f=dus.c;h=ac1a7d38203959a12993d7e0d5952a2d9e4f627f;hp=9d1850cc36af64df4cb615fcc54c6436b4b64cd4;hb=HEAD;hpb=9931cb5194ed160f999e4e2d107a719445e1cf07

diff --git a/dus.c b/dus.c
index 9d1850c..ac1a7d3 100644
--- a/dus.c
+++ b/dus.c
@@ -3,7 +3,7 @@
  *  dus is a simple utility to display the files and directories
  *  according to their total disk occupancy.
  *
- *  Copyright (c) 2010 Francois Fleuret
+ *  Copyright (c) 2010, 2011 Francois Fleuret
  *  Written by Francois Fleuret <francois@fleuret.org>
  *
  *  This file is part of dus.
@@ -22,9 +22,9 @@
  *
  */
 
-#define VERSION_NUMBER "1.2"
+#define VERSION_NUMBER "1.3"
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -66,9 +66,9 @@ size_sum_t size_min = -1; /* -1 means no minimum size, otherwise lower
                               bound on the size to display a
                               file/dir */
 
-int ignore_protected_files = 0; /* Should we simply ignore files or
-                                   directories which are protected
-                                   ? */
+int dont_exit_on_protected_files = 0; /* Should we go on when we meet
+                                         files or directories which
+                                         are protected ? */
 
 /********************************************************************/
 
@@ -94,7 +94,7 @@ int ignore_entry(const char *name) {
     (ignore_dotfiles && name[0] == '.' && name[1] != '/');
 }
 
-size_sum_t entry_size(const char *name) {
+size_sum_t entry_size(const char *name, int *isdir) {
   DIR *dir;
   struct dirent *dir_e;
   struct stat dummy;
@@ -102,12 +102,13 @@ size_sum_t entry_size(const char *name) {
   char subname[PATH_MAX];
 
   result = 0;
+  if(isdir) { *isdir = 0; }
 
   if(lstat(name, &dummy) != 0) {
-    if(!(errno == EACCES && ignore_protected_files)) {
-      fprintf(stderr,
-              "dus: Can not stat %s: %s\n",
-              name, strerror(errno));
+    fprintf(stderr,
+            "dus: Can not stat %s: %s\n",
+            name, strerror(errno));
+    if(!(errno == EACCES && dont_exit_on_protected_files)) {
       exit(EXIT_FAILURE);
     } else {
       return 0;
@@ -119,20 +120,21 @@ size_sum_t entry_size(const char *name) {
   }
 
   if(S_ISDIR(dummy.st_mode)) {
+    if(isdir) { *isdir = 1; }
     dir = opendir(name);
     if(dir) {
       while((dir_e = readdir(dir))) {
         if(!ignore_entry(dir_e->d_name)) {
           snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name);
-          result += entry_size(subname);
+          result += entry_size(subname, 0);
         }
       }
       closedir(dir);
     } else {
-      if(!(errno == EACCES && ignore_protected_files)) {
-        fprintf(stderr,
-                "dus: Can not open directory %s: %s\n",
-                name, strerror(errno));
+      fprintf(stderr,
+              "dus: Can not open directory %s: %s\n",
+              name, strerror(errno));
+      if(!(errno == EACCES && dont_exit_on_protected_files)) {
         exit(EXIT_FAILURE);
       }
     }
@@ -186,10 +188,17 @@ struct entry_node {
 };
 
 struct entry_node *push_entry(char *name, struct entry_node *head) {
+  char tmp_name[PATH_MAX];
   struct entry_node *result;
+  int isdir;
   result = safe_malloc(sizeof(struct entry_node));
-  result->name = strdup(name);
-  result->size = entry_size(name);
+  result->size = entry_size(name, &isdir);
+  if(isdir) {
+    snprintf(tmp_name, PATH_MAX, "%s/", name);
+    result->name = strdup(tmp_name);
+  } else {
+    result->name = strdup(name);
+  }
   result->next = head;
   return result;
 }
@@ -286,25 +295,25 @@ void fancy_print(char *buffer, size_t buffer_size,
   if(size < 1024) {
     snprintf(buffer,
              buffer_size,
-             "% 8d -- %s\n",
+             "% 8d %s\n",
              ((int) size),
              filename);
   } else if(size < 1024 * 1024) {
     snprintf(buffer,
              buffer_size,
-             "% 7.1fK -- %s\n",
+             "% 7.1fK %s\n",
              ((double) (size))/(1024.0),
              filename);
   } else if(size < 1024 * 1024 * 1024) {
     snprintf(buffer,
              buffer_size,
-             "% 7.1fM -- %s\n",
+             "% 7.1fM %s\n",
              ((double) (size))/(1024.0 * 1024),
              filename);
   } else {
     snprintf(buffer,
              buffer_size,
-             "% 7.1fG -- %s\n",
+             "% 7.1fG %s\n",
              ((double) (size))/(1024.0 * 1024.0 * 1024.0),
              filename);
   }
@@ -374,7 +383,7 @@ void print_sorted(struct entry_node *root, int width, int height) {
       line[width] = '\n';
       line[width + 1] = '\0';
     }
-    printf(line);
+    printf("%s", line);
   }
 
   if(height >= 0 && nb_nodes > height && show_top && !forced_height) {
@@ -395,8 +404,8 @@ void usage(FILE *out) {
   fprintf(out, "   -h, --help                 show this help.\n");
   fprintf(out, "   -v, --version              prints the version number and exit\n");
   fprintf(out, "   -d, --ignore-dots          ignore files and directories starting with a '.'\n");
-  fprintf(out, "   -i, --ignore-protected     ignore files and directories for which we do not\n");
-  fprintf(out, "                              have permission\n");
+  fprintf(out, "   -i, --ignore-protected     do not exit when visiting files and directories\n");
+  fprintf(out, "                              for which we do not have permission\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");
@@ -454,7 +463,7 @@ int main(int argc, char **argv) {
       break;
 
     case 'i':
-      ignore_protected_files = 1;
+      dont_exit_on_protected_files = 1;
       break;
 
     case 'f':