X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;h=4c2f12cbc7ab7e6f7f69bfbd7809daf866f4959a;hp=515bbc4a5ecae2a26cfa3c4ffb4ce33e6b690c33;hb=17ec9800d532ef9de0e3970e1f5bf5914c939739;hpb=9808428d6048fc0826e01d37017c89b4b4ffb9e6

diff --git a/select.c b/select.c
index 515bbc4..4c2f12c 100644
--- a/select.c
+++ b/select.c
@@ -116,34 +116,37 @@ static int get_dir_name_by_number(uint64_t *dirnum, char **name)
 	char *result = NULL, *tmp;
 	struct osl_row *row;
 	uint64_t val = *dirnum;
-	struct osl_object obj = {.data = &val, .size = sizeof(val)};
+	struct osl_object obj;
 	int ret;
+	char *pfx;
 
 again:
+	obj.data = &val;
+	obj.size = sizeof(val);
 	ret = osl(osl_get_row(dir_table, DT_NUM, &obj, &row));
 	if (ret < 0)
 		goto out;
-	ret = osl(osl_get_object(dir_table, row, DT_NAME, &obj));
-	if (ret < 0)
-		goto out;
-	if (result) {
-		tmp = make_message("%s/%s", (char *)obj.data, result);
-		free(result);
-		result = tmp;
-	} else
-		result = adu_strdup((char *)obj.data);
 	ret = osl(osl_get_object(dir_table, row, DT_PARENT_NUM, &obj));
 	if (ret < 0)
 		goto out;
 	val = *(uint64_t *)obj.data;
+	ret = osl(osl_get_object(dir_table, row, DT_NAME, &obj));
+	if (ret < 0)
+		goto out;
+	pfx = (conf.print_base_dir_given || val)? (char *)obj.data :  ".";
+	tmp = make_message("%s/%s", pfx, result? result : "");
+	free(result);
+	result = tmp;
 	if (val)
 		goto again;
 out:
 	if (ret < 0) {
 		free(result);
 		*name = NULL;
-	} else
+	} else {
+		assert(result);
 		*name = result;
+	}
 	return ret;
 }
 
@@ -151,30 +154,14 @@ static int get_dir_name_of_row(struct osl_row *dir_table_row, char **name)
 {
 	struct osl_object obj;
 	int ret;
-	char *this_dir, *prefix = NULL;
 
 	*name = NULL;
-	ret = osl(osl_get_object(dir_table, dir_table_row, DT_NAME, &obj));
+	ret = osl(osl_get_object(dir_table, dir_table_row, DT_NUM, &obj));
 	if (ret < 0)
 		return ret;
-	this_dir = adu_strdup((char *)obj.data);
-	ret = osl(osl_get_object(dir_table, dir_table_row, DT_PARENT_NUM, &obj));
-	if (ret < 0)
-		goto out;
-	if (!*(uint64_t *)obj.data) {
-		*name = this_dir;
-		return 1;
-	}
-	ret = get_dir_name_by_number((uint64_t *)obj.data, &prefix);
-	if (ret < 0)
-		goto out;
-	*name = make_message("%s/%s", prefix, this_dir);
-	free(prefix);
-	ret = 1;
-out:
-	free(this_dir);
-	return ret;
+	return get_dir_name_by_number((uint64_t *)obj.data, name);
 }
+
 static int user_stats_loop_function(struct osl_row *row, void *data)
 {
 	struct user_stats_info *usi = data;
@@ -349,19 +336,20 @@ static void print_global_summary(void)
 	enum enum_count_unit ud, uf;
 	enum enum_size_unit us;
 
+	if (conf.no_global_summary_given)
+		return;
 	ud = format_count_value(conf.count_unit_arg, num_dirs, 0, d);
 	uf = format_count_value(conf.count_unit_arg, num_files, 0, f);
 	us = format_size_value(conf.size_unit_arg, num_bytes, 0, s);
 
-	printf("Global summary "
-		"(dirs(%c)/files(%c)/size(%c))\n"
-		"\t%s\t%s\t%s\n\n",
-		count_unit_abbrevs[ud],
-		count_unit_abbrevs[uf],
-		size_unit_abbrevs[us],
-		d, f, s
-	);
-
+	if (!conf.no_headers_given)
+		printf("Global summary "
+			"(dirs(%c)/files(%c)/size(%c))\n",
+			count_unit_abbrevs[ud],
+			count_unit_abbrevs[uf],
+			size_unit_abbrevs[us]
+		);
+	printf("\t%s\t%s\t%s\n\n", d, f, s);
 }
 
 static int print_user_summary_line(struct user_info *ui, __a_unused void *data)
