From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Mon, 15 Oct 2007 21:09:38 +0000 (+0100)
Subject: report unreadable tracks and dirs
X-Git-Tag: debian-1_5_99dev8~116
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/ac06ceb3be8d9356b74bcc028a8bed2f8dab07fd

report unreadable tracks and dirs
---

diff --git a/plugins/fs.c b/plugins/fs.c
index fe27d05..167c1dd 100644
--- a/plugins/fs.c
+++ b/plugins/fs.c
@@ -39,12 +39,9 @@ void disorder_scan(const char *path) {
   char *np;
 
   if(stat(path, &sb) < 0) {
-    disorder_error(errno, "cannot lstat %s", path);
+    disorder_error(errno, "cannot stat %s", path);
     return;
   }
-  /* skip files that aren't world-readable */
-  if(!(sb.st_mode & 0004))
-    return;
   if(S_ISDIR(sb.st_mode)) {
     if(!(dp = opendir(path))) {
       disorder_error(errno, "cannot open directory %s", path);
@@ -60,9 +57,14 @@ void disorder_scan(const char *path) {
     if(errno)
       disorder_error(errno, "error reading directory %s", path);
     closedir(dp);
-  } else if(S_ISREG(sb.st_mode))
+  } else if(S_ISREG(sb.st_mode)) {
+    if(access(path, R_OK) < 0) {
+      disorder_error(errno, "cannot access file %s", path);
+      return;
+    }
     if(printf("%s%c", path, 0) < 0)
       disorder_fatal(errno, "error writing to scanner output pipe");
+  }
 }
 
 int disorder_check(const char attribute((unused)) *root, const char *path) {