X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=select.c;h=362b1a677bdcb1030f98d59558cb07f1076e910c;hb=3bccda3199f83f5fc128b5ae3c256df305d059bc;hp=4795de453adc095bdd0bf80134c5d4478dc40343;hpb=1de9e87d0a87b7215e1f914af06f3dd9dc0123b2;p=adu.git diff --git a/select.c b/select.c index 4795de4..362b1a6 100644 --- a/select.c +++ b/select.c @@ -7,6 +7,7 @@ /** \file select.c The select mode of adu. */ #include /* readdir() */ +#include "format.h" #include "adu.h" #include "gcc-compat.h" #include "cmdline.h" @@ -14,7 +15,6 @@ #include "string.h" #include "error.h" #include "portable_io.h" -#include "select.cmdline.h" /** Global dir count. */ static uint64_t num_dirs; @@ -23,9 +23,27 @@ static uint64_t num_files; /** Global bytes count. */ static uint64_t num_bytes; + /** The decimal representation of an uint64_t never exceeds that size. */ #define FORMATED_VALUE_SIZE 25 +#define USER_SUMMARY_ATOMS \ + ATOM(pw_name, STRING) \ + ATOM(uid, ID) \ + ATOM(dirs, COUNT) \ + ATOM(files, COUNT) \ + ATOM(size, SIZE) + +#define ATOM(x, y) { .name = #x, .type = AT_ ## y}, +struct atom user_summary_atoms[] = { + USER_SUMMARY_ATOMS + {.name = NULL} +}; +#undef ATOM +#define ATOM(x, y) usa_ ## x, +enum user_summary_atoms {USER_SUMMARY_ATOMS}; +#undef ATOM + /* these get filled in by the select command. */ static char count_unit_buf[4] = "( )", size_unit_buf[4] = "( )"; @@ -111,6 +129,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; @@ -184,10 +215,11 @@ static int user_stats_loop_function(struct osl_row *row, void *data) 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; @@ -202,11 +234,13 @@ static int user_stats_loop_function(struct osl_row *row, void *data) 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; @@ -222,10 +256,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--; @@ -258,9 +294,11 @@ static int global_stats_loop_function(struct osl_row *row, void *data) 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; @@ -275,11 +313,13 @@ static int global_stats_loop_function(struct osl_row *row, void *data) 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; @@ -290,10 +330,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--; @@ -329,52 +371,46 @@ 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 (select_conf.no_global_summary_given) - return; + 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 (!select_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) { - char formated_dir_count[FORMATED_VALUE_SIZE], - formated_file_count[FORMATED_VALUE_SIZE], - formated_bytes[FORMATED_VALUE_SIZE ]; - - 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(select_conf.count_unit_arg, ui->files, - select_conf.count_unit_arg == count_unit_arg_h, - formated_file_count); - 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 : "?", - (unsigned)ui->uid, - formated_dir_count, - formated_file_count, - formated_bytes - ); - return 1; + struct format_info *fi = data; + union atom_value values[] = { + [usa_pw_name] = {.string_value = ui->pw_name? + ui->pw_name : "?"}, + [usa_uid] = {.num_value = (long long unsigned)ui->uid}, + [usa_dirs] = {.num_value = (long long unsigned)ui->dirs}, + [usa_files] = {.num_value = (long long unsigned)ui->files}, + [usa_size] = {.num_value = (long long unsigned)ui->bytes} + }; + char *buf = format_items(fi, values); + return output("%s", buf); } static int name_comp(const void *a, const void *b) @@ -427,16 +463,17 @@ 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(struct format_info *fi) { if (select_conf.no_user_summary_given) - return; - 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); + return 1; + if (!select_conf.no_headers_given) { + int ret = output("User summary\n"); + if (ret < 0) + return ret; + } sort_hash_table(summary_comparators[select_conf.user_summary_sort_arg]); - for_each_admissible_user(print_user_summary_line, NULL); + return for_each_admissible_user(print_user_summary_line, fi); } static int print_user_list(struct user_info *ui, __a_unused void *data) @@ -451,21 +488,29 @@ 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 (!select_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 (!select_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); + if (ret < 0) + return ret; + } usi.count = select_conf.limit_arg, usi.ui = ui; usi.flags = USF_PRINT_DIRNAME | USF_PRINT_FILES; @@ -473,7 +518,9 @@ static int print_user_list(struct user_info *ui, __a_unused void *data) &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 && !select_conf.no_user_summary_given) { usi.count = select_conf.limit_arg; @@ -503,26 +550,36 @@ static int print_global_lists(void) if (print_size_list) { gsi.count = select_conf.limit_arg; gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_BYTES | GSF_COMPUTE_SUMMARY; - if (!select_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 = select_conf.limit_arg; gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_FILES; if (!print_size_list) gsi.flags |= GSF_COMPUTE_SUMMARY; - if (!select_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 && !select_conf.no_global_summary_given) { /* must compute summary */ @@ -536,16 +593,22 @@ static int print_global_lists(void) return 1; } -static int print_statistics(void) +static int print_statistics(struct select_format_info *sli) { int ret; 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(sli->user_summary_fi); + if (ret < 0) + return ret; return 1; } @@ -584,10 +647,18 @@ out: return ret; } -int run_select_query(struct uid_range *admissible_uids) +int run_select_query(struct uid_range *admissible_uids, + struct select_format_info *sfi) { int ret; + 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 @@ -599,37 +670,81 @@ int run_select_query(struct uid_range *admissible_uids) ret = open_dir_table(0); if (ret < 0) - return ret; + goto out; check_signals(); ret = read_uid_file(admissible_uids); if (ret < 0) - return ret; + goto out; check_signals(); - ret = print_statistics(); + ret = print_statistics(sfi); +out: close_all_tables(); + if (output_file != stdout) + fclose(output_file); return ret; } -int com_select(void) +/* return: < 0: error, >0: OK, == 0: help given */ +int parse_select_options(char *string, struct select_cmdline_parser_params *params, + struct uid_range **admissible_uids, struct select_format_info *sfi) { int ret; - struct uid_range *admissible_uids = NULL; + const char **line; 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", ¶ms)) + int argc; + char **argv; + + ret = create_argv(string, &argv); + if (ret < 0) + return ret; + argc = ret; + ret = select_cmdline_parser_ext(argc, argv, &select_conf, params); + free_argv(argv); + if (ret) return -E_SYNTAX; - ret = parse_uid_arg(select_conf.uid_arg, &admissible_uids); + if (select_conf.help_given || select_conf.detailed_help_given) + goto help; + + } + ret = parse_uid_arg(select_conf.uid_arg, admissible_uids); + if (ret < 0) + return ret; + ret = parse_format_string(select_conf.user_summary_format_arg, + user_summary_atoms, &sfi->user_summary_fi); + if (ret < 0) + return ret; + return 1; +help: + line = select_conf.detailed_help_given? + select_args_info_detailed_help : select_args_info_help; + if (!output_file) + output_file = stdout; + for (; *line; line++) { + ret = output("%s\n", *line); if (ret < 0) return ret; } - return run_select_query(admissible_uids); + return 0; +} + +int com_select(void) +{ + struct uid_range *admissible_uids = NULL; + struct select_format_info sfi; + int ret; + struct select_cmdline_parser_params params = { + .override = 1, + .initialize = 1, + .check_required = 1, + .check_ambiguity = 1, + .print_errors = 1 + }; + + select_cmdline_parser_init(&select_conf); + ret = parse_select_options(conf.select_options_arg, ¶ms, + &admissible_uids, &sfi); + if (ret <= 0) /* do not run query if help was given */ + return ret; + return run_select_query(admissible_uids, &sfi); }