X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=updatedb.cpp;h=895b0715b05afce634a8916f576ccdf833230654;hb=498466c6434e479cd973fe7655b4feb51dd2c378;hp=1be25e2d4b06cae61c7a057f520a9af8020819ad;hpb=8c4414230a7961c21da0b71c22df5d72572e7db7;p=plocate

diff --git a/updatedb.cpp b/updatedb.cpp
index 1be25e2..895b071 100644
--- a/updatedb.cpp
+++ b/updatedb.cpp
@@ -92,7 +92,11 @@ int opendir_noatime(int dirfd, const char *path)
 	static bool noatime_failed = false;
 
 	if (!noatime_failed) {
+#ifdef O_NOATIME
 		int fd = openat(dirfd, path, O_RDONLY | O_DIRECTORY | O_NOATIME);
+#else
+		int fd = openat(dirfd, path, O_RDONLY | O_DIRECTORY);
+#endif
 		if (fd != -1) {
 			return fd;
 		} else if (errno == EPERM) {
@@ -526,7 +530,7 @@ string ExistingDB::read_next_dictionary() const
 // “parent_dev” must be the device of the parent directory of “path”.
 //
 // 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, Corpus *corpus, DictionaryBuilder *dict_builder)
+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) {
@@ -742,6 +746,15 @@ int main(int argc, char **argv)
 	// and can set whatever we want). 128k should be ample for most setups.
 	rlimit rlim;
 	if (getrlimit(RLIMIT_NOFILE, &rlim) != -1) {
+		// Even root cannot increase rlim_cur beyond rlim_max,
+		// so we need to try to increase rlim_max first.
+		// Ignore errors, though.
+		if (rlim.rlim_max < 131072) {
+			rlim.rlim_max = 131072;
+			setrlimit(RLIMIT_NOFILE, &rlim);
+			getrlimit(RLIMIT_NOFILE, &rlim);
+		}
+
 		rlim_t wanted = std::max<rlim_t>(rlim.rlim_cur, 131072);
 		rlim.rlim_cur = std::min<rlim_t>(wanted, rlim.rlim_max);
 		setrlimit(RLIMIT_NOFILE, &rlim);  // Ignore errors.
@@ -767,9 +780,9 @@ int main(int argc, char **argv)
 		owner = grp->gr_gid;
 	}
 
-	DatabaseBuilder db(conf_output.c_str(), owner, conf_block_size, existing_db.read_next_dictionary());
+	DatabaseBuilder db(conf_output.c_str(), owner, conf_block_size, existing_db.read_next_dictionary(), conf_check_visibility);
 	db.set_conf_block(conf_block);
-	Corpus *corpus = db.start_corpus(/*store_dir_times=*/true);
+	DatabaseReceiver *corpus = db.start_corpus(/*store_dir_times=*/true);
 
 	int root_fd = opendir_noatime(AT_FDCWD, conf_scan_root);
 	if (root_fd == -1) {