X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;h=59755a66e9a1f119f0ffe28042ae4b8097f26d35;hp=515bbc4a5ecae2a26cfa3c4ffb4ce33e6b690c33;hb=587e1a5b8b5b0b35a18eaf4f8852cf5b775f1e86;hpb=62b002ae08225cb53be301ad10808f2e6e69ffbc

diff --git a/select.c b/select.c
index 515bbc4..59755a6 100644
--- a/select.c
+++ b/select.c
@@ -349,19 +349,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 +442,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;
 }