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

diff --git a/dus.c b/dus.c
index 9d1850c..2bb1e89 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,6 +102,7 @@ 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)) {
@@ -119,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);
@@ -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) {