Merge playlist branch against trunk to date.

[disorder] / plugins / fs.c

diff --git a/plugins/fs.c b/plugins/fs.c
index 3212a044b2d2e94433092490f884a7b5088643f1..1099d145465d4da9bb0658451c31b74ea7eaecf6 100644 (file)
--- a/plugins/fs.c
+++ b/plugins/fs.c
@@ -1,23 +1,23 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004 Richard Kettlewell
+ * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file plugins/fs.c
+ * @brief Plugin to find tracks in a filesystem
  */
-
 #include <config.h>
 
 #include <string.h>
@@ -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) {
@@ -82,4 +84,3 @@ c-basic-offset:2
 comment-column:40
 End:
 */
-/* arch-tag:070e62d92ebc26329f0a3961d615476f */