X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.c;h=02bfa302779ccdf5bc299e8a6a81f5b3c2fb8f60;hp=5f674dc78e06a3389b0e10fe158f2aea2affa285;hb=cecbe8525740b4a899cb1a6c91064e195ae1ada2;hpb=1b5642c78995f2468e14380252826cdfccb92632 diff --git a/adu.c b/adu.c index 5f674dc..02bfa30 100644 --- a/adu.c +++ b/adu.c @@ -1,49 +1,57 @@ #include "adu.h" #include /* readdir() */ +#include #include "gcc-compat.h" -#include "osl.h" +#include "cmdline.h" #include "fd.h" -#include "hash.h" #include "string.h" #include "error.h" +#include "portable_io.h" +#include "select.cmdline.h" DEFINE_ERRLIST; +int osl_errno; -#define DATABASE_DIR "/tmp/adu" +/** In case a signal is received, its number is stored here. */ +static int signum; -/** evaluates to 1 if x < y, to -1 if x > y and to 0 if x == y */ -#define NUM_COMPARE(x, y) ((int)((x) < (y)) - (int)((x) > (y))) +/** Command line and config file options. */ +struct gengetopt_args_info conf; +/** Options passed to --select-options. */ +struct select_args_info select_conf; + +/** The number of different uids found so far. */ +uint32_t num_uids = 0; + +/** This is always a power of two. It is set in create_hash_table(). */ +static uint32_t uid_hash_table_size; /** - * The log function. + * Contains info for each user that owns at least one regular file. * - * \param ll Loglevel. - * \param fml Usual format string. - * - * All XXX_LOG() macros use this function. + * Even users that are not taken into account because of the --uid + * option occupy a slot in this hash table. This allows to find out + * quicky whether a uid is admissible. And yes, this has to be fast. */ -__printf_2_3 void __log(int ll, const char* fmt,...) +static struct user_info *uid_hash_table; + +static inline int ui_used(struct user_info *ui) { - va_list argp; - FILE *outfd; - struct tm *tm; - time_t t1; - char str[255] = ""; + return ui->flags & UI_FL_SLOT_USED; +} - if (ll < 4) - return; - outfd = stderr; - time(&t1); - tm = localtime(&t1); - strftime(str, sizeof(str), "%b %d %H:%M:%S", tm); - fprintf(outfd, "%s ", str); - va_start(argp, fmt); - vfprintf(outfd, fmt, argp); - va_end(argp); +static inline int ui_admissible(struct user_info *ui) +{ + return ui->flags & UI_FL_ADMISSIBLE; } +/** + * The table containing the directory names and statistics. + */ +struct osl_table *dir_table = NULL; + /** * Compare the size of two directories * @@ -67,54 +75,47 @@ static int size_compare(const struct osl_object *obj1, const struct osl_object * } /** - * Compare two osl objects of string type. + * Compare two osl objects pointing to unsigned integers of 64 bit size. * - * \param obj1 Pointer to the first object. - * \param obj2 Pointer to the second object. + * \param obj1 Pointer to the first integer. + * \param obj2 Pointer to the second integer. * - * In any case, only \p MIN(obj1->size, obj2->size) characters of each string - * are taken into account. + * \return The values required for an osl compare function. * - * \return It returns an integer less than, equal to, or greater than zero if - * \a obj1 is found, respectively, to be less than, to match, or be greater than - * obj2. - * - * \sa strcmp(3), strncmp(3), osl_compare_func. + * \sa osl_compare_func, osl_hash_compare(). */ -int string_compare(const struct osl_object *obj1, const struct osl_object *obj2) +static int uint64_compare(const struct osl_object *obj1, + const struct osl_object *obj2) { - const char *str1 = (const char *)obj1->data; - const char *str2 = (const char *)obj2->data; - return strncmp(str1, str2, MIN(obj1->size, obj2->size)); -} + uint64_t d1 = read_u64((const char *)obj1->data); + uint64_t d2 = read_u64((const char *)obj2->data); -/** The columns of the directory table. */ -enum dir_table_columns { - /** The name of the directory. */ - DT_NAME, - /** The dir count number. */ - DT_NUM, - /** The number of bytes of all regular files. */ - DT_BYTES, - /** The number of all regular files. */ - DT_FILES, - /** Number of columns in this table. */ - NUM_DT_COLUMNS -}; + if (d1 < d2) + return 1; + if (d1 > d2) + return -1; + return 0; +} static struct osl_column_description dir_table_cols[] = { [DT_NAME] = { .storage_type = OSL_MAPPED_STORAGE, - .storage_flags = OSL_RBTREE | OSL_UNIQUE, + .storage_flags = 0, .name = "dir", - .compare_function = string_compare, }, [DT_NUM] = { .storage_type = OSL_MAPPED_STORAGE, .storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE, .name = "num", - .compare_function = uint32_compare, - .data_size = sizeof(uint32_t) + .compare_function = uint64_compare, + .data_size = sizeof(uint64_t) + }, + [DT_PARENT_NUM] = { + .storage_type = OSL_MAPPED_STORAGE, + .storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE, + .name = "parent_num", + .compare_function = size_compare, + .data_size = sizeof(uint64_t) }, [DT_BYTES] = { .storage_type = OSL_MAPPED_STORAGE, @@ -137,19 +138,6 @@ static struct osl_table_description dir_table_desc = { .num_columns = NUM_DT_COLUMNS, .flags = 0, .column_descriptions = dir_table_cols, - .dir = DATABASE_DIR -}; - -/** The columns of the id table. */ -enum user_table_columns { - /** The numer of the directory. */ - UT_DIR_NUM, - /** The number of bytes of all regular files in this dir owned by this id. */ - UT_BYTES, - /** The number of files in this dir owned by this id. */ - UT_FILES, - /** Number of columns in this table. */ - NUM_UT_COLUMNS }; static struct osl_column_description user_table_cols[] = { @@ -157,8 +145,8 @@ static struct osl_column_description user_table_cols[] = { .storage_type = OSL_MAPPED_STORAGE, .storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE, .name = "dir_num", - .compare_function = uint32_compare, - .data_size = sizeof(uint32_t) + .compare_function = uint64_compare, + .data_size = sizeof(uint64_t) }, [UT_BYTES] = { .storage_type = OSL_MAPPED_STORAGE, @@ -176,407 +164,331 @@ static struct osl_column_description user_table_cols[] = { }, }; -static struct osl_table *dir_table; - -int add_directory(char *dirname, uint32_t dir_num, uint64_t *dir_size, - uint64_t *dir_files) +/** + * The log function. + * + * \param ll Loglevel. + * \param fml Usual format string. + * + * All XXX_LOG() macros use this function. + */ +__printf_2_3 void __log(int ll, const char* fmt,...) { - struct osl_object dir_objects[NUM_DT_COLUMNS]; - - INFO_LOG("adding #%u: %s\n", dir_num, dirname); - dir_objects[DT_NAME].data = dirname; - dir_objects[DT_NAME].size = strlen(dirname) + 1; - dir_objects[DT_NUM].data = &dir_num; - dir_objects[DT_NUM].size = sizeof(dir_num); - dir_objects[DT_BYTES].data = dir_size; - dir_objects[DT_BYTES].size = sizeof(*dir_size); - dir_objects[DT_FILES].data = dir_files; - dir_objects[DT_FILES].size = sizeof(*dir_files); - - return osl_add_row(dir_table, dir_objects); -} + va_list argp; + FILE *outfd; + struct tm *tm; + time_t t1; + char str[255] = ""; -static uint32_t num_uids; + if (ll < conf.loglevel_arg) + return; + outfd = stderr; + time(&t1); + tm = localtime(&t1); + strftime(str, sizeof(str), "%b %d %H:%M:%S", tm); + fprintf(outfd, "%s ", str); + va_start(argp, fmt); + vfprintf(outfd, fmt, argp); + va_end(argp); +} -int create_and_open_user_table(uint32_t uid, struct osl_table **t) +static int open_user_table(struct user_info *ui, int create) { int ret; - struct osl_table_description *desc = para_malloc(sizeof(*desc)); - - desc->num_columns = NUM_UT_COLUMNS; - desc->flags = 0; - desc->column_descriptions = user_table_cols; - desc->dir = para_strdup(DATABASE_DIR); - desc->name = make_message("%u", uid); - num_uids++; + struct passwd *pw; + + ui->desc = adu_malloc(sizeof(*ui->desc)); + ui->desc->num_columns = NUM_UT_COLUMNS; + ui->desc->flags = 0; + ui->desc->column_descriptions = user_table_cols; + ui->desc->dir = adu_strdup(conf.database_dir_arg); + ui->desc->name = make_message("%u", (unsigned)ui->uid); + pw = getpwuid(ui->uid); + if (pw && pw->pw_name) + ui->pw_name = adu_strdup(pw->pw_name); + INFO_LOG(".............................uid #%u: %u\n", - (unsigned)num_uids, (unsigned)uid); -// user_table_desc.name = make_message("%u", uid); - ret = osl_create_table(desc); + (unsigned)num_uids, (unsigned)ui->uid); + if (create) { + ret = osl(osl_create_table(ui->desc)); + if (ret < 0) + goto err; + num_uids++; + } + ret = osl(osl_open_table(ui->desc, &ui->table)); if (ret < 0) - return ret; - return osl_open_table(desc, t); -} - - -#define uid_hash_bits 8 -static uint32_t uid_hash_table_size = 1 << uid_hash_bits; -#define PRIME1 0x811c9dc5 -#define PRIME2 0x01000193 - -struct user_info { - uint32_t uid; - struct osl_table *table; - uint64_t files; - uint64_t bytes; -}; - -static struct user_info *uid_hash_table; - -static void create_hash_table(void) -{ - uid_hash_table = para_calloc(uid_hash_table_size - * sizeof(struct user_info)); -} - -static int create_tables(void) -{ - create_hash_table(); - return osl_create_table(&dir_table_desc); + goto err; + return 1; +err: + free((char *)ui->desc->name); + free((char *)ui->desc->dir); + free(ui->pw_name); + free(ui->desc); + ui->desc->name = NULL; + ui->desc->dir = NULL; + ui->desc = NULL; + ui->table = NULL; + ui->flags = 0; + return ret; } - -static uint32_t double_hash(uint32_t uid, uint32_t probe_num) +int for_each_admissible_user(int (*func)(struct user_info *, void *), + void *data) { - return (uid * PRIME1 + ((uid * PRIME2) | 1) * probe_num) % uid_hash_table_size; -} + struct user_info *ui = uid_hash_table; -#define FOR_EACH_USER(ui) for (ui = uid_hash_table; ui < uid_hash_table \ - + uid_hash_table_size; ui++) + if (!ui) + return -ERRNO_TO_ERROR(EFAULT); -static int search_uid(uint32_t uid, int insert, struct user_info **ui) -{ - uint32_t p; + for (; ui < uid_hash_table + uid_hash_table_size; ui++) { + int ret; - for (p = 0; p < uid_hash_table_size; p++) { - struct user_info *i = uid_hash_table + double_hash(uid, p); - if (!i->table) { - if (!insert) - return -E_BAD_UID; - int ret = create_and_open_user_table(uid, &i->table); - if (ret < 0) - return ret; - i->uid = uid; - *ui = i; - return 1; - } - if (i->uid != uid) + if (!ui_used(ui) || !ui_admissible(ui)) continue; - *ui = i; - return 0; - } - return insert? -E_HASH_TABLE_OVERFLOW : -E_BAD_UID; -} - -static int update_user_row(struct osl_table *t, uint32_t dir_num, - uint64_t *add) -{ - struct osl_row *row; - struct osl_object obj = {.data = &dir_num, .size = sizeof(dir_num)}; - - int ret = osl_get_row(t, UT_DIR_NUM, &obj, &row); - - if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND) - return ret; - if (ret < 0) { /* this is the first file we add */ - struct osl_object objects[NUM_UT_COLUMNS]; - uint64_t num_files = 1; - - objects[UT_DIR_NUM].data = &dir_num; - objects[UT_DIR_NUM].size = sizeof(dir_num); - objects[UT_BYTES].data = add; - objects[UT_BYTES].size = sizeof(*add); - objects[UT_FILES].data = &num_files; - objects[UT_FILES].size = sizeof(num_files); - INFO_LOG("######################### ret: %d\n", ret); - ret = osl_add_row(t, objects); - INFO_LOG("######################### ret: %d\n", ret); - return ret; - } else { /* add size and increment file count */ - uint64_t num; - struct osl_object obj1, obj2 = {.data = &num, .size = sizeof(num)}; - - ret = osl_get_object(t, row, UT_BYTES, &obj1); - if (ret < 0) - return ret; - num = *(uint64_t *)obj1.data + *add; - ret = osl_update_object(t, row, UT_BYTES, &obj2); - if (ret < 0) - return ret; - ret = osl_get_object(t, row, UT_FILES, &obj1); + ret = func(ui, data); if (ret < 0) return ret; - num = *(uint64_t *)obj1.data + 1; - return osl_update_object(t, row, UT_FILES, &obj2); } + return 1; } -static uint32_t num_dirs; -static uint32_t num_files; -static uint64_t num_bytes; +#define PRIME1 0xb11924e1 +#define PRIME2 0x01000193 -int scan_dir(char *dirname) +void create_hash_table(unsigned bits) { - DIR *dir; - struct dirent *entry; - int ret, cwd_fd, ret2; - uint64_t dir_size = 0, dir_files = 0; - uint32_t this_dir_num = num_dirs++; - - DEBUG_LOG("----------------- %u: %s\n", num_dirs, dirname); - ret = para_opendir(dirname, &dir, &cwd_fd); - if (ret < 0) { - if (ret != -ERRNO_TO_ERROR(EACCES)) - return ret; - WARNING_LOG("permission denied for %s\n", dirname); - return 1; - } - while ((entry = readdir(dir))) { - mode_t m; - char *tmp; - struct stat s; - uint32_t uid; - uint64_t size; - struct user_info *ui; - - if (!strcmp(entry->d_name, ".")) - continue; - if (!strcmp(entry->d_name, "..")) - continue; - if (lstat(entry->d_name, &s) == -1) { - WARNING_LOG("lstat error for %s/%s\n", dirname, - entry->d_name); - continue; - } - m = s.st_mode; - if (!S_ISREG(m) && !S_ISDIR(m)) - continue; - if (S_ISDIR(m)) { - tmp = make_message("%s/%s", dirname, entry->d_name); - ret = scan_dir(tmp); - free(tmp); - if (ret < 0) - goto out; - continue; - } - /* regular file */ - size = s.st_size; - dir_size += size; - num_bytes += size; - dir_files++; - num_files++; - uid = s.st_uid; - ret = search_uid(uid, 1, &ui); - if (ret < 0) - goto out; - ui->bytes += size; - ui->files++; - ret = update_user_row(ui->table, this_dir_num, &size); - if (ret < 0) - goto out; - } - ret = add_directory(dirname, this_dir_num, &dir_size, &dir_files); -out: - closedir(dir); - ret2 = para_fchdir(cwd_fd); - if (ret2 < 0 && ret >= 0) - ret = ret2; - close(cwd_fd); - return ret; + uid_hash_table_size = 1 << bits; + uid_hash_table = adu_calloc(uid_hash_table_size * + sizeof(struct user_info)); } -static int get_dir_name(struct osl_row *row, char **name) +static void free_hash_table(void) { - struct osl_object obj; - int ret = osl_get_object(dir_table, row, DT_NAME, &obj); - - if (ret < 0) - return ret; - *name = obj.data; - return 1; + free(uid_hash_table); + uid_hash_table = NULL; } -static int print_dirname_and_size(struct osl_row *row, void *data) +static void close_dir_table(void) { - unsigned *count = data; - struct osl_object obj; - char *name; int ret; - if ((*count)++ > 100) - return -E_LOOP_COMPLETE; - ret = get_dir_name(row, &name); - if (ret < 0) - return ret; - ret = osl_get_object(dir_table, row, DT_BYTES, &obj); + if (!dir_table) + return; + ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN)); if (ret < 0) - return ret; - printf("%s\t%llu\n", name, *(long long unsigned *)obj.data); - return 1; + ERROR_LOG("failed to close dir table: %s\n", adu_strerror(-ret)); + free((char *)dir_table_desc.dir); + dir_table = NULL; } -static int print_dirname_and_file_count(struct osl_row *row, void *data) +static int close_user_table(struct user_info *ui, __a_unused void *data) { - unsigned *count = data; - struct osl_object obj; - char *name; int ret; - if ((*count)++ > 100) - return -E_LOOP_COMPLETE; - ret = get_dir_name(row, &name); + ret = osl(osl_close_table(ui->table, OSL_MARK_CLEAN)); if (ret < 0) - return ret; - ret = osl_get_object(dir_table, row, DT_FILES, &obj); - if (ret < 0) - return ret; - printf("%s\t%llu\n", name, *(long long unsigned *)obj.data); + ERROR_LOG("failed to close user table %u: %s\n", + (unsigned) ui->uid, adu_strerror(-ret)); + free((char *)ui->desc->name); + ui->desc->name = NULL; + free((char *)ui->desc->dir); + ui->desc->dir = NULL; + free(ui->pw_name); + ui->pw_name = NULL; + free(ui->desc); + ui->desc = NULL; + ui->table = NULL; + ui->flags = 0; return 1; } -static void print_id_stats(void) +static void close_user_tables(void) { - struct user_info *ui; + for_each_admissible_user(close_user_table, NULL); +} - FOR_EACH_USER(ui) { - if (!ui->table) - continue; - printf("%u\t%llu\t%llu\n", (unsigned)ui->uid, (long long unsigned)ui->files, - (long long unsigned)ui->bytes); - } +void close_all_tables(void) +{ + close_dir_table(); + close_user_tables(); + free_hash_table(); } -struct big_dir_info { - unsigned count; - struct osl_table *user_table; -}; +static void signal_handler(int s) +{ + signum = s; +} -static int print_big_dir(struct osl_row *row, void *data) +void check_signals(void) { - struct big_dir_info *bdi = data; - int ret; - struct osl_row *dir_row; - char *dirname; - uint64_t bytes; - struct osl_object obj; - - if (bdi->count++ > 10) - return -E_LOOP_COMPLETE; - ret = osl_get_object(bdi->user_table, row, UT_BYTES, &obj); - if (ret < 0) - return ret; - bytes = *(uint64_t *)obj.data; - ret = osl_get_object(bdi->user_table, row, UT_DIR_NUM, &obj); - if (ret < 0) - return ret; - ret = osl_get_row(dir_table, DT_NUM, &obj, &dir_row); - if (ret < 0) - return ret; - ret = osl_get_object(dir_table, dir_row, DT_NAME, &obj); - if (ret < 0) - return ret; - dirname = obj.data; - printf("%s: %llu\n", dirname, (long long unsigned)bytes); + if (likely(!signum)) + return; + EMERG_LOG("caught signal %d\n", signum); + close_all_tables(); + exit(EXIT_FAILURE); +} + +static int init_signals(void) +{ + if (signal(SIGINT, &signal_handler) == SIG_ERR) + return -E_SIGNAL_SIG_ERR; + if (signal(SIGTERM, &signal_handler) == SIG_ERR) + return -E_SIGNAL_SIG_ERR; + if (signal(SIGPIPE, &signal_handler) == SIG_ERR) + return -E_SIGNAL_SIG_ERR; return 1; } -static void print_id_dir_stats(void) +/* + * We use a hash table of size s=2^uid_hash_bits to map the uids into the + * interval [0..s]. Hash collisions are treated by open addressing, i.e. + * unused slots in the table are used to store different uids that hash to the + * same slot. + * + * If a hash collision occurs, different slots are successively probed in order + * to find an unused slot for the new uid. Probing is implemented via a second + * hash function that maps the uid to h=(uid * PRIME2) | 1, which is always an + * odd number. + * + * An odd number is sufficient to make sure each entry of the hash table gets + * probed for probe_num between 0 and s-1 because s is a power of two, hence + * the second hash value has never a common divisor with the hash table size. + * IOW: h is invertible in the ring [0..s]. + */ +static uint32_t double_hash(uint32_t uid, uint32_t probe_num) +{ + return (uid * PRIME1 + ((uid * PRIME2) | 1) * probe_num) + % uid_hash_table_size; +} + +static int uid_is_admissible(uint32_t uid, struct uid_range *urs) { - struct user_info *ui; + struct uid_range *ur; + int ret = 1; - FOR_EACH_USER(ui) { - struct big_dir_info bdi = {.count = 0}; - if (!ui->table) + if (!urs) /* empty array means all uids are allowed */ + return 1; + FOR_EACH_UID_RANGE(ur, urs) + if (ur->low <= uid && ur->high >= uid) + goto out; + ret = 0; +out: + DEBUG_LOG("uid %u is %sadmissible\n", (unsigned)uid, + ret? "" : "not "); + return ret; +} + +int search_uid(uint32_t uid, struct uid_range *urs, + enum search_uid_flags flags, struct user_info **ui_ptr) +{ + uint32_t p; + + for (p = 0; p < uid_hash_table_size; p++) { + struct user_info *ui = uid_hash_table + double_hash(uid, p); + + if (!ui_used(ui)) { + int ret; + if (!flags) + return -E_BAD_UID; + ui->uid = uid; + ui->flags |= UI_FL_SLOT_USED; + if (!uid_is_admissible(uid, urs)) + return 0; + ui->flags |= UI_FL_ADMISSIBLE; + ret = open_user_table(ui, flags & CREATE_USER_TABLE); + if (ret < 0) + return ret; + + if (ui_ptr) + *ui_ptr = ui; + return 1; + } + if (ui->uid != uid) continue; - bdi.user_table = ui->table; - printf("************************* Big dirs owned by uid %u\n", (unsigned) ui->uid); - osl_rbtree_loop_reverse(ui->table, UT_BYTES, &bdi, print_big_dir); + if (ui_ptr) + *ui_ptr = ui; + return 0; } + return flags? -E_HASH_TABLE_OVERFLOW : -E_BAD_UID; } -static int print_statistics(void) +char *get_uid_list_name(void) { - unsigned count = 0; - int ret; - - printf("Summary: %u dirs, %u files, %llu bytes\n", (unsigned)num_dirs, - (unsigned)num_files, (long long unsigned)num_bytes); - printf("************************* Biggest dirs\n"); - ret = osl_rbtree_loop_reverse(dir_table, DT_BYTES, &count, print_dirname_and_size); - if (ret < 0 && ret != -E_LOOP_COMPLETE) - return ret; - count = 0; - printf("************************* dirs containing many files\n"); - ret = osl_rbtree_loop_reverse(dir_table, DT_FILES, &count, print_dirname_and_file_count); - if (ret < 0 && ret != -E_LOOP_COMPLETE) - return ret; + return make_message("%s/uid_list", conf.database_dir_arg); +} - printf("************************* dirs stats by owner\n"); - print_id_stats(); - print_id_dir_stats(); - return 1; +void sort_hash_table(int (*comp)(const void *, const void *)) +{ + qsort(uid_hash_table, uid_hash_table_size, sizeof(struct user_info), + comp); } -static int write_uid_list(void) +int open_dir_table(int create) { - char *buf, *filename = DATABASE_DIR "/" "uid_list"; - uint32_t count = 0; - struct user_info *ui; - size_t size = num_uids * sizeof(uint32_t); - int ret; + dir_table_desc.dir = adu_strdup(conf.database_dir_arg); - if (!num_uids) - return 0; - buf = para_malloc(size); - FOR_EACH_USER(ui) { - if (!ui->table) - continue; - write_u32(buf + count++ * sizeof(uint32_t), ui->uid); + if (create) { + int ret = osl(osl_create_table(&dir_table_desc)); + if (ret < 0) { + free((char *)dir_table_desc.dir); + return ret; + } } - ret = para_write_file(filename, buf, size); - free(buf); - return ret; + return osl(osl_open_table(&dir_table_desc, &dir_table)); } -static int com_create(char *dirname) +static int check_args(void) { - int ret = scan_dir(dirname); - - if (ret < 0) - return ret; - return write_uid_list(); + if (conf.create_given && !conf.base_dir_given) + return -E_SYNTAX; + + /* remove trailing slashes from base-dir arg */ + if (conf.base_dir_given) { + size_t len = strlen(conf.base_dir_arg); + for (;;) { + if (!len) /* empty string */ + return -ERRNO_TO_ERROR(EINVAL); + if (!--len) /* length 1 is always OK */ + break; + if (conf.base_dir_arg[len] != '/') + break; /* no trailing slash, also OK */ + conf.base_dir_arg[len] = '\0'; + } + } + return 1; } int main(int argc, char **argv) { - int ret = create_tables(); + int ret; + struct cmdline_parser_params params = { + .override = 0, + .initialize = 1, + .check_required = 1, + .check_ambiguity = 1, + .print_errors = 1 + }; + + cmdline_parser_ext(argc, argv, &conf, ¶ms); /* aborts on errors */ + ret = check_args(); if (ret < 0) goto out; - ret = osl_open_table(&dir_table_desc, &dir_table); + ret = init_signals(); if (ret < 0) goto out; ret = -E_SYNTAX; - if (argc != 2) - goto out; - ret = com_create(argv[1]); + if (conf.select_given) + ret = com_select(); + else if (conf.create_given) + ret = com_create(); + else + ret = com_interactive(); if (ret < 0) goto out; - print_statistics(); out: if (ret < 0) { - ERROR_LOG("%s\n", error_txt(-ret)); + ERROR_LOG("%s\n", adu_strerror(-ret)); return -EXIT_FAILURE; } return EXIT_SUCCESS; } -