X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=dus.c;h=7cdf03efaef2a9479b8cb50a133d641bbf66c95d;hb=b7c335904088b20ca454b5955d43c04facc7a353;hp=4acc5173a3a4dabc972ee520250eb38977e26b8e;hpb=3095e1570e1f1d4edf264b07480c256a2691b43c;p=dus.git

diff --git a/dus.c b/dus.c
index 4acc517..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.  */
@@ -73,7 +77,9 @@ size_sum_t size_min = -1; /* -1 means no minimum size, otherwise lower
 void *safe_malloc(size_t n) {
   void *p = malloc(n);
   if (!p && n != 0) {
-    fprintf(stderr, "dus: Can not allocate memory: %s\n", strerror(errno));
+    fprintf(stderr,
+            "dus: Can not allocate memory: %s\n",
+            strerror(errno));
     exit(EXIT_FAILURE);
   }
   return p;
@@ -98,7 +104,9 @@ size_sum_t entry_size(const char *name) {
   result = 0;
 
   if(lstat(name, &dummy) != 0) {
-    fprintf(stderr, "dus: Can not stat %s: %s\n", name, strerror(errno));
+    fprintf(stderr,
+            "dus: Can not stat %s: %s\n",
+            name, strerror(errno));
     exit(EXIT_FAILURE);
   }
 
@@ -117,8 +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;
@@ -149,7 +161,9 @@ size_sum_t atoss(const char *string) {
       total += partial_total * 1024 * 1024 * 1024;
       partial_total = 0;
     } else {
-      fprintf(stderr, "dus: Syntax error in size specification `%s'\n", string);
+      fprintf(stderr,
+              "dus: Syntax error in size specification `%s'\n",
+              string);
       exit(EXIT_FAILURE);
     }
   }
@@ -190,7 +204,9 @@ struct entry_node *push_dir_content(char *name, struct entry_node *head) {
     }
     closedir(dir);
   } else {
-    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));
     exit (EXIT_FAILURE);
   }
   return head;
@@ -240,7 +256,8 @@ void raw_print(char *buffer, size_t buffer_size,
   b = buffer;
   do {
     if(b >= buffer + buffer_size) {
-      fprintf(stderr, "dus: Buffer overflow in raw_print (hu?!).\n");
+      fprintf(stderr,
+              "dus: Buffer overflow in raw_print (hu?!).\n");
       exit(EXIT_FAILURE);
     }
     *(b++) = size%10 + '0';
@@ -371,7 +388,11 @@ void usage(FILE *out) {
   fprintf(out, "Lists files and directories according to their size. The sizes are computed by summing recursively exact file sizes through directories. If a given directory has its name appended with '/', it is not listed, but the elements it contains are. If no files or directories are provided as arguments, the current directory is used as default.\n");
   fprintf(out, "\n");
   /*            01234567890123456789012345678901234567890123456789012345678901234567890123456789*/
+  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");
@@ -383,7 +404,6 @@ void usage(FILE *out) {
   fprintf(out, "                              if the stdout is not a tty.\n");
   fprintf(out, "   -l <lines>, --nb-lines <lines>\n");
   fprintf(out, "                              same as -c for number of lines.\n");
-  fprintf(out, "   -h, --help                 show this help.\n");
   fprintf(out, "   -m <size>, --size-min <size>\n");
   fprintf(out, "                              set the listed entries minimum size. The size\n");
   fprintf(out, "                              can be specified using the G, M, K, and B units.\n");
@@ -396,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' },
@@ -415,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) {
 
@@ -428,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;