X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=dus.c;h=780d36084a2a260f2d681dd0a9305ae6f0edfb39;hb=622f9a38a823a17f47dfcc2956a3b3606299d949;hp=63cc183c30acadfd523cd1002953f6c7621b128b;hpb=e708ca19d1b2345e001050b327ffbbbf5e09e88c;p=dus.git

diff --git a/dus.c b/dus.c
index 63cc183..780d360 100644
--- a/dus.c
+++ b/dus.c
@@ -22,7 +22,7 @@
  *
  */
 
-#define VERSION_NUMBER "1.1"
+#define VERSION_NUMBER "1.2"
 
 #define _BSD_SOURCE
 
@@ -85,7 +85,7 @@ int ignore_entry(const char *name) {
   return
     strcmp(name, ".") == 0 ||
     strcmp(name, "..") == 0 ||
-    (ignore_dotfiles && name[0] == '.'  && name[1] != '/');
+    (ignore_dotfiles && name[0] == '.' && name[1] != '/');
 }
 
 size_sum_t entry_size(const char *name) {
@@ -167,6 +167,26 @@ struct entry_node *push_entry(char *name, struct entry_node *head) {
   return result;
 }
 
+struct entry_node *push_dir_content(char *name, struct entry_node *head) {
+  char subname[PATH_MAX];
+  DIR *dir;
+  struct dirent *dir_e;
+  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);
+        head = push_entry(subname, head);
+      }
+    }
+    closedir(dir);
+  } else {
+    fprintf(stderr, "Can not open directory %s: %s\n", name, strerror(errno));
+    exit (EXIT_FAILURE);
+  }
+  return head;
+}
+
 void destroy_entry_list(struct entry_node *node) {
   struct entry_node *next;
   while(node) {
@@ -375,7 +395,7 @@ static struct option long_options[] = {
 };
 
 int main(int argc, char **argv) {
-  int c;
+  int c, l;
   struct entry_node *root;
   struct winsize win;
 
@@ -429,23 +449,16 @@ int main(int argc, char **argv) {
 
   if (optind < argc) {
     while (optind < argc) {
-      root = push_entry(argv[optind++], root);
-    }
-  } else {
-    DIR *dir;
-    struct dirent *dir_e;
-    dir = opendir(".");
-    if(dir) {
-      while((dir_e = readdir(dir))) {
-        if(!ignore_entry(dir_e->d_name)) {
-          root = push_entry(dir_e->d_name, root);
-        }
+      l = strlen(argv[optind]);
+      if(l > 0 && argv[optind][l - 1] == '/') {
+        argv[optind][l - 1] = '\0';
+        root = push_dir_content(argv[optind++], root);
+      } else {
+        root = push_entry(argv[optind++], root);
       }
-      closedir(dir);
-    } else {
-      fprintf(stderr, "Can not open ./: %s\n", strerror(errno));
-      exit (EXIT_FAILURE);
     }
+  } else {
+    root = push_dir_content(".", root);
   }
 
   if(isatty(STDOUT_FILENO) &&