@@ -441,74 +429,122 @@ static int (*summary_comparators[])(const void *, const void *) = {
 
 static void print_user_summary(void)
 {
-	printf("User summary "
-		"(pw_name/uid/dirs%s/files%s/size%s):\n",
-		count_unit_buf, count_unit_buf, size_unit_buf);
+	if (conf.no_user_summary_given)
+		return;
+	if (!conf.no_headers_given)
+		printf("User summary "
+			"(pw_name/uid/dirs%s/files%s/size%s):\n",
+			count_unit_buf, count_unit_buf, size_unit_buf);
 	sort_hash_table(summary_comparators[conf.user_summary_sort_arg]);
 	for_each_admissible_user(print_user_summary_line, NULL);
 }
 
-static int print_user_stat(struct user_info *ui, __a_unused void *data)
+static int print_user_list(struct user_info *ui, __a_unused void *data)
 {
 	int ret;
-	struct user_stats_info usi = {
-		.count = conf.limit_arg,
-		.ui = ui
-	};
-
-	usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
-	printf("%s (uid %u), by size%s:\n",
-		ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
-		size_unit_buf);
-	ret = adu_loop_reverse(ui->table, UT_BYTES, &usi, user_stats_loop_function,
-		&usi.ret, &usi.osl_errno);
-	if (ret < 0)
-		return ret;
-	printf("\n%s (uid %u), by file count%s:\n",
-		ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
-		count_unit_buf);
-	usi.count = conf.limit_arg,
-	usi.flags = USF_PRINT_DIRNAME | USF_PRINT_FILES;
-	ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
-		&usi.ret, &usi.osl_errno);
-	if (ret < 0)
-		return ret;
-	printf("\n");
+	struct user_stats_info usi;
+	enum enum_user_list ula = conf.user_list_arg;
+	int print_size_list = (ula == user_list_arg_size
+		|| ula == user_list_arg_both);
+
+	if (print_size_list) {
+		usi.count = conf.limit_arg;
+		usi.ui = ui;
+		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
+		if (!conf.no_headers_given)
+			printf("%s (uid %u), by size%s:\n",
+				ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
+				size_unit_buf);
+		ret = adu_loop_reverse(ui->table, UT_BYTES, &usi, user_stats_loop_function,
+			&usi.ret, &usi.osl_errno);
+		if (ret < 0)
+			return ret;
+		printf("\n");
+	}
+	if (ula == user_list_arg_file_count || ula == user_list_arg_both) {
+		if (!conf.no_headers_given)
+			printf("%s (uid %u), by file count%s:\n",
+				ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
+				count_unit_buf);
+		usi.count = conf.limit_arg,
+		usi.ui = ui;
+		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_FILES;
+		ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
+			&usi.ret, &usi.osl_errno);
+		if (ret < 0)
+			return ret;
+		printf("\n");
+	}
+	if (ula == user_list_arg_none && !conf.no_user_summary_given) {
+		usi.count = conf.limit_arg;
+		usi.ui = ui;
+		usi.flags = USF_COMPUTE_SUMMARY;
+		ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
+			&usi.ret, &usi.osl_errno);
+		if (ret < 0)
+			return ret;
+	}
 	return 1;
 }
 
-static int print_user_stats(void)
+static int print_user_lists(void)
+{
+	return for_each_admissible_user(print_user_list, NULL);
+}
+
+static int print_global_lists(void)
 {
-	return for_each_admissible_user(print_user_stat, NULL);
+	struct global_stats_info gsi;
+	int ret;
+	enum enum_global_list gla = conf.global_list_arg;
+	int print_size_list = (gla == global_list_arg_size
+		|| gla == global_list_arg_both);
+
+	if (print_size_list) {
+		gsi.count = conf.limit_arg;
+		gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_BYTES | GSF_COMPUTE_SUMMARY;
+		if (!conf.no_headers_given)
+			printf("By size%s:\n", size_unit_buf);
+		ret = adu_loop_reverse(dir_table, DT_BYTES, &gsi,
+			global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
+		if (ret < 0)
+			return ret;
+		printf("\n");
+	}
+	if (gla == global_list_arg_file_count || gla == global_list_arg_both) {
+		gsi.count = conf.limit_arg;
+		gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_FILES;
+		if (!print_size_list)
+			gsi.flags |= GSF_COMPUTE_SUMMARY;
+		if (!conf.no_headers_given)
+			printf("By file count%s:\n", count_unit_buf);
+		ret = adu_loop_reverse(dir_table, DT_FILES, &gsi,
+			global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
+		if (ret < 0)
+			return ret;
+		printf("\n");
+	}
+	if (gla == global_list_arg_none && !conf.no_global_summary_given) {
+		/* must compute summary */
+		gsi.count = conf.limit_arg;
+		gsi.flags = GSF_COMPUTE_SUMMARY;
+		ret = adu_loop_reverse(dir_table, DT_FILES, &gsi,
+			global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
+		if (ret < 0)
+			return ret;
+	}
+	return 1;
 }
 
 static int print_statistics(void)
 {
 	int ret;
-	struct global_stats_info gsi = {
-		.count = conf.limit_arg,
-		.flags = GSF_PRINT_DIRNAME | GSF_PRINT_BYTES | GSF_COMPUTE_SUMMARY
-	};
-
-	printf("By size%s:\n",
-		size_unit_buf);
-	ret = adu_loop_reverse(dir_table, DT_BYTES, &gsi,
-		global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
-	if (ret < 0)
-		return ret;
-	printf("\n");
-
-	gsi.count = conf.limit_arg;
-	gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_FILES;
-	printf("By file count%s:\n",
-		count_unit_buf);
-	ret = adu_loop_reverse(dir_table, DT_FILES, &gsi,
-		global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
+
+	ret = print_global_lists();
 	if (ret < 0)
 		return ret;
-	printf("\n");
 	print_global_summary();
-	print_user_stats();
+	print_user_lists();
 	print_user_summary();
 	return 1;
 }