In updatedb, check prunepaths _before_ opening the directory.

[plocate] / updatedb.cpp

diff --git a/updatedb.cpp b/updatedb.cpp
index 188d3c2113f08c7ecd2de6045d9f6694782e6625..3a3915969037bfd925f877c2e3a36a7b535bb635 100644 (file)
--- a/updatedb.cpp
+++ b/updatedb.cpp
@@ -39,6 +39,7 @@ any later version.
 #include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
+#include <inttypes.h>
 #include <iosfwd>
 #include <math.h>
 #include <memory>
@@ -532,14 +533,6 @@ string ExistingDB::read_next_dictionary() const
 // Takes ownership of fd.
 int scan(const string &path, int fd, dev_t parent_dev, dir_time modified, dir_time db_modified, ExistingDB *existing_db, DatabaseReceiver *corpus, DictionaryBuilder *dict_builder)
 {
-       if (string_list_contains_dir_path(&conf_prunepaths, &conf_prunepaths_index, path)) {
-               if (conf_debug_pruning) {
-                       /* This is debugging output, don't mark anything for translation */
-                       fprintf(stderr, "Skipping `%s': in prunepaths\n", path.c_str());
-               }
-               close(fd);
-               return 0;
-       }
        if (conf_prune_bind_mounts && is_bind_mount(path.c_str())) {
                if (conf_debug_pruning) {
                        /* This is debugging output, don't mark anything for translation */
@@ -610,8 +603,12 @@ int scan(const string &path, int fd, dev_t parent_dev, dir_time modified, dir_ti
        } else {
                dir = fdopendir(fd);  // Takes over ownership of fd.
                if (dir == nullptr) {
-                       perror("fdopendir");
-                       exit(1);
+                       // fdopendir() wants to fstat() the fd to verify that it's indeed
+                       // a directory, which can seemingly fail on at least CIFS filesystems
+                       // if the server feels like it. We treat this as if we had an error
+                       // on opening it, ie., ignore the directory.
+                       close(fd);
+                       return 0;
                }
 
                dirent *de;
@@ -692,6 +689,13 @@ int scan(const string &path, int fd, dev_t parent_dev, dir_time modified, dir_ti
                        }
                        continue;
                }
+               if (string_list_contains_dir_path(&conf_prunepaths, &conf_prunepaths_index, (path_plus_slash + e.name).c_str())) {
+                       if (conf_debug_pruning) {
+                               /* This is debugging output, don't mark anything for translation */
+                               fprintf(stderr, "Skipping `%s/%s': in prunepaths\n", path.c_str(), e.name.c_str());
+                       }
+                       continue;
+               }
 
                e.fd = opendir_noatime(fd, e.name.c_str());
                if (e.fd == -1) {
@@ -703,8 +707,8 @@ int scan(const string &path, int fd, dev_t parent_dev, dir_time modified, dir_ti
                                if (getrlimit(RLIMIT_NOFILE, &rlim) == -1) {
                                        fprintf(stderr, "Hint: Try `ulimit -n 131072' or similar.\n");
                                } else {
-                                       fprintf(stderr, "Hint: Try `ulimit -n %lu' or similar (current limit is %lu).\n",
-                                               rlim.rlim_cur * 2, rlim.rlim_cur);
+                                       fprintf(stderr, "Hint: Try `ulimit -n %" PRIu64 " or similar (current limit is %" PRIu64 ").\n",
+                                               static_cast<uint64_t>(rlim.rlim_cur * 2), static_cast<uint64_t>(rlim.rlim_cur));
                                }
                                exit(1);
                        }