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;
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);
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, fi);
if (ret < 0)
return ret;
- sort_hash_table(summary_comparators[select_conf.user_summary_sort_arg]);
+ 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);
return for_each_admissible_user(print_user_summary_line, 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;
.print_errors = 1
};
- select_cmdline_parser_init(&select_conf);
ret = parse_select_options(conf.select_options_arg, ¶ms,
&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;
}