X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=dus.c;h=872f5c15c23a64f3aa56b109fde4a0317c849de0;hb=59d5b36b07a5632d24dc99839a96b7371de3d445;hp=7cdf03efaef2a9479b8cb50a133d641bbf66c95d;hpb=b7c335904088b20ca454b5955d43c04facc7a353;p=dus.git

diff --git a/dus.c b/dus.c
index 7cdf03e..872f5c1 100644
--- a/dus.c
+++ b/dus.c
@@ -22,7 +22,7 @@
  *
  */
 
-#define VERSION_NUMBER "1.2"
+#define VERSION_NUMBER "1.3"
 
 #define _BSD_SOURCE
 
@@ -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,17 @@ size_sum_t entry_size(const char *name) {
   char subname[PATH_MAX];
 
   result = 0;
+  if(isdir) { *isdir = 0; }
 
   if(lstat(name, &dummy) != 0) {
-    fprintf(stderr,
-            "dus: Can not stat %s: %s\n",
-            name, strerror(errno));
-    exit(EXIT_FAILURE);
+    if(!(errno == EACCES && ignore_protected_files)) {
+      fprintf(stderr,
+              "dus: Can not stat %s: %s\n",
+              name, strerror(errno));
+      exit(EXIT_FAILURE);
+    } else {
+      return 0;
+    }
   }
 
   if(S_ISLNK(dummy.st_mode)) {
@@ -115,12 +120,13 @@ 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);
@@ -183,9 +189,15 @@ struct entry_node {
 
 struct entry_node *push_entry(char *name, struct entry_node *head) {
   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) {
+    result->name = safe_malloc(sizeof(char) * strlen(name) + 2);
+    sprintf(result->name, "%s/", name);
+  } else {
+    result->name = strdup(name);
+  }
   result->next = head;
   return result;
 }
@@ -370,7 +382,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) {