X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=select.c;h=81403c643d1edfbc5c330aec094cc2d63963a3c0;hb=afc8a4212e37abd7467b21da543167285ae0c9c5;hp=00b03258d5015d89a387d40ee41e7cbaca3478a2;hpb=b54f6fb7aa4b4853997b57c1e99952068b45b678;p=adu.git

diff --git a/select.c b/select.c
index 00b0325..81403c6 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,6 +77,8 @@ 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)
@@ -118,6 +121,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 +136,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 = (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 +157,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,8 +184,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))?
@@ -216,8 +202,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",
@@ -272,8 +258,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))?
@@ -289,8 +275,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",
@@ -355,9 +341,9 @@ static void print_global_summary(void)
 
 	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);
+	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 "
@@ -375,14 +361,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 : "?",
@@ -452,7 +438,7 @@ 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);
-	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);
 }
 
@@ -465,7 +451,7 @@ static int print_user_list(struct user_info *ui, __a_unused void *data)
 		|| 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)
@@ -483,7 +469,7 @@ static int print_user_list(struct user_info *ui, __a_unused void *data)
 			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.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,
@@ -493,7 +479,7 @@ static int print_user_list(struct user_info *ui, __a_unused void *data)
 		printf("\n");
 	}
 	if (ula == user_list_arg_none && !conf.no_user_summary_given) {
-		usi.count = conf.limit_arg;
+		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,
@@ -518,7 +504,7 @@ static int print_global_lists(void)
 		|| 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);
@@ -529,7 +515,7 @@ static int print_global_lists(void)
 		printf("\n");
 	}
 	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;
@@ -543,7 +529,7 @@ static int print_global_lists(void)
 	}
 	if (gla == global_list_arg_none && !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);
@@ -592,7 +578,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;
 	}
@@ -604,13 +590,29 @@ 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
+	};
+
+	if (conf.select_options_given) {
+		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;
+	}
 
-	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';