]> git.tuebingen.mpg.de Git - adu.git/blobdiff - select.c
Make the header line configurable.
[adu.git] / select.c
index 152e4b98667c69fe68d5a0a53fb53b2f90b677ab..d555f1c056d738f4ac8ae8518cc143f462224213 100644 (file)
--- a/select.c
+++ b/select.c
@@ -67,6 +67,21 @@ struct atom user_list_atoms[] = {
 enum user_list_atoms {USER_LIST_ATOMS};
 #undef ATOM
 
+/* user list header */
+#define USER_LIST_HEADER_ATOMS \
+       ATOM(pw_name, STRING) \
+       ATOM(uid, ID)
+
+#define ATOM(x, y) { .name = #x, .type = AT_ ## y},
+struct atom user_list_header_atoms[] = {
+       USER_LIST_HEADER_ATOMS
+       {.name = NULL}
+};
+#undef ATOM
+#define ATOM(x, y) ulha_ ## x,
+enum user_list_header_atoms {USER_LIST_HEADER_ATOMS};
+#undef ATOM
+
 /* user summary */
 #define USER_SUMMARY_ATOMS \
        ATOM(pw_name, STRING) \
@@ -111,12 +126,21 @@ struct user_list_info {
        int osl_errno;
 };
 
+struct user_list_format_info {
+       struct format_info *fi;
+       struct format_info *header_fi;
+};
+
 struct user_summary_info {
        struct user_info *ui;
        int ret;
        int osl_errno;
 };
 
+struct user_summary_line_info {
+       struct format_info *fi;
+       uint32_t count;
+};
 
 static FILE *output_file;
 
@@ -291,6 +315,8 @@ static int print_global_summary(struct format_info *fi)
        int ret;
        char *buf;
        struct global_summary_info gsi = {.num_dirs = 0};
+       char *header = select_conf.header_given? select_conf.header_arg :
+               "Global summary\n";
 
        union atom_value values[] = {
                [gsa_dirs] = {.num_value = 0ULL},
@@ -305,11 +331,10 @@ static int print_global_summary(struct format_info *fi)
        values[gsa_dirs].num_value = (long long unsigned)gsi.num_dirs;
        values[gsa_files].num_value = (long long unsigned)gsi.num_files;
        values[gsa_size].num_value = (long long unsigned)gsi.num_bytes;
-       if (!select_conf.no_headers_given) {
-               ret = output("Global summary\n");
-               if (ret < 0)
-                       return ret;
-       }
+
+       ret = output("%s", header);
+       if (ret < 0)
+               return ret;
        buf = format_items(fi, values);
        ret = output("%s", buf);
        free(buf);
@@ -348,7 +373,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 +383,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 +407,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
        };
+       char *header = select_conf.header_given? select_conf.header_arg :
+               "User summary\n";
 
-       if (!select_conf.no_headers_given) {
-               int ret = output("User summary\n");
-               if (ret < 0)
-                       return ret;
-       }
-       int ret = for_each_admissible_user(compute_user_summary, fi);
+       ret = output("%s", header);
        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);
+       ret = for_each_admissible_user(compute_user_summary, NULL);
+       if (ret < 0)
+               return ret;
+       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)
@@ -481,28 +519,47 @@ err:
 
 static int print_user_list(struct user_info *ui, void *data)
 {
-       struct format_info *fi = data;
+       struct user_list_format_info *ulfi = data;
        int ret;
-       enum user_table_columns sort_column = UT_BYTES;
+       enum user_table_columns sort_column;
        struct user_list_info uli = {
                .ui = ui,
-               .fi = fi,
+               .fi = ulfi->fi,
                .count = select_conf.limit_arg
        };
+       union atom_value header_values[] = {
+               [ulha_uid] = {.num_value = (long long unsigned)ui->uid},
+               [ulha_pw_name] = {.string_value = ui->pw_name?
+                       ui->pw_name : "?"}
+       };
+       char *buf = format_items(ulfi->header_fi, header_values);
 
+       ret = output("%s", buf);
+       free(buf);
+       if (ret < 0)
+               return ret;
        if (select_conf.list_sort_arg == list_sort_arg_file_count)
                sort_column = UT_FILES;
-
-       if (!select_conf.no_headers_given) {
-               ret = output("%s (uid %u)\n",
-                       ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid);
-               if (ret < 0)
-                       return ret;
-       }
+       else
+               sort_column = UT_BYTES;
        return adu_loop_reverse(ui->table, sort_column, &uli, user_list_loop_function,
                &uli.ret, &uli.osl_errno);
 }
 
+static int print_user_lists(struct format_info *fi)
+{
+       struct user_list_format_info ulfi = {.fi = fi};
+       char *header_fmt = select_conf.header_given?
+               select_conf.header_arg : "uid %(uid)(%(pw_name)):\n";
+       int ret = parse_format_string(header_fmt,
+               user_list_header_atoms, &ulfi.header_fi);
+       if (ret < 0)
+               return ret;
+       ret = for_each_admissible_user(print_user_list, &ulfi);
+       free_format_info(ulfi.header_fi);
+       return ret;
+}
+
 static int global_list_loop_function(struct osl_row *row, void *data)
 {
        struct global_list_info *gli = data;
@@ -553,19 +610,20 @@ err:
 static int print_global_list(struct format_info *fi)
 {
        int ret;
-       enum dir_table_columns sort_column = DT_BYTES;
+       enum dir_table_columns sort_column;
        struct global_list_info gli = {
                .fi = fi,
                .count = select_conf.limit_arg
        };
-
-       if (!select_conf.no_headers_given) {
-               ret = output("Global list\n");
-               if (ret < 0)
-                       return ret;
-       }
+       char *header = select_conf.header_given?
+               select_conf.header_arg : "Global list\n";
+       ret = output("%s", header);
+       if (ret < 0)
+               return ret;
        if (select_conf.list_sort_arg == list_sort_arg_file_count)
                sort_column = DT_FILES;
+       else
+               sort_column = DT_BYTES;
        return adu_loop_reverse(dir_table, sort_column, &gli,
                global_list_loop_function, &gli.ret, &gli.osl_errno);
 }
@@ -573,17 +631,17 @@ static int print_global_list(struct format_info *fi)
 static int print_statistics(struct format_info *fi)
 {
        switch (select_conf.select_mode_arg) {
-               case select_mode_arg_global_list:
-                       return print_global_list(fi);
-               case select_mode_arg_global_summary:
-                       return print_global_summary(fi);
-               case select_mode_arg_user_list:
-                       return for_each_admissible_user(print_user_list, fi);
-               case select_mode_arg_user_summary:
-                       return print_user_summary(fi);
+       case select_mode_arg_global_list:
+               return print_global_list(fi);
+       case select_mode_arg_global_summary:
+               return print_global_summary(fi);
+       case select_mode_arg_user_list:
+               return print_user_lists(fi);
+       case select_mode_arg_user_summary:
+               return print_user_summary(fi);
        };
        ERROR_LOG("bad select mode\n");
-       return -ERRNO_TO_ERROR(-EINVAL);
+       return -ERRNO_TO_ERROR(EINVAL);
 }
 
 static int open_pipe(char *path)
@@ -686,13 +744,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;
@@ -734,7 +791,7 @@ static int setup_format_string(char *fmt, struct format_info **fi)
                break;
        default:
                ERROR_LOG("bad select mode\n");
-               return -ERRNO_TO_ERROR(-EINVAL);
+               return -ERRNO_TO_ERROR(EINVAL);
        };
        INFO_LOG("format string: %s\n", fmt);
        return parse_format_string(fmt, atoms, fi);
@@ -799,12 +856,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;
 }