From: Francois Fleuret <francois@fleuret.org>
Date: Wed, 18 Aug 2010 15:30:44 +0000 (+0200)
Subject: Added the -i option to ignore protected files and directories.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=b7c335904088b20ca454b5955d43c04facc7a353;p=dus.git

Added the -i option to ignore protected files and directories.
---

diff --git a/dus.1 b/dus.1
index 173783f..e791861 100644
--- a/dus.1
+++ b/dus.1
@@ -32,6 +32,9 @@ print the version number and exit
 \fB-d\fR, \fB--ignore-dots\fR
 ignore files and directories whose name starts with a dot
 .TP
+\fB-i\fR, \fB--ignore-protected\fR
+ignore files and directories for which we do not have permission
+.TP
 \fB-f\fR, \fB--fancy\fR
 display floating point size with K, M and G units
 .TP
diff --git a/dus.c b/dus.c
index 2947b5a..7cdf03e 100644
--- a/dus.c
+++ b/dus.c
@@ -66,6 +66,10 @@ 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
+                                   ? */
+
 /********************************************************************/
 
 /* malloc with error checking.  */
@@ -121,10 +125,12 @@ size_sum_t entry_size(const char *name) {
       }
       closedir(dir);
     } else {
-      fprintf(stderr,
-              "dus: Can not open directory %s: %s\n",
-              name, strerror(errno));
-      exit(EXIT_FAILURE);
+      if(!(errno == EACCES && ignore_protected_files)) {
+        fprintf(stderr,
+                "dus: Can not open directory %s: %s\n",
+                name, strerror(errno));
+        exit(EXIT_FAILURE);
+      }
     }
   } else if(S_ISREG(dummy.st_mode)) {
     result += dummy.st_size;
@@ -385,6 +391,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, "   -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");
@@ -408,6 +416,7 @@ void usage(FILE *out) {
 static struct option long_options[] = {
   { "version", no_argument, 0, 'v' },
   { "ignore-dots", no_argument, 0, 'd' },
+  { "ignore-protected", no_argument, 0, 'i' },
   { "reverse-order", no_argument, 0, 'r' },
   { "show-top", no_argument, 0, 't' },
   { "help", no_argument, 0, 'h' },
@@ -427,7 +436,7 @@ int main(int argc, char **argv) {
 
   setlocale (LC_ALL, "");
 
-  while ((c = getopt_long(argc, argv, "vdfrtl:c:m:hd",
+  while ((c = getopt_long(argc, argv, "ivdfrtl:c:m:hd",
                           long_options, NULL)) != -1) {
     switch (c) {
 
@@ -440,6 +449,10 @@ int main(int argc, char **argv) {
       ignore_dotfiles = 1;
       break;
 
+    case 'i':
+      ignore_protected_files = 1;
+      break;
+
     case 'f':
       fancy_size_display = 1;
       break;