X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;h=7537f4cae3b638bccf6c51c23282ccb68b9b693c;hp=ded4a095ca751574bbfa9153d3ec61ad7aa32bb2;hb=06ed2a8ccb7f05eacb530a34f222a1d900f35bf5;hpb=8230b9164cf013b77bcb86028cba43b4d0b721fa

diff --git a/select.c b/select.c
index ded4a09..7537f4c 100644
--- a/select.c
+++ b/select.c
@@ -117,6 +117,10 @@ struct user_summary_info {
 	int osl_errno;
 };
 
+struct user_summary_line_info {
+	struct format_info *fi;
+	uint32_t count;
+};
 
 static FILE *output_file;
 
@@ -348,7 +352,7 @@ static int compute_user_summary(struct user_info *ui, __a_unused void *data)
 
 static int print_user_summary_line(struct user_info *ui, void *data)
 {
-	struct format_info *fi = data;
+	struct user_summary_line_info *usli = data;
 	union atom_value values[] = {
 		[usa_pw_name] = {.string_value = ui->pw_name?
 			ui->pw_name : "?"},
@@ -358,18 +362,22 @@ static int print_user_summary_line(struct user_info *ui, void *data)
 		[usa_size] = {.num_value =  (long long unsigned)ui->bytes}
 	};
 	char *buf;
-	int ret;
+	int ret = -E_LOOP_COMPLETE;
 
-	buf = format_items(fi, values);
+	if (!usli->count)
+		return ret;
+
+	buf = format_items(usli->fi, values);
 	ret = output("%s", buf);
 	free(buf);
+	usli->count--;
 	return ret;
 }
 
-static int name_comp(const void *a, const void *b)
+static int name_comp(struct user_info *a, struct user_info *b)
 {
-	char *x = ((struct user_info *)a)->pw_name;
-	char *y = ((struct user_info *)b)->pw_name;
+	char *x = a->pw_name;
+	char *y = b->pw_name;
 
 	if (!x)
 		return 1;
@@ -378,56 +386,65 @@ static int name_comp(const void *a, const void *b)
 	return strcmp(x, y);
 }
 
-static int uid_comp(const void *a, const void *b)
+static int uid_comp(struct user_info *a, struct user_info *b)
 {
-	return -NUM_COMPARE(((struct user_info *)a)->uid,
-		((struct user_info *)b)->uid);
+	return -NUM_COMPARE(a->uid, b->uid);
 }
 
-static int dir_count_comp(const void *a, const void *b)
+static int dir_count_comp(struct user_info *a, struct user_info *b)
 {
-	return NUM_COMPARE(((struct user_info *)a)->dirs,
-		((struct user_info *)b)->dirs);
+	return NUM_COMPARE(a->dirs, b->dirs);
 }
 
-static int file_count_comp(const void *a, const void *b)
+static int file_count_comp(struct user_info *a, struct user_info *b)
 {
-	return NUM_COMPARE(((struct user_info *)a)->files,
-		((struct user_info *)b)->files);
+	return NUM_COMPARE(a->files, b->files);
 }
 
-static int size_comp(const void *a, const void *b)
+static int size_comp(struct user_info *a, struct user_info *b)
 {
-	return NUM_COMPARE(((struct user_info *)a)->bytes,
-		((struct user_info *)b)->bytes);
+	return NUM_COMPARE(a->bytes, b->bytes);
 }
 
 static int print_user_summary(struct format_info *fi)
 {
-	/*
-	 * The comparators for sorting the user summary.
-	 *
-	 * This is an array of pointers to functions taking two constant void *
-	 * pointers and returning an int.
-	 */
-	static int (*summary_comparators[])(const void *, const void *) = {
-		[user_summary_sort_arg_name] = name_comp,
-		[user_summary_sort_arg_uid] = uid_comp,
-		[user_summary_sort_arg_dir_count] = dir_count_comp,
-		[user_summary_sort_arg_file_count] = file_count_comp,
-		[user_summary_sort_arg_size] = size_comp,
+	int ret;
+	int (*comp)(struct user_info *a, struct user_info *b);
+	struct user_summary_line_info usli = {
+		.fi = fi,
+		.count = select_conf.limit_arg
 	};
 
 	if (!select_conf.no_headers_given) {
-		int ret = output("User summary\n");
+		ret = output("User summary\n");
 		if (ret < 0)
 			return ret;
 	}
-	int ret = for_each_admissible_user(compute_user_summary, fi);
+	ret = for_each_admissible_user(compute_user_summary, 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, fi);
+	switch (select_conf.user_summary_sort_arg) {
+	case user_summary_sort_arg_name:
+		comp = name_comp;
+		break;
+	case user_summary_sort_arg_uid:
+		comp = uid_comp;
+		break;
+	case user_summary_sort_arg_dir_count:
+		comp = dir_count_comp;
+		break;
+	case user_summary_sort_arg_file_count:
+		comp = file_count_comp;
+		break;
+	case user_summary_sort_arg_size:
+		comp = size_comp;
+		break;
+	}
+	sort_hash_table(comp);
+	ret = for_each_admissible_user(print_user_summary_line, &usli);
+	if (ret == -E_LOOP_COMPLETE)
+		ret = 1;
+	return ret;
 }
 
 static int user_list_loop_function(struct osl_row *row, void *data)
@@ -686,13 +703,12 @@ int run_select_query(struct uid_range *admissible_uids, struct format_info *fi)
 	if (ret < 0)
 		goto out;
 	check_signals();
-	ret = read_uid_file(admissible_uids);
+	ret = open_admissible_user_tables(admissible_uids);
 	if (ret < 0)
 		goto out;
 	check_signals();
 	ret = print_statistics(fi);
 out:
-	close_all_tables();
 	if (output_file && output_file != stdout) {
 		fclose(output_file);
 		output_file = NULL;
@@ -799,12 +815,16 @@ int com_select(void)
 		.print_errors = 1
 	};
 
-	select_cmdline_parser_init(&select_conf);
 	ret = parse_select_options(conf.select_options_arg, &params,
 		&admissible_uids, &fi);
-	if (ret <= 0) /* do not run query if help was given */
-		return ret;
-	ret = run_select_query(admissible_uids, fi);
-	free_format_info(fi);
+	if (ret > 0) {
+		ret = read_uid_file();
+		if (ret < 0)
+			goto out;
+		ret = run_select_query(admissible_uids, fi);
+		free_format_info(fi);
+	}
+out:
+	select_cmdline_parser_free(&select_conf);
 	return ret;
 }