X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;h=e3d97b11ef7893f09ba89008aa1994b30318fc39;hp=ef63cf3dab3a742b7e64b24805e050302ec3f4fb;hb=0144f2253169466ca4c8b2434dca070aa14e491a;hpb=1f44b159ff9ba68e6a09539883d24cf73f35fd90

diff --git a/select.c b/select.c
index ef63cf3..e3d97b1 100644
--- a/select.c
+++ b/select.c
@@ -77,9 +77,6 @@ static const uint64_t count_unit_divisors[] = {
 
 static const char size_unit_abbrevs[] = " BKMGT";
 static const char count_unit_abbrevs[] = "  kmgt";
-struct select_args_info select_conf;
-static struct uid_range *admissible_uids;
-
 static enum enum_size_unit format_size_value(enum enum_size_unit unit,
 		uint64_t value, int print_unit, char *result)
 {
@@ -136,7 +133,7 @@ again:
 	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 :  ".";
+	pfx = (select_conf.print_base_dir_given || val)? (char *)obj.data :  ".";
 	tmp = make_message("%s/%s", pfx, result? result : "");
 	free(result);
 	result = tmp;
@@ -184,8 +181,8 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
 			goto err;
 		files = *(uint64_t *)obj.data;
 		if (usi->count && (usi->flags & USF_PRINT_FILES)) {
-			format_count_value(conf.count_unit_arg, files,
-				conf.count_unit_arg == count_unit_arg_h,
+			format_count_value(select_conf.count_unit_arg, files,
+				select_conf.count_unit_arg == count_unit_arg_h,
 				formated_value);
 			printf("\t%s%s", formated_value,
 				(usi->flags & (USF_PRINT_BYTES | USF_PRINT_DIRNAME))?
@@ -202,8 +199,8 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
 			goto err;
 		bytes = *(uint64_t *)obj.data;
 		if (usi->count && (usi->flags & USF_PRINT_BYTES)) {
-			format_size_value(conf.size_unit_arg, bytes,
-				conf.size_unit_arg == size_unit_arg_h,
+			format_size_value(select_conf.size_unit_arg, bytes,
+				select_conf.size_unit_arg == size_unit_arg_h,
 				formated_value);
 			printf("%s%s%s",
 				(usi->flags & USF_PRINT_FILES)? "" : "\t",
@@ -258,8 +255,8 @@ static int global_stats_loop_function(struct osl_row *row, void *data)
 			goto err;
 		files = *(uint64_t *)obj.data;
 		if (gsi->count && (gsi->flags & GSF_PRINT_FILES)) {
-			format_count_value(conf.count_unit_arg, files,
-				conf.count_unit_arg == count_unit_arg_h,
+			format_count_value(select_conf.count_unit_arg, files,
+				select_conf.count_unit_arg == count_unit_arg_h,
 				formated_value);
 			printf("\t%s%s", formated_value,
 				(gsi->flags & (GSF_PRINT_BYTES | GSF_PRINT_DIRNAME))?
@@ -275,8 +272,8 @@ static int global_stats_loop_function(struct osl_row *row, void *data)
 			goto err;
 		bytes = *(uint64_t *)obj.data;
 		if (gsi->count && (gsi->flags & GSF_PRINT_BYTES)) {
-			format_size_value(conf.size_unit_arg, bytes,
-				conf.size_unit_arg == size_unit_arg_h,
+			format_size_value(select_conf.size_unit_arg, bytes,
+				select_conf.size_unit_arg == size_unit_arg_h,
 				formated_value);
 			printf("%s%s%s",
 				(gsi->flags & GSF_PRINT_FILES)? "" : "\t",
@@ -339,13 +336,13 @@ static void print_global_summary(void)
 	enum enum_count_unit ud, uf;
 	enum enum_size_unit us;
 
-	if (conf.no_global_summary_given)
+	if (select_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);
+	ud = format_count_value(select_conf.count_unit_arg, num_dirs, 0, d);
+	uf = format_count_value(select_conf.count_unit_arg, num_files, 0, f);
+	us = format_size_value(select_conf.size_unit_arg, num_bytes, 0, s);
 
-	if (!conf.no_headers_given)
+	if (!select_conf.no_headers_given)
 		printf("Global summary "
 			"(dirs(%c)/files(%c)/size(%c))\n",
 			count_unit_abbrevs[ud],
@@ -361,14 +358,14 @@ static int print_user_summary_line(struct user_info *ui, __a_unused void *data)
 		formated_file_count[FORMATED_VALUE_SIZE],
 		formated_bytes[FORMATED_VALUE_SIZE ];
 
-	format_count_value(conf.count_unit_arg, ui->dirs,
-		conf.count_unit_arg == count_unit_arg_h,
+	format_count_value(select_conf.count_unit_arg, ui->dirs,
+		select_conf.count_unit_arg == count_unit_arg_h,
 		formated_dir_count);
-	format_count_value(conf.count_unit_arg, ui->files,
-		conf.count_unit_arg == count_unit_arg_h,
+	format_count_value(select_conf.count_unit_arg, ui->files,
+		select_conf.count_unit_arg == count_unit_arg_h,
 		formated_file_count);
-	format_size_value(conf.size_unit_arg, ui->bytes,
-		conf.size_unit_arg == size_unit_arg_h,
+	format_size_value(select_conf.size_unit_arg, ui->bytes,
+		select_conf.size_unit_arg == size_unit_arg_h,
 		formated_bytes);
 	printf("\t%s\t%u\t%s\t%s\t%s\n",
 		ui->pw_name? ui->pw_name : "?",
@@ -432,13 +429,13 @@ static int (*summary_comparators[])(const void *, const void *) = {
 
 static void print_user_summary(void)
 {
-	if (conf.no_user_summary_given)
+	if (select_conf.no_user_summary_given)
 		return;
-	if (!conf.no_headers_given)
+	if (!select_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]);
+	sort_hash_table(summary_comparators[select_conf.user_summary_sort_arg]);
 	for_each_admissible_user(print_user_summary_line, NULL);
 }
 
@@ -446,7 +443,7 @@ static int print_user_list(struct user_info *ui, __a_unused void *data)
 {
 	int ret;
 	struct user_stats_info usi;
-	enum enum_user_list ula = conf.user_list_arg;
+	enum enum_user_list ula = select_conf.user_list_arg;
 	int print_size_list = (ula == user_list_arg_size
 		|| ula == user_list_arg_both);
 
@@ -454,7 +451,7 @@ static int print_user_list(struct user_info *ui, __a_unused void *data)
 		usi.count = select_conf.limit_arg;
 		usi.ui = ui;
 		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
-		if (!conf.no_headers_given)
+		if (!select_conf.no_headers_given)
 			printf("%s (uid %u), by size%s:\n",
 				ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
 				size_unit_buf);
@@ -465,7 +462,7 @@ static int print_user_list(struct user_info *ui, __a_unused void *data)
 		printf("\n");
 	}
 	if (ula == user_list_arg_file_count || ula == user_list_arg_both) {
-		if (!conf.no_headers_given)
+		if (!select_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);
@@ -478,7 +475,7 @@ static int print_user_list(struct user_info *ui, __a_unused void *data)
 			return ret;
 		printf("\n");
 	}
-	if (ula == user_list_arg_none && !conf.no_user_summary_given) {
+	if (ula == user_list_arg_none && !select_conf.no_user_summary_given) {
 		usi.count = select_conf.limit_arg;
 		usi.ui = ui;
 		usi.flags = USF_COMPUTE_SUMMARY;
@@ -499,14 +496,14 @@ static int print_global_lists(void)
 {
 	struct global_stats_info gsi;
 	int ret;
-	enum enum_global_list gla = conf.global_list_arg;
+	enum enum_global_list gla = select_conf.global_list_arg;
 	int print_size_list = (gla == global_list_arg_size
 		|| gla == global_list_arg_both);
 
 	if (print_size_list) {
 		gsi.count = select_conf.limit_arg;
 		gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_BYTES | GSF_COMPUTE_SUMMARY;
-		if (!conf.no_headers_given)
+		if (!select_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);
@@ -519,7 +516,7 @@ static int print_global_lists(void)
 		gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_FILES;
 		if (!print_size_list)
 			gsi.flags |= GSF_COMPUTE_SUMMARY;
-		if (!conf.no_headers_given)
+		if (!select_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);
@@ -527,7 +524,7 @@ static int print_global_lists(void)
 			return ret;
 		printf("\n");
 	}
-	if (gla == global_list_arg_none && !conf.no_global_summary_given) {
+	if (gla == global_list_arg_none && !select_conf.no_global_summary_given) {
 		/* must compute summary */
 		gsi.count = select_conf.limit_arg;
 		gsi.flags = GSF_COMPUTE_SUMMARY;
@@ -552,7 +549,7 @@ static int print_statistics(void)
 	return 1;
 }
 
-static int read_uid_file(void)
+static int read_uid_file(struct uid_range *admissible_uids)
 {
 	size_t size;
 	uint32_t n;
@@ -590,15 +587,17 @@ out:
 int com_select(void)
 {
 	int ret;
-	struct select_cmdline_parser_params params = {
-		.override = 1,
-		.initialize = 1,
-		.check_required = 1,
-		.check_ambiguity = 1,
-		.print_errors = 1
-	};
+	struct uid_range *admissible_uids = NULL;
 
 	if (conf.select_options_given) {
+		struct select_cmdline_parser_params params = {
+			.override = 1,
+			.initialize = 1,
+			.check_required = 1,
+			.check_ambiguity = 1,
+			.print_errors = 1
+		};
+
 		if (select_cmdline_parser_string_ext(conf.select_options_arg,
 			&select_conf, "select", &params))
 			return -E_SYNTAX;
@@ -607,12 +606,12 @@ int com_select(void)
 			return ret;
 	}
 
-	if (conf.count_unit_arg != count_unit_arg_h)
-		count_unit_buf[1] = count_unit_abbrevs[conf.count_unit_arg];
+	if (select_conf.count_unit_arg != count_unit_arg_h)
+		count_unit_buf[1] = count_unit_abbrevs[select_conf.count_unit_arg];
 	else
 		count_unit_buf[0] = '\0';
-	if (conf.size_unit_arg != size_unit_arg_h)
-		size_unit_buf[1] = size_unit_abbrevs[conf.size_unit_arg];
+	if (select_conf.size_unit_arg != size_unit_arg_h)
+		size_unit_buf[1] = size_unit_abbrevs[select_conf.size_unit_arg];
 	else
 		size_unit_buf[0] = '\0';
 
@@ -620,7 +619,7 @@ int com_select(void)
 	if (ret < 0)
 		return ret;
 	check_signals();
-	ret = read_uid_file();
+	ret = read_uid_file(admissible_uids);
 	if (ret < 0)
 		return ret;
 	check_signals();