X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;h=05302570ff5ba740731c3ba815c62b5f8da2e1fc;hp=00b03258d5015d89a387d40ee41e7cbaca3478a2;hb=cecbe8525740b4a899cb1a6c91064e195ae1ada2;hpb=2e13d4d57f8836503acc6e5e4897842e2802b539

diff --git a/select.c b/select.c
index 00b0325..0530257 100644
--- a/select.c
+++ b/select.c
@@ -14,6 +14,7 @@
 #include "string.h"
 #include "error.h"
 #include "portable_io.h"
+#include "select.cmdline.h"
 
 /** Global dir count. */
 static uint64_t num_dirs;
@@ -76,7 +77,6 @@ static const uint64_t count_unit_divisors[] = {
 
 static const char size_unit_abbrevs[] = " BKMGT";
 static const char count_unit_abbrevs[] = "  kmgt";
-
 static enum enum_size_unit format_size_value(enum enum_size_unit unit,
 		uint64_t value, int print_unit, char *result)
 {
@@ -111,6 +111,19 @@ static enum enum_count_unit format_count_value(enum enum_count_unit unit,
 	return u;
 }
 
+static FILE *output_file;
+
+__printf_1_2 static int output(const char const *fmt, ...)
+{
+	va_list argp;
+	int ret;
+
+	va_start(argp, fmt);
+	ret = vfprintf(output_file, fmt, argp);
+	va_end(argp);
+	return ret < 0? -E_OUTPUT : 1;
+}
+
 static int get_dir_name_by_number(uint64_t *dirnum, char **name)
 {
 	char *result = NULL, *tmp;
@@ -118,6 +131,7 @@ static int get_dir_name_by_number(uint64_t *dirnum, char **name)
 	uint64_t val = *dirnum;
 	struct osl_object obj;
 	int ret;
+	char *pfx;
 
 again:
 	obj.data = &val;
@@ -132,22 +146,20 @@ again:
 	ret = osl(osl_get_object(dir_table, row, DT_NAME, &obj));
 	if (ret < 0)
 		goto out;
-	if (val || conf.print_base_dir_given) {
-		if (result) {
-			tmp = make_message("%s/%s", (char *)obj.data, result);
-			free(result);
-			result = tmp;
-		} else
-			result = adu_strdup((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;
 	if (val)
 		goto again;
 out:
 	if (ret < 0) {
 		free(result);
 		*name = NULL;
-	} else
+	} else {
+		assert(result);
 		*name = result;
+	}
 	return ret;
 }
 
@@ -155,30 +167,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;
@@ -198,13 +194,14 @@ 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,
+			ret = output("\t%s%s", formated_value,
 				(usi->flags & (USF_PRINT_BYTES | USF_PRINT_DIRNAME))?
-					"\t" : "\n"
-			);
+					"\t" : "\n");
+			if (ret < 0)
+				goto err;
 		}
 		if (summary)
 			usi->ui->files += files;
@@ -216,14 +213,16 @@ 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",
+			ret = output("%s%s%s",
 				(usi->flags & USF_PRINT_FILES)? "" : "\t",
 				formated_value,
 				usi->flags & USF_PRINT_DIRNAME?  "\t" : "\n"
 			);
+			if (ret < 0)
+				goto err;
 		}
 		if (summary) {
 			usi->ui->bytes += bytes;
@@ -239,10 +238,12 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
 		ret = get_dir_name_by_number((uint64_t *)obj.data, &dirname);
 		if (ret < 0)
 			goto err;
-		printf("%s%s\n",
+		ret = output("%s%s\n",
 			(usi->flags & (USF_PRINT_BYTES | USF_PRINT_FILES))? "" : "\t",
 			dirname);
 		free(dirname);
+		if (ret < 0)
+			goto err;
 	}
 	if (usi->count > 0)
 		usi->count--;
@@ -272,12 +273,14 @@ 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,
+			ret = output("\t%s%s", formated_value,
 				(gsi->flags & (GSF_PRINT_BYTES | GSF_PRINT_DIRNAME))?
 				"\t" : "\n");
+			if (ret < 0)
+				goto err;
 		}
 		if (summary)
 			num_files += files;
@@ -289,14 +292,16 @@ 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",
+			ret = output("%s%s%s",
 				(gsi->flags & GSF_PRINT_FILES)? "" : "\t",
 				formated_value,
 				(gsi->flags & GSF_PRINT_DIRNAME)? "\t" : "\n"
 			);
+			if (ret < 0)
+				goto err;
 		}
 		if (summary) {
 			num_bytes += bytes;
@@ -307,10 +312,12 @@ static int global_stats_loop_function(struct osl_row *row, void *data)
 		ret = get_dir_name_of_row(row, &dirname);
 		if (ret < 0)
 			goto err;
-		printf("%s%s\n",
+		ret = output("%s%s\n",
 			(gsi->flags & (GSF_PRINT_BYTES | GSF_PRINT_FILES))? "" : "\t",
 			dirname);
 		free(dirname);
+		if (ret < 0)
+			goto err;
 	}
 	if (gsi->count > 0)
 		gsi->count--;
@@ -346,27 +353,31 @@ static int adu_loop_reverse(struct osl_table *t, unsigned col_num, void *private
 	return check_loop_return(ret, *loop_ret, *loop_osl_errno);
 }
 
-static void print_global_summary(void)
+static int print_global_summary(void)
 {
 	char d[FORMATED_VALUE_SIZE], f[FORMATED_VALUE_SIZE],
 		s[FORMATED_VALUE_SIZE];
 	enum enum_count_unit ud, uf;
 	enum enum_size_unit us;
+	int ret;
 
-	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);
+	if (select_conf.no_global_summary_given)
+		return 1;
+	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)
-		printf("Global summary "
+	if (!select_conf.no_headers_given) {
+		ret = output("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);
+		if (ret < 0)
+			return ret;
+	}
+	return output("\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)
@@ -375,23 +386,22 @@ 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",
+	return output("\t%s\t%u\t%s\t%s\t%s\n",
 		ui->pw_name? ui->pw_name : "?",
 		(unsigned)ui->uid,
 		formated_dir_count,
 		formated_file_count,
 		formated_bytes
 	);
-	return 1;
 }
 
 static int name_comp(const void *a, const void *b)
@@ -444,56 +454,69 @@ static int (*summary_comparators[])(const void *, const void *) = {
 	[user_summary_sort_arg_size] = size_comp,
 };
 
-static void print_user_summary(void)
+static int print_user_summary(void)
 {
-	if (conf.no_user_summary_given)
-		return;
-	if (!conf.no_headers_given)
-		printf("User summary "
+	if (select_conf.no_user_summary_given)
+		return 1;
+	if (!select_conf.no_headers_given) {
+		int ret = output("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);
+		if (ret < 0)
+			return ret;
+	}
+	sort_hash_table(summary_comparators[select_conf.user_summary_sort_arg]);
+	return for_each_admissible_user(print_user_summary_line, NULL);
 }
 
 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);
 
 	if (print_size_list) {
-		usi.count = conf.limit_arg;
+		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)
-			printf("%s (uid %u), by size%s:\n",
+		if (!select_conf.no_headers_given) {
+			ret = output("%s (uid %u), by size%s:\n",
 				ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
 				size_unit_buf);
+			if (ret < 0)
+				return ret;
+		}
 		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");
+		ret = output("\n");
+		if (ret < 0)
+			return ret;
 	}
 	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",
+		if (!select_conf.no_headers_given) {
+			ret = output("%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,
+			if (ret < 0)
+				return ret;
+		}
+		usi.count = select_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");
+		ret = output("\n");
+		if (ret < 0)
+			return ret;
 	}
-	if (ula == user_list_arg_none && !conf.no_user_summary_given) {
-		usi.count = conf.limit_arg;
+	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;
 		ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
@@ -513,37 +536,47 @@ 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 = conf.limit_arg;
+		gsi.count = select_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);
+		if (!select_conf.no_headers_given) {
+			ret = output("By size%s:\n", size_unit_buf);
+			if (ret < 0)
+				return ret;
+		}
 		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");
+		ret = output("\n");
+		if (ret < 0)
+			return ret;
 	}
 	if (gla == global_list_arg_file_count || gla == global_list_arg_both) {
-		gsi.count = conf.limit_arg;
+		gsi.count = select_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);
+		if (!select_conf.no_headers_given) {
+			ret = output("By file count%s:\n", count_unit_buf);
+			if (ret < 0)
+				return ret;
+		}
 		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");
+		ret = output("\n");
+		if (ret < 0)
+			return ret;
 	}
-	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 = conf.limit_arg;
+		gsi.count = select_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);
@@ -560,13 +593,19 @@ static int print_statistics(void)
 	ret = print_global_lists();
 	if (ret < 0)
 		return ret;
-	print_global_summary();
-	print_user_lists();
-	print_user_summary();
+	ret = print_global_summary();
+	if (ret < 0)
+		return ret;
+	ret = print_user_lists();
+	if (ret < 0)
+		return ret;
+	ret = print_user_summary();
+	if (ret < 0)
+		return ret;
 	return 1;
 }
 
-static int read_uid_file(void)
+static int read_uid_file(struct uid_range *admissible_uids)
 {
 	size_t size;
 	uint32_t n;
@@ -592,7 +631,7 @@ static int read_uid_file(void)
 	create_hash_table(bits);
 	for (n = 0; n < num_uids; n++) {
 		uint32_t uid = read_u32(map + n * sizeof(uid));
-		ret = search_uid(uid, OPEN_USER_TABLE, NULL);
+		ret = search_uid(uid, admissible_uids, OPEN_USER_TABLE, NULL);
 		if (ret < 0)
 			goto out;
 	}
@@ -601,28 +640,62 @@ out:
 	return ret;
 }
 
-int com_select(void)
+int run_select_query(struct uid_range *admissible_uids)
 {
 	int ret;
 
-	if (conf.count_unit_arg != count_unit_arg_h)
-		count_unit_buf[1] = count_unit_abbrevs[conf.count_unit_arg];
+	if (select_conf.output_given && strcmp(select_conf.output_arg, "-")) {
+		output_file = fopen(select_conf.output_arg, "w");
+		if (!output_file)
+			return -ERRNO_TO_ERROR(errno);
+	} else
+		output_file = stdout;
+
+	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';
 
 	ret = open_dir_table(0);
 	if (ret < 0)
-		return ret;
+		goto out;
 	check_signals();
-	ret = read_uid_file();
+	ret = read_uid_file(admissible_uids);
 	if (ret < 0)
-		return ret;
+		goto out;
 	check_signals();
 	ret = print_statistics();
+out:
 	close_all_tables();
+	if (output_file != stdout)
+		fclose(output_file);
 	return ret;
 }
+
+int com_select(void)
+{
+	int ret;
+	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;
+		ret = parse_uid_arg(select_conf.uid_arg, &admissible_uids);
+		if (ret < 0)
+			return ret;
+	}
+	return run_select_query(admissible_uids);
+}