X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=create.c;h=47c715568d5e41e0f051eaf9530f920dcc167753;hp=1ce2e544cec93a85095c1a451083f4d6aaa211bd;hb=9ca6c5e46bfbfeb6341a54703a21e25c15ef0f7e;hpb=b542a1e3c66b7b01cd2dc91749c5154e25cbff1e

diff --git a/create.c b/create.c
index 1ce2e54..47c7155 100644
--- a/create.c
+++ b/create.c
@@ -117,10 +117,13 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 	struct dirent *entry;
 	int ret, cwd_fd, ret2;
 	uint64_t dir_size = 0, dir_files = 0;
-	uint64_t this_dir_num = ++num_dirs;
+	/* dir count. */
+	static uint64_t current_dir_num;
+
+	uint64_t this_dir_num = ++current_dir_num;
 
 	check_signals();
-	DEBUG_LOG("----------------- %llu: %s\n", (long long unsigned)num_dirs, dirname);
+	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))
@@ -130,7 +133,7 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 	}
 	while ((entry = readdir(dir))) {
 		mode_t m;
-		struct stat s;
+		struct stat64 s;
 		uint32_t uid;
 		uint64_t size;
 		struct user_info *ui;
@@ -139,9 +142,9 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 			continue;
 		if (!strcmp(entry->d_name, ".."))
 			continue;
-		if (lstat(entry->d_name, &s) == -1) {
-			WARNING_LOG("lstat error for %s/%s\n", dirname,
-				entry->d_name);
+		if (lstat64(entry->d_name, &s) == -1) {
+			WARNING_LOG("lstat64 error for %s/%s (%s)\n",
+				dirname, entry->d_name, strerror(errno));
 			continue;
 		}
 		m = s.st_mode;
@@ -158,9 +161,7 @@ static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 		/* regular file */
 		size = s.st_size;
 		dir_size += size;
-		num_bytes += size;
 		dir_files++;
-		num_files++;
 		uid = s.st_uid;
 		ret = search_uid(uid, CREATE_USER_TABLE | OPEN_USER_TABLE, &ui);
 		if (ret < 0)