X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=create.c;h=a3373db4ff5d975eb46161512ad8654518abe717;hp=c4d7195878b64c80eef176835743a631110eff9c;hb=2e24b91148dda8ea52b308a4b5e0ef08c0f11267;hpb=25e4fb919ce9b87aeb5aa3456b687c5c3ba55a9e

diff --git a/create.c b/create.c
index c4d7195..a3373db 100644
--- a/create.c
+++ b/create.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -140,10 +140,9 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 	check_signals();
 	DEBUG_LOG("----------------- %llu: %s\n", (long long unsigned)current_dir_num, dirname);
 	ret = adu_opendir(dirname, &dir, &cwd_fd);
-	if (ret < 0) {
-		if (ret != -ERRNO_TO_ERROR(EACCES))
-			return ret;
-		WARNING_LOG("permission denied for %s\n", dirname);
+	if (ret < 0) { /* Non-fatal, continue with next dir */
+		WARNING_LOG("skipping dir %s: %s\n", dirname,
+			adu_strerror(-ret));
 		return 1;
 	}
 	while ((entry = readdir(dir))) {
@@ -169,7 +168,7 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 				continue;
 			dir_size += s.st_size;
 			dir_files++;
-			ret = create_user_table(conf.database_dir_arg, s.st_uid, &ui);
+			ret = create_user_table(s.st_uid, &ui);
 			if (ret < 0)
 				goto out;
 			ret = update_user_row(ui->table, this_dir_num,
@@ -190,7 +189,7 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 		else
 			dir_size += s.st_size;
 		dir_files++;
-		ret = create_user_table(conf.database_dir_arg, s.st_uid, &ui);
+		ret = create_user_table(s.st_uid, &ui);
 		if (ret < 0)
 			goto out;
 		ret = insert_user_bloom(&s, bloom_buf);
@@ -223,7 +222,7 @@ static void log_bloom_stat(struct bloom *b)
 	NOTICE_LOG("\t%u%% of bits are set\n", percent);
 	if (percent > 50) {
 		WARNING_LOG("results may be unreliable!\n");
-		WARNING_LOG("consider incrasing bllom filter size\n");
+		WARNING_LOG("consider increasing bloom filter size\n");
 	}
 }
 
@@ -269,7 +268,7 @@ int com_create(void)
 	ret = scan_dir(conf.base_dir_arg, &zero);
 	if (ret < 0)
 		goto out;
-	ret = write_uid_file(conf.database_dir_arg);
+	ret = write_uid_file();
 	log_bloom_stats();
 out:
 	bloom_free(global_bloom_filter);