* Licensed under the GPL v2. For licencing details see COPYING.
*/
-/** \file select.c The select mode of adu. */
+/** \file select.c \brief The select mode of adu. */
#include <dirent.h> /* readdir() */
+#include <sys/types.h>
+#include <regex.h>
+
+#include "format.h"
#include "adu.h"
#include "gcc-compat.h"
#include "cmdline.h"
#include "fd.h"
#include "string.h"
#include "error.h"
-#include "portable_io.h"
-
-/** Global dir count. */
-static uint64_t num_dirs;
-/** Global files count. */
-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
-
-/* these get filled in by the select command. */
-static char count_unit_buf[4] = "( )", size_unit_buf[4] = "( )";
-
-enum global_stats_flags {
- GSF_PRINT_DIRNAME = 1,
- GSF_PRINT_BYTES = 2,
- GSF_PRINT_FILES = 4,
- GSF_COMPUTE_SUMMARY = 8,
+#include "user.h"
+#include "select.cmdline.h"
+
+/** \cond */
+/* global list */
+#define GLOBAL_LIST_ATOMS \
+ ATOM(size, SIZE) \
+ ATOM(files, COUNT) \
+ ATOM(dirname, STRING) \
+
+#define ATOM(x, y) { .name = #x, .type = AT_ ## y},
+struct atom global_list_atoms[] = {
+ GLOBAL_LIST_ATOMS
+ {.name = NULL}
+};
+#undef ATOM
+#define ATOM(x, y) gla_ ## x,
+enum global_list_atoms {GLOBAL_LIST_ATOMS};
+#undef ATOM
+
+/* global summary */
+#define GLOBAL_SUMMARY_ATOMS \
+ ATOM(dirs, COUNT) \
+ ATOM(files, COUNT) \
+ ATOM(size, SIZE)
+
+#define ATOM(x, y) { .name = #x, .type = AT_ ## y},
+struct atom global_summary_atoms[] = {
+ GLOBAL_SUMMARY_ATOMS
+ {.name = NULL}
+};
+#undef ATOM
+#define ATOM(x, y) gsa_ ## x,
+enum global_summary_atoms {GLOBAL_SUMMARY_ATOMS};
+#undef ATOM
+
+/* user list */
+#define USER_LIST_ATOMS \
+ ATOM(pw_name, STRING) \
+ ATOM(uid, ID) \
+ ATOM(size, SIZE) \
+ ATOM(files, COUNT) \
+ ATOM(dirname, STRING) \
+
+#define ATOM(x, y) { .name = #x, .type = AT_ ## y},
+struct atom user_list_atoms[] = {
+ USER_LIST_ATOMS
+ {.name = NULL}
+};
+#undef ATOM
+#define ATOM(x, y) ula_ ## x,
+enum user_list_atoms {USER_LIST_ATOMS};
+#undef ATOM
+
+/* user list header */
+#define USER_LIST_HEADER_TRAILER_ATOMS \
+ ATOM(pw_name, STRING) \
+ ATOM(uid, ID)
+
+#define ATOM(x, y) { .name = #x, .type = AT_ ## y},
+struct atom user_list_header_trailer_atoms[] = {
+ USER_LIST_HEADER_TRAILER_ATOMS
+ {.name = NULL}
};
+#undef ATOM
+#define ATOM(x, y) ulha_ ## x,
+enum user_list_header_trailer_atoms {USER_LIST_HEADER_TRAILER_ATOMS};
+#undef ATOM
-struct global_stats_info {
+/* user summary */
+#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
+
+/** \endcond */
+
+struct global_list_info {
uint32_t count;
int ret;
int osl_errno;
- enum global_stats_flags flags;
+ struct format_info *fi;
+ regex_t *preg;
+ int inverse_matching;
};
-enum user_stats_flags {
- USF_PRINT_DIRNAME = 1,
- USF_PRINT_BYTES = 2,
- USF_PRINT_FILES = 4,
- USF_COMPUTE_SUMMARY = 8,
+struct global_summary_info {
+ /** Global dir count. */
+ uint64_t num_dirs;
+ /** Global files count. */
+ uint64_t num_files;
+ /** Global bytes count. */
+ uint64_t num_bytes;
+ regex_t *preg;
+ int inverse_matching;
+ int ret;
+ int osl_errno;
};
-struct user_stats_info {
+struct user_list_info {
uint32_t count;
- enum user_stats_flags flags;
+ struct user_info *ui;
+ struct format_info *fi;
+ regex_t *preg;
+ int inverse_matching;
int ret;
int osl_errno;
- struct user_info *ui;
};
-static const uint64_t size_unit_divisors[] = {
- [size_unit_arg_b] = 1ULL,
- [size_unit_arg_k] = 1024ULL,
- [size_unit_arg_m] = 1024ULL * 1024ULL,
- [size_unit_arg_g] = 1024ULL * 1024ULL * 1024ULL,
- [size_unit_arg_t] = 1024ULL * 1024ULL * 1024ULL * 1024ULL,
+struct user_list_format_info {
+ struct format_info *fi;
+ struct format_info *header_fi;
+ struct format_info *trailer_fi;
};
-static const uint64_t count_unit_divisors[] = {
-
- [count_unit_arg_n] = 1ULL,
- [count_unit_arg_k] = 1000ULL,
- [count_unit_arg_m] = 1000ULL * 1000ULL,
- [count_unit_arg_g] = 1000ULL * 1000ULL * 1000ULL,
- [count_unit_arg_t] = 1000ULL * 1000ULL * 1000ULL * 1000ULL,
+struct user_summary_info {
+ struct user_info *ui;
+ /** Total number of files owned by this user. */
+ uint64_t files;
+ /** Total number of bytes owned by this user. */
+ uint64_t bytes;
+ /** Total number of directories that contain at least one file */
+ uint64_t dirs;
+ int ret;
+ int osl_errno;
+ regex_t *preg;
+ int inverse_matching;
};
-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)
-{
- enum enum_size_unit u = unit;
- char unit_buf[2] = "\0\0";
-
- if (unit == size_unit_arg_h) /* human readable */
- for (u = size_unit_arg_b; u < size_unit_arg_t &&
- value > size_unit_divisors[u + 1]; u++)
- ; /* nothing */
- if (print_unit)
- unit_buf[0] = size_unit_abbrevs[u];
- sprintf(result, "%llu%s",
- (long long unsigned)value / size_unit_divisors[u], unit_buf);
- return u;
-}
-
-static enum enum_count_unit format_count_value(enum enum_count_unit unit,
- uint64_t value, int print_unit, char *result)
-{
- enum enum_count_unit u = unit;
- char unit_buf[2] = "\0\0";
-
- if (unit == count_unit_arg_h) /* human readable */
- for (u = count_unit_arg_n; u < count_unit_arg_t &&
- value > count_unit_divisors[u + 1]; u++)
- ; /* nothing */
- if (print_unit)
- unit_buf[0] = count_unit_abbrevs[u];
- sprintf(result, "%llu%s",
- (long long unsigned)value / count_unit_divisors[u], unit_buf);
- return u;
-}
+struct user_summary_loop_data {
+ unsigned num_admissible_users;
+ struct user_summary_info *usis;
+ struct user_summary_info *current;
+ struct format_info *fi;
+};
static FILE *output_file;
return get_dir_name_by_number((uint64_t *)obj.data, name);
}
-static int user_stats_loop_function(struct osl_row *row, void *data)
+static int get_dir_name_of_user_row(struct osl_row *user_table_row,
+ struct user_info *ui, char **dirname)
{
- struct user_stats_info *usi = data;
struct osl_object obj;
- int ret, summary = usi->flags & GSF_COMPUTE_SUMMARY;
- char formated_value[FORMATED_VALUE_SIZE];
+ int ret = osl(osl_get_object(ui->table, user_table_row,
+ UT_DIR_NUM, &obj));
- check_signals();
- if (!usi->count && !summary) {
- ret = -E_LOOP_COMPLETE;
- goto err;
- }
- if (summary || (usi->count && (usi->flags & USF_PRINT_FILES))) {
- uint64_t files;
- ret = osl(osl_get_object(usi->ui->table, row, UT_FILES, &obj));
- if (ret < 0)
- goto err;
- files = *(uint64_t *)obj.data;
- if (usi->count && (usi->flags & USF_PRINT_FILES)) {
- format_count_value(select_conf.count_unit_arg, files,
- select_conf.count_unit_arg == count_unit_arg_h,
- formated_value);
- ret = output("\t%s%s", formated_value,
- (usi->flags & (USF_PRINT_BYTES | USF_PRINT_DIRNAME))?
- "\t" : "\n");
- if (ret < 0)
- goto err;
- }
- if (summary)
- usi->ui->files += files;
- }
- if (summary || (usi->count && (usi->flags & USF_PRINT_BYTES))) {
- uint64_t bytes;
- ret = osl(osl_get_object(usi->ui->table, row, UT_BYTES, &obj));
- if (ret < 0)
- goto err;
- bytes = *(uint64_t *)obj.data;
- if (usi->count && (usi->flags & USF_PRINT_BYTES)) {
- format_size_value(select_conf.size_unit_arg, bytes,
- select_conf.size_unit_arg == size_unit_arg_h,
- formated_value);
- 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;
- usi->ui->dirs++;
- }
+ if (ret < 0)
+ return ret;
+ return get_dir_name_by_number((uint64_t *)obj.data, dirname);
+}
- }
- if (usi->count && (usi->flags & USF_PRINT_DIRNAME)) {
- char *dirname;
- ret = osl(osl_get_object(usi->ui->table, row, UT_DIR_NUM, &obj));
- if (ret < 0)
- goto err;
- ret = get_dir_name_by_number((uint64_t *)obj.data, &dirname);
- if (ret < 0)
- goto err;
- 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--;
+static int get_num_files_of_row(struct osl_row *row, uint64_t *num_files)
+{
+ struct osl_object obj;
+ int ret = osl(osl_get_object(dir_table, row, DT_FILES, &obj));
+ if (ret < 0)
+ return ret;
+ *num_files = *(uint64_t *)obj.data;
return 1;
-err:
- usi->ret = ret;
- usi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
- return -1;
}
-static int global_stats_loop_function(struct osl_row *row, void *data)
+static int get_num_user_files(struct osl_row *row, struct user_info *ui,
+ uint64_t *num_files)
{
- struct global_stats_info *gsi = data;
struct osl_object obj;
- char *dirname, formated_value[FORMATED_VALUE_SIZE];
- int ret, summary = gsi->flags & GSF_COMPUTE_SUMMARY;
+ int ret = osl(osl_get_object(ui->table, row, UT_FILES, &obj));
- check_signals();
- if (!gsi->count && !summary) {
- ret = -E_LOOP_COMPLETE;
- goto err;
- }
- if (summary || (gsi->count && (gsi->flags & GSF_PRINT_FILES))) {
- uint64_t files;
- ret = osl(osl_get_object(dir_table, row, DT_FILES, &obj));
- if (ret < 0)
- goto err;
- files = *(uint64_t *)obj.data;
- if (gsi->count && (gsi->flags & GSF_PRINT_FILES)) {
- format_count_value(select_conf.count_unit_arg, files,
- select_conf.count_unit_arg == count_unit_arg_h,
- 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;
+ if (ret < 0)
+ return ret;
+ *num_files = *(uint64_t *)obj.data;
+ return 1;
+}
+
+static int get_num_bytes_of_row(struct osl_row *row, uint64_t *num_bytes)
+{
+ struct osl_object obj;
+ int ret = osl(osl_get_object(dir_table, row, DT_BYTES, &obj));
+ if (ret < 0)
+ return ret;
+ *num_bytes = *(uint64_t *)obj.data;
+ return 1;
+}
+
+static int get_num_user_bytes(struct osl_row *row, struct user_info *ui,
+ uint64_t *num_bytes)
+{
+ struct osl_object obj;
+ int ret = osl(osl_get_object(ui->table, row, UT_BYTES, &obj));
+
+ if (ret < 0)
+ return ret;
+ *num_bytes = *(uint64_t *)obj.data;
+ return 1;
+}
+
+static void free_regex(regex_t *preg)
+{
+ if (!preg)
+ return;
+ regfree(preg);
+ free(preg);
+}
+
+static int compile_regex(regex_t **preg, int *invert)
+{
+ int ret;
+ size_t size;
+ char *buf, *p = select_conf.pattern_arg;
+
+ if (!select_conf.pattern_given || !p[0]) {
+ *preg = NULL;
+ return 0;
}
- if (summary || (gsi->count && (gsi->flags & GSF_PRINT_BYTES))) {
- uint64_t bytes;
- ret = osl(osl_get_object(dir_table, row, DT_BYTES, &obj));
- if (ret < 0)
- goto err;
- bytes = *(uint64_t *)obj.data;
- if (gsi->count && (gsi->flags & GSF_PRINT_BYTES)) {
- format_size_value(select_conf.size_unit_arg, bytes,
- select_conf.size_unit_arg == size_unit_arg_h,
- formated_value);
- 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 (p[0] == '!') {
+ if (!p[1]) {
+ *preg = NULL;
+ return -E_REGEX;
}
- if (summary) {
- num_bytes += bytes;
- num_dirs++;
- }
- }
- if (gsi->count && (gsi->flags & GSF_PRINT_DIRNAME)) {
- ret = get_dir_name_of_row(row, &dirname);
- if (ret < 0)
- goto err;
- 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--;
+ *invert = 1;
+ p++;
+ } else
+ *invert = 0;
+ *preg = adu_malloc(sizeof(regex_t));
+ ret = regcomp(*preg, p, 0);
+ if (!ret)
+ return 1;
+ size = regerror(ret, *preg, NULL, 0);
+ buf = adu_malloc(size);
+ regerror(ret, *preg, buf, size);
+ ERROR_LOG("%s\n", buf);
+ free(buf);
+ free_regex(*preg);
+ *preg = NULL;
+ return -E_REGEX;
+}
+
+static int dir_is_admissible(char *dirname, regex_t *preg, int inverse_matching)
+{
+ int ret;
+
+ if (!preg)
+ return 1;
+ ret = regexec(preg, dirname, 0, NULL, 0);
+ if (ret == REG_NOMATCH && !inverse_matching)
+ return 0;
+ if (ret != REG_NOMATCH && inverse_matching)
+ return 0;
return 1;
-err:
- gsi->ret = ret;
- gsi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
- return -1;
}
static int check_loop_return(int ret, int loop_ret, int loop_osl_errno)
return check_loop_return(ret, *loop_ret, *loop_osl_errno);
}
-static int print_global_summary(void)
+static int global_summary_loop_function(struct osl_row *row, void *data)
{
- char d[FORMATED_VALUE_SIZE], f[FORMATED_VALUE_SIZE],
- s[FORMATED_VALUE_SIZE];
- enum enum_count_unit ud, uf;
- enum enum_size_unit us;
+ struct global_summary_info *gsi = data;
int ret;
+ uint64_t num;
- if (select_conf.no_global_summary_given)
- 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) {
- ret = output("Global summary "
- "(dirs(%c)/files(%c)/size(%c))\n",
- count_unit_abbrevs[ud],
- count_unit_abbrevs[uf],
- size_unit_abbrevs[us]
- );
+ if (gsi->preg) {
+ char *dirname;
+ ret = get_dir_name_of_row(row, &dirname);
if (ret < 0)
- return ret;
+ goto err;
+ ret = dir_is_admissible(dirname, gsi->preg, gsi->inverse_matching);
+ free(dirname);
+ if (!ret)
+ return 1;
+ }
+
+ ret = get_num_files_of_row(row, &num);
+ if (ret < 0)
+ goto err;
+ gsi->num_files += num;
+
+ ret = get_num_bytes_of_row(row, &num);
+ if (ret < 0)
+ goto err;
+ gsi->num_bytes += num;
+ gsi->num_dirs++;
+ return 1;
+err:
+ gsi->ret = ret;
+ gsi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
+ return ret;
+}
+
+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},
+ [gsa_files] = {.num_value = 0ULL},
+ [gsa_size] = {.num_value = 0ULL}
+ };
+
+ ret = compile_regex(&gsi.preg, &gsi.inverse_matching);
+ if (ret < 0)
+ return ret;
+ ret = adu_loop_reverse(dir_table, DT_BYTES, &gsi,
+ global_summary_loop_function, &gsi.ret, &gsi.osl_errno);
+ free_regex(gsi.preg);
+ if (ret < 0)
+ return ret;
+ 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;
+
+ ret = output("%s", header);
+ if (ret < 0)
+ return ret;
+ buf = format_items(fi, values);
+ ret = output("%s", buf);
+ free(buf);
+ if (ret < 0)
+ return ret;
+ return output("%s", select_conf.trailer_arg);
+}
+
+static int user_summary_loop_function(struct osl_row *row, void *data)
+{
+ struct user_summary_info *usi = data;
+ uint64_t num;
+ int ret;
+
+ if (usi->preg) {
+ char *dirname;
+ ret = get_dir_name_of_row(row, &dirname);
+ if (ret < 0)
+ goto err;
+ ret = dir_is_admissible(dirname, usi->preg, usi->inverse_matching);
+ free(dirname);
+ if (!ret)
+ return 1;
}
- return output("\t%s\t%s\t%s\n\n", d, f, s);
+ ret = get_num_user_files(row, usi->ui, &num);
+ if (ret < 0)
+ goto err;
+ usi->files += num;
+ ret = get_num_user_bytes(row, usi->ui, &num);
+ if (ret < 0)
+ goto err;
+ usi->bytes += num;
+ usi->dirs++;
+ return 1;
+err:
+ usi->ret = ret;
+ usi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
+ return ret;
}
-static int print_user_summary_line(struct user_info *ui, __a_unused void *data)
+static int compute_user_summary(struct user_info *ui, void *data)
{
- char formated_dir_count[FORMATED_VALUE_SIZE],
- formated_file_count[FORMATED_VALUE_SIZE],
- formated_bytes[FORMATED_VALUE_SIZE ];
+ struct user_summary_loop_data *usld = data;
+ struct user_summary_info *usi = usld->current++;
+ int ret = compile_regex(&usi->preg, &usi->inverse_matching);
- 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);
- return output("\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
- );
+ if (ret < 0)
+ return ret;
+ usi->ui = ui;
+ ret = adu_loop_reverse(ui->table, UT_BYTES, usi, user_summary_loop_function,
+ &usi->ret, &usi->osl_errno);
+ free_regex(usi->preg);
+ return ret;
+}
+
+static int print_user_summary_line(struct user_summary_info *usi,
+ struct format_info *fi)
+{
+ struct user_info *ui = usi->ui;
+ 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)usi->dirs},
+ [usa_files] = {.num_value = (long long unsigned)usi->files},
+ [usa_size] = {.num_value = (long long unsigned)usi->bytes}
+ };
+ char *buf = format_items(fi, values);
+ int ret = output("%s", buf);
+
+ free(buf);
+ return ret;
}
static int name_comp(const void *a, const void *b)
{
- char *x = ((struct user_info *)a)->pw_name;
- char *y = ((struct user_info *)b)->pw_name;
+ const struct user_summary_info *x = a, *y = b;
+ char *n1 = x->ui->pw_name;
+ char *n2 = y->ui->pw_name;
- if (!x)
+ if (!n1)
return 1;
- if (!y)
+ if (!n2)
return -1;
- return strcmp(x, y);
+ return strcmp(n1, n2);
}
static int uid_comp(const void *a, const void *b)
{
- return -NUM_COMPARE(((struct user_info *)a)->uid,
- ((struct user_info *)b)->uid);
+ const struct user_summary_info *x = a, *y = b;
+ return -NUM_COMPARE(x->ui->uid, y->ui->uid);
}
static int dir_count_comp(const void *a, const void *b)
{
- return NUM_COMPARE(((struct user_info *)a)->dirs,
- ((struct user_info *)b)->dirs);
+ const struct user_summary_info *x = a, *y = b;
+ return NUM_COMPARE(x->dirs, y->dirs);
}
static int file_count_comp(const void *a, const void *b)
{
- return NUM_COMPARE(((struct user_info *)a)->files,
- ((struct user_info *)b)->files);
+ const struct user_summary_info *x = a, *y = b;
+ return NUM_COMPARE(x->files, y->files);
}
static int size_comp(const void *a, const void *b)
{
- return NUM_COMPARE(((struct user_info *)a)->bytes,
- ((struct user_info *)b)->bytes);
+ const struct user_summary_info *x = a, *y = b;
+ return NUM_COMPARE(x->bytes, y->bytes);
}
-/*
- * 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,
-};
+static int count_admissible_users(__a_unused struct user_info *ui, void *data)
+{
+ struct user_summary_loop_data *usld = data;
+ usld->num_admissible_users++;
+ return 1;
+}
-static int print_user_summary(void)
+static int print_user_summary(struct format_info *fi)
{
- if (select_conf.no_user_summary_given)
+ int i, ret;
+ int (*comp)(const void *a, const void *b);
+ struct user_summary_loop_data usld = { .fi = fi};
+ char *header = select_conf.header_given? select_conf.header_arg :
+ "User summary\n";
+
+ ret = output("%s", header);
+ if (ret < 0)
+ return ret;
+ ret = for_each_admissible_user(count_admissible_users, &usld);
+ if (ret < 0)
+ return ret;
+ if (usld.num_admissible_users == 0)
return 1;
- if (!select_conf.no_headers_given) {
- int ret = output("User summary "
- "(pw_name/uid/dirs%s/files%s/size%s):\n",
- count_unit_buf, count_unit_buf, size_unit_buf);
+ usld.usis = adu_calloc(usld.num_admissible_users
+ * sizeof(struct user_summary_info));
+ usld.current = usld.usis;
+ ret = for_each_admissible_user(compute_user_summary, &usld);
+ if (ret < 0)
+ goto out;
+ 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;
+ default: /* this should never happen, but anyway */
+ comp = size_comp;
+ break;
+ }
+ qsort(usld.usis, usld.num_admissible_users,
+ sizeof(struct user_summary_info), comp);
+ for (i = 0; i < usld.num_admissible_users; i++) {
+ if (select_conf.limit_arg >= 0 && i > select_conf.limit_arg)
+ break;
+ ret = print_user_summary_line(usld.usis + i, usld.fi);
if (ret < 0)
- return ret;
+ goto out;
}
- sort_hash_table(summary_comparators[select_conf.user_summary_sort_arg]);
- return for_each_admissible_user(print_user_summary_line, NULL);
+ ret = output("%s", select_conf.trailer_arg);
+out:
+ free(usld.usis);
+ return ret;
}
-static int print_user_list(struct user_info *ui, __a_unused void *data)
+static int user_list_loop_function(struct osl_row *row, void *data)
{
+ struct user_list_info *uli = data;
+ union atom_value values[] = {
+ [ula_pw_name] = {.string_value = uli->ui->pw_name?
+ uli->ui->pw_name : "?"},
+ [ula_uid] = {.num_value = (long long unsigned)uli->ui->uid},
+ [ula_files] = {.num_value = 0ULL},
+ [ula_size] = {.num_value = 0ULL},
+ [ula_dirname] = {.string_value = NULL}
+ };
+ uint64_t num;
int ret;
- struct user_stats_info usi;
- 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 = select_conf.limit_arg;
- usi.ui = ui;
- usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
- 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;
- 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) {
- 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;
- ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
- &usi.ret, &usi.osl_errno);
- if (ret < 0)
- return ret;
- 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;
- usi.ui = ui;
- usi.flags = USF_COMPUTE_SUMMARY;
- ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
- &usi.ret, &usi.osl_errno);
- if (ret < 0)
- return ret;
+ char *dirname = NULL, *buf;
+
+ check_signals();
+ ret = -E_LOOP_COMPLETE;
+ if (!uli->count)
+ goto err;
+
+ ret = get_dir_name_of_user_row(row, uli->ui, &dirname);
+ if (ret < 0)
+ goto err;
+ if (!dir_is_admissible(dirname, uli->preg, uli->inverse_matching)) {
+ free(dirname);
+ return 1;
}
- return 1;
+ values[ula_dirname].string_value = dirname;
+
+ ret = get_num_user_files(row, uli->ui, &num);
+ if (ret < 0)
+ goto err;
+ values[ula_files].num_value = num;
+
+ ret = get_num_user_bytes(row, uli->ui, &num);
+ if (ret < 0)
+ goto err;
+ values[ula_size].num_value = num;
+
+ buf = format_items(uli->fi, values);
+ free(dirname);
+ dirname = NULL;
+ ret = output("%s", buf);
+ free(buf);
+ if (ret < 0)
+ goto err;
+ uli->count--;
+ return ret;
+err:
+ free(dirname);
+ uli->ret = ret;
+ uli->osl_errno = (ret == -E_OSL)? osl_errno : 0;
+ return ret;
}
-static int print_user_lists(void)
+static int print_user_list(struct user_info *ui, void *data)
{
- return for_each_admissible_user(print_user_list, NULL);
+ struct user_list_format_info *ulfi = data;
+ int ret;
+ enum user_table_columns sort_column;
+ struct user_list_info uli = {
+ .ui = ui,
+ .fi = ulfi->fi,
+ .count = select_conf.limit_arg
+ };
+ union atom_value header_trailer_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_trailer_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;
+ else
+ sort_column = UT_BYTES;
+
+ ret = compile_regex(&uli.preg, &uli.inverse_matching);
+ if (ret < 0)
+ return ret;
+ ret = adu_loop_reverse(ui->table, sort_column, &uli,
+ user_list_loop_function, &uli.ret, &uli.osl_errno);
+ free_regex(uli.preg);
+ if (ret < 0)
+ return ret;
+ buf = format_items(ulfi->trailer_fi, header_trailer_values);
+ ret = output("%s", buf);
+ free(buf);
+ return ret;
}
-static int print_global_lists(void)
+static int print_user_lists(struct format_info *fi)
{
- struct global_stats_info gsi;
+ struct user_list_format_info ulfi = {.fi = fi};
+ char *header_fmt = select_conf.header_given?
+ select_conf.header_arg : "uid %(uid)(%(pw_name)):\n";
+ char *trailer_fmt = select_conf.trailer_arg;
+ int ret = parse_format_string(header_fmt,
+ user_list_header_trailer_atoms, &ulfi.header_fi);
+ if (ret < 0)
+ return ret;
+ ret = parse_format_string(trailer_fmt,
+ user_list_header_trailer_atoms, &ulfi.trailer_fi);
+ if (ret < 0)
+ return ret;
+ ret = for_each_admissible_user(print_user_list, &ulfi);
+ free_format_info(ulfi.header_fi);
+ free_format_info(ulfi.trailer_fi);
+ return ret;
+}
+
+static int global_list_loop_function(struct osl_row *row, void *data)
+{
+ struct global_list_info *gli = data;
+ union atom_value values[] = {
+ [gla_size] = {.num_value = 0ULL},
+ [gla_files] = {.num_value = 0ULL},
+ [gla_dirname] = {.string_value = NULL}
+ };
+ uint64_t num_files, num_bytes;
+ char *dirname = NULL, *buf;
int ret;
- 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 = select_conf.limit_arg;
- gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_BYTES | GSF_COMPUTE_SUMMARY;
- 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;
- 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) {
- 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;
- ret = output("\n");
- if (ret < 0)
- return ret;
- }
- if (gla == global_list_arg_none && !select_conf.no_global_summary_given) {
- /* must compute summary */
- 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);
- if (ret < 0)
- return ret;
+
+ check_signals();
+ ret = -E_LOOP_COMPLETE;
+ if (!gli->count)
+ goto err;
+
+ ret = get_dir_name_of_row(row, &dirname);
+ if (ret < 0)
+ goto err;
+ if (!dir_is_admissible(dirname, gli->preg, gli->inverse_matching)) {
+ free(dirname);
+ return 1;
}
- return 1;
+ values[gla_dirname].string_value = dirname;
+
+ ret = get_num_files_of_row(row, &num_files);
+ if (ret < 0)
+ goto err;
+ values[gla_files].num_value = (long long unsigned)num_files;
+
+ ret = get_num_bytes_of_row(row, &num_bytes);
+ if (ret < 0)
+ goto err;
+ values[gla_size].num_value = (long long unsigned)num_bytes;
+
+ buf = format_items(gli->fi, values);
+ free(dirname);
+ dirname = NULL;
+ ret = output("%s", buf);
+ free(buf);
+ if (ret < 0)
+ goto err;
+ if (gli->count > 0)
+ gli->count--;
+ return ret;
+err:
+ free(dirname);
+ gli->ret = ret;
+ gli->osl_errno = (ret == -E_OSL)? osl_errno : 0;
+ return -1;
}
-static int print_statistics(void)
+static int print_global_list(struct format_info *fi)
{
int ret;
+ enum dir_table_columns sort_column;
+ struct global_list_info gli = {
+ .fi = fi,
+ .count = select_conf.limit_arg
+ };
+ char *header = select_conf.header_given?
+ select_conf.header_arg : "Global list\n";
- ret = print_global_lists();
+ ret = output("%s", header);
if (ret < 0)
return ret;
- ret = print_global_summary();
+ if (select_conf.list_sort_arg == list_sort_arg_file_count)
+ sort_column = DT_FILES;
+ else
+ sort_column = DT_BYTES;
+ ret = compile_regex(&gli.preg, &gli.inverse_matching);
if (ret < 0)
return ret;
- ret = print_user_lists();
+ ret = adu_loop_reverse(dir_table, sort_column, &gli,
+ global_list_loop_function, &gli.ret, &gli.osl_errno);
+ free_regex(gli.preg);
if (ret < 0)
return ret;
- ret = print_user_summary();
+ return output("%s", select_conf.trailer_arg);
+}
+
+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 print_user_lists(fi);
+ case select_mode_arg_user_summary:
+ return print_user_summary(fi);
+ default:
+ ERROR_LOG("bad select mode\n");
+ return -ERRNO_TO_ERROR(EINVAL);
+ };
+}
+
+static int open_pipe(char *path)
+{
+ int p[2], ret;
+ char **argv;
+
+ ret = pipe(p);
if (ret < 0)
- return ret;
- return 1;
+ return ERRNO_TO_ERROR(errno);
+ ret = fork();
+ if (ret < 0)
+ return ERRNO_TO_ERROR(errno);
+ if (ret) { /* parent */
+ DEBUG_LOG("created process %d\n", ret);
+ close(p[0]);
+ output_file = fdopen(p[1], "w");
+ if (!output_file)
+ return ERRNO_TO_ERROR(errno);
+ return 1;
+ }
+ close(p[1]);
+ if (p[0] != STDIN_FILENO)
+ dup2(p[0], STDIN_FILENO);
+ DEBUG_LOG("executing %s\n", path);
+ split_args(path, &argv, " \t");
+ execvp(argv[0], argv);
+ ERROR_LOG("error executing %s: %s\n", path,
+ adu_strerror(ERRNO_TO_ERROR(errno)));
+ _exit(EXIT_FAILURE);
}
-static int read_uid_file(struct uid_range *admissible_uids)
+static int open_output_stream(void)
{
- size_t size;
- uint32_t n;
- char *filename = get_uid_list_name(), *map;
- int ret = mmap_full_file(filename, O_RDONLY, (void **)&map, &size, NULL);
- unsigned bits;
+ char *p;
+ int ret, flags = O_WRONLY | O_CREAT;
- if (ret < 0) {
- INFO_LOG("failed to map %s\n", filename);
- free(filename);
- return ret;
+ if (!select_conf.output_given)
+ goto use_stdout;
+ p = select_conf.output_arg;
+ switch (p[0]) {
+ case '\0': /* empty string */
+ goto bad_output_arg;
+ case '-':
+ if (!p[1]) /* "-" means stdout */
+ goto use_stdout;
+ /* string starting with a dash */
+ flags |= O_EXCL;
+ goto open_file;
+ case '>':
+ if (!p[1]) /* ">" is invalid */
+ goto bad_output_arg;
+ if (p[1] != '>') {
+ p++;
+ flags |= O_TRUNC;
+ goto open_file;
+ }
+ /* string starting with ">>" */
+ if (!p[2]) /* ">>" is invalid */
+ goto bad_output_arg;
+ flags |= O_APPEND;
+ p += 2;
+ goto open_file;
+ case '|':
+ if (!p[1]) /* "|" is invalid */
+ goto bad_output_arg;
+ p++;
+ return open_pipe(p);
+ default: /* args starts with no magic character */
+ flags |= O_EXCL;
+ goto open_file;
}
- num_uids = size / 4;
- INFO_LOG("found %u uids in %s\n", (unsigned)num_uids, filename);
- free(filename);
+use_stdout:
+ output_file = stdout;
+ return 1;
+bad_output_arg:
+ output_file = NULL;
+ return -E_BAD_OUTPUT_ARG;
+open_file:
/*
- * Compute number of hash table bits. The hash table size must be a
- * power of two and larger than the number of uids.
+ * glibc's 'x' mode to fopen is not portable, so use open() and
+ * fdopen().
*/
- bits = 2;
- while (1 << bits < num_uids)
- bits++;
- create_hash_table(bits);
- for (n = 0; n < num_uids; n++) {
- uint32_t uid = read_u32(map + n * sizeof(uid));
- ret = search_uid(uid, admissible_uids, OPEN_USER_TABLE, NULL);
- if (ret < 0)
- goto out;
- }
-out:
- adu_munmap(map, size);
- return ret;
+ ret = open(p, flags, 0644);
+ if (ret < 0)
+ return -ERRNO_TO_ERROR(errno);
+ output_file = fdopen(ret, "w");
+ if (!output_file)
+ return -ERRNO_TO_ERROR(errno);
+ return 1;
}
-int run_select_query(struct uid_range *admissible_uids)
+/**
+ * Execute a select query.
+ *
+ * \param admissible_uids User IDs to take into account.
+ * \param fi Format information.
+ *
+ * Called once in select mode or for each \a run command in interactive mode.
+ *
+ * Open the output stream and the dir table if not already open. For each
+ * admissible uid, the user table is opened if necessary. After these
+ * preparations, the output according to \a select_mode and \a fi is written to
+ * the output stream.
+ *
+ * \return Standard.
+ */
+int run_select_query(struct uid_range *admissible_uids, struct format_info *fi)
{
- 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
- count_unit_buf[0] = '\0';
- 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';
+ int ret = open_output_stream();
+ if (ret < 0)
+ goto out;
ret = open_dir_table(0);
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();
+ ret = print_statistics(fi);
out:
- close_all_tables();
- if (output_file != stdout)
+ if (output_file && output_file != stdout) {
fclose(output_file);
+ output_file = NULL;
+ }
return ret;
}
-/* return: < 0: error, >0: OK, == 0: help given */
+/** Default format string for global_list mode. */
+#define GLOBAL_LIST_DFLT_FMT "%(size:r:8) %(files:r:8) %(dirname)\n"
+/** Default format string for global_summary mode. */
+#define GLOBAL_SUMMARY_DFLT_FMT "#directories: %(dirs), #files: %(files), size: %(size)\n"
+/** Default format string for user_list mode. */
+#define USER_LIST_DFLT_FMT "%(size:r:5) %(files:r:5) %(dirname)\n"
+/** Default format string for user_summary mode. */
+#define USER_SUMMARY_DFLT_FMT "%(pw_name:l:16) %(uid:r:6) %(dirs:r:5) %(files:r:5) %(size:r:5)\n"
+
+static int setup_format_string(char *fmt, struct format_info **fi)
+{
+ struct atom *atoms;
+
+ if (!fmt)
+ INFO_LOG("using default format string\n");
+ switch (select_conf.select_mode_arg) {
+ case select_mode_arg_global_list:
+ if (!fmt)
+ fmt = GLOBAL_LIST_DFLT_FMT;
+ atoms = global_list_atoms;
+ break;
+ case select_mode_arg_global_summary:
+ if (!fmt)
+ fmt = GLOBAL_SUMMARY_DFLT_FMT;
+ atoms = global_summary_atoms;
+ break;
+ case select_mode_arg_user_list:
+ if (!fmt)
+ fmt = USER_LIST_DFLT_FMT;
+ atoms = user_list_atoms;
+ break;
+ case select_mode_arg_user_summary:
+ if (!fmt)
+ fmt = USER_SUMMARY_DFLT_FMT;
+ atoms = user_summary_atoms;
+ break;
+ default:
+ ERROR_LOG("bad select mode\n");
+ return -ERRNO_TO_ERROR(EINVAL);
+ };
+ INFO_LOG("format string: %s\n", fmt);
+ return parse_format_string(fmt, atoms, fi);
+}
+
+/**
+ * Parse a given format string.
+ *
+ * \param string The format string to parse.
+ * \param params gengetopt parameters.
+ * \param admissible_uids The array of admissible uid ranges.
+ * \param fi The format info to be used with format_items().
+ *
+ * If \a string is not \p NULL, it is broken down into its components using
+ * \ref create_argv() and the resulting argument vector is passed together with
+ * \a params to gengetopt's command line parser. If --help or --detailed-help
+ * was specified in \a string, the corresponding help text is printed and the
+ * function returns zero.
+ *
+ * Otherwise, any --uid or --user options are parsed and transformed into an
+ * array of admissible uids which is returned via \a admissible_uids.
+ *
+ * Finally, the format string given by --format (or the default format string
+ * for the given select mode if no --format option was given in \a string) is
+ * parsed as well resulting in a format_info structure which is returned via
+ * \a fi. The caller uses the \a fi pointer later to format each output line.
+ *
+ * \return Negative on errors, zero if --help or --detailed-help was given,
+ * positive otherwise.
+ *
+ * \sa format_items().
+ */
int parse_select_options(char *string, struct select_cmdline_parser_params *params,
- struct uid_range **admissible_uids)
+ struct uid_range **admissible_uids, struct format_info **fi)
{
- int ret;
+ int ret, num_uid_ranges;
const char **line;
+ char *fmt = NULL;
- if (select_cmdline_parser_string_ext(string, &select_conf, "select",
- params))
- return -E_SYNTAX;
+ if (string) {
+ 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;
+ if (select_conf.help_given || select_conf.detailed_help_given)
+ goto help;
+ fmt = select_conf.format_arg;
+ }
ret = parse_uid_arg(select_conf.uid_arg, admissible_uids);
if (ret < 0)
return ret;
- if (!select_conf.help_given && !select_conf.detailed_help_given)
- return 1;
-
+ num_uid_ranges = ret;
+ ret = append_users(select_conf.user_arg, select_conf.user_given,
+ admissible_uids, num_uid_ranges);
+ if (ret < 0)
+ return ret;
+ return setup_format_string(fmt, fi);
+help:
line = select_conf.detailed_help_given?
select_args_info_detailed_help : select_args_info_help;
if (!output_file)
return 0;
}
+/**
+ * Main function for select mode.
+ *
+ * \return Standard.
+ */
int com_select(void)
{
struct uid_range *admissible_uids = NULL;
+ int ret;
+ struct format_info *fi;
+ struct select_cmdline_parser_params params = {
+ .override = 1,
+ .initialize = 1,
+ .check_required = 1,
+ .check_ambiguity = 1,
+ .print_errors = 1
+ };
- if (conf.select_options_given) {
- int ret;
- struct select_cmdline_parser_params params = {
- .override = 1,
- .initialize = 1,
- .check_required = 1,
- .check_ambiguity = 1,
- .print_errors = 1
- };
- ret = parse_select_options(conf.select_options_arg, ¶ms,
- &admissible_uids);
- if (ret <= 0) /* do not run query if help was given */
- return ret;
+ ret = parse_select_options(conf.select_options_arg, ¶ms,
+ &admissible_uids, &fi);
+ if (ret > 0) {
+ ret = read_uid_file();
+ if (ret < 0)
+ goto out;
+ ret = run_select_query(admissible_uids, fi);
+ free_format_info(fi);
}
- return run_select_query(admissible_uids);
+out:
+ select_cmdline_parser_free(&select_conf);
+ return ret;
}
projects / adu.git / blobdiff