X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;h=4795de453adc095bdd0bf80134c5d4478dc40343;hp=59755a66e9a1f119f0ffe28042ae4b8097f26d35;hb=e2fe978a3fa04160d60a4d39659f05798d356fab;hpb=587e1a5b8b5b0b35a18eaf4f8852cf5b775f1e86 diff --git a/select.c b/select.c index 59755a6..4795de4 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) { @@ -116,34 +116,37 @@ static int get_dir_name_by_number(uint64_t *dirnum, char **name) char *result = NULL, *tmp; struct osl_row *row; uint64_t val = *dirnum; - struct osl_object obj = {.data = &val, .size = sizeof(val)}; + struct osl_object obj; int ret; + char *pfx; again: + obj.data = &val; + obj.size = sizeof(val); ret = osl(osl_get_row(dir_table, DT_NUM, &obj, &row)); if (ret < 0) goto out; - ret = osl(osl_get_object(dir_table, row, DT_NAME, &obj)); - if (ret < 0) - goto out; - if (result) { - tmp = make_message("%s/%s", (char *)obj.data, result); - free(result); - result = tmp; - } else - result = adu_strdup((char *)obj.data); ret = osl(osl_get_object(dir_table, row, DT_PARENT_NUM, &obj)); if (ret < 0) goto out; val = *(uint64_t *)obj.data; + ret = osl(osl_get_object(dir_table, row, DT_NAME, &obj)); + if (ret < 0) + goto out; + 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; } @@ -151,30 +154,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; @@ -194,8 +181,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))? @@ -212,8 +199,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", @@ -268,8 +255,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))? @@ -285,8 +272,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", @@ -349,13 +336,13 @@ static void print_global_summary(void) enum enum_count_unit ud, uf; enum enum_size_unit us; - if (conf.no_global_summary_given) + if (select_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) + if (!select_conf.no_headers_given) printf("Global summary " "(dirs(%c)/files(%c)/size(%c))\n", count_unit_abbrevs[ud], @@ -371,14 +358,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 : "?", @@ -442,13 +429,13 @@ static int (*summary_comparators[])(const void *, const void *) = { static void print_user_summary(void) { - if (conf.no_user_summary_given) + if (select_conf.no_user_summary_given) return; - if (!conf.no_headers_given) + 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); - 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); } @@ -456,15 +443,15 @@ 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) + if (!select_conf.no_headers_given) printf("%s (uid %u), by size%s:\n", ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid, size_unit_buf); @@ -475,11 +462,11 @@ static int print_user_list(struct user_info *ui, __a_unused void *data) printf("\n"); } if (ula == user_list_arg_file_count || ula == user_list_arg_both) { - if (!conf.no_headers_given) + if (!select_conf.no_headers_given) 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, @@ -488,8 +475,8 @@ static int print_user_list(struct user_info *ui, __a_unused void *data) return ret; printf("\n"); } - 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, @@ -509,14 +496,14 @@ 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) + if (!select_conf.no_headers_given) printf("By size%s:\n", size_unit_buf); ret = adu_loop_reverse(dir_table, DT_BYTES, &gsi, global_stats_loop_function, &gsi.ret, &gsi.osl_errno); @@ -525,11 +512,11 @@ 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; - if (!conf.no_headers_given) + if (!select_conf.no_headers_given) printf("By file count%s:\n", count_unit_buf); ret = adu_loop_reverse(dir_table, DT_FILES, &gsi, global_stats_loop_function, &gsi.ret, &gsi.osl_errno); @@ -537,9 +524,9 @@ static int print_global_lists(void) return ret; printf("\n"); } - 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); @@ -562,7 +549,7 @@ static int print_statistics(void) return 1; } -static int read_uid_file(void) +static int read_uid_file(struct uid_range *admissible_uids) { size_t size; uint32_t n; @@ -588,7 +575,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; } @@ -597,16 +584,16 @@ 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.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'; @@ -614,7 +601,7 @@ int com_select(void) if (ret < 0) return ret; check_signals(); - ret = read_uid_file(); + ret = read_uid_file(admissible_uids); if (ret < 0) return ret; check_signals(); @@ -622,3 +609,27 @@ int com_select(void) close_all_tables(); 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", ¶ms)) + return -E_SYNTAX; + ret = parse_uid_arg(select_conf.uid_arg, &admissible_uids); + if (ret < 0) + return ret; + } + return run_select_query(admissible_uids); +}