X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=updatedb.cpp;h=1be25e2d4b06cae61c7a057f520a9af8020819ad;hb=8a5857967a61958269e7f58a93913ab7fdab7bb8;hp=908f47758205dc662c4cfae9bf8e76051839f02a;hpb=63fd24efd774f1ed3f5dab82b934f35b7b039557;p=plocate

diff --git a/updatedb.cpp b/updatedb.cpp
index 908f477..1be25e2 100644
--- a/updatedb.cpp
+++ b/updatedb.cpp
@@ -49,10 +49,10 @@ any later version.
 #include <stdlib.h>
 #include <string.h>
 #include <string>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/resource.h>
 #include <unistd.h>
 #include <utility>
 #include <vector>
@@ -598,6 +598,11 @@ int scan(const string &path, int fd, dev_t parent_dev, dir_time modified, dir_ti
 		// by reading from the database. (We still need to open and stat everything,
 		// though, but that happens in a later step.)
 		entries = move(db_entries);
+		if (conf_verbose) {
+			for (const entry &e : entries) {
+				printf("%s/%s\n", path.c_str(), e.name.c_str());
+			}
+		}
 	} else {
 		dir = fdopendir(fd);  // Takes over ownership of fd.
 		if (dir == nullptr) {
@@ -679,7 +684,7 @@ int scan(const string &path, int fd, dev_t parent_dev, dir_time modified, dir_ti
 					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);
+					        rlim.rlim_cur * 2, rlim.rlim_cur);
 				}
 				exit(1);
 			}
@@ -763,6 +768,7 @@ int main(int argc, char **argv)
 	}
 
 	DatabaseBuilder db(conf_output.c_str(), owner, conf_block_size, existing_db.read_next_dictionary());
+	db.set_conf_block(conf_block);
 	Corpus *corpus = db.start_corpus(/*store_dir_times=*/true);
 
 	int root_fd = opendir_noatime(AT_FDCWD, conf_scan_root);