Add rudimentary interactive support.

[adu.git] / adu.c

diff --git a/adu.c b/adu.c
index c35c535c436957795892c38fb6478bf2c335605d..42d1b19bcae5a70fde2a9655ad82dd1c62b55c5a 100644 (file)
--- a/adu.c
+++ b/adu.c
@@ -18,16 +18,12 @@ static int signum;
 /** Command line and config file options. */
 struct gengetopt_args_info conf;
 
-/** Global dir count. */
-uint64_t num_dirs = 0;
-/** Global files count. */
-uint64_t num_files = 0;
-/** Global bytes count. */
-uint64_t num_bytes = 0;
-
 /** 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;
+
 /**
  * Contains info for each user that owns at least one regular file.
  *
@@ -35,7 +31,17 @@ uint32_t num_uids = 0;
  * 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.
  */
-struct user_info *uid_hash_table = NULL;
+static struct user_info *uid_hash_table;
+
+static inline int ui_used(struct user_info *ui)
+{
+       return ui->flags & UI_FL_SLOT_USED;
+}
+
+static inline int ui_admissible(struct user_info *ui)
+{
+       return ui->flags & UI_FL_ADMISSIBLE;
+}
 
 /**
  * The table containing the directory names and statistics.
@@ -47,8 +53,6 @@ struct osl_table *dir_table = NULL;
  */
 struct uid_range *admissible_uids;
 
-/** 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)))
 
 /**
  * Compare the size of two directories
@@ -285,15 +289,34 @@ err:
        return ret;
 }
 
-#define uid_hash_bits 8
-uint32_t uid_hash_table_size = 1 << uid_hash_bits;
-#define PRIME1 0x811c9dc5
+int for_each_admissible_user(int (*func)(struct user_info *, void *),
+               void *data)
+{
+       struct user_info *ui = uid_hash_table;
+
+       if (!ui)
+               return -ERRNO_TO_ERROR(EFAULT);
+
+       for (; ui < uid_hash_table + uid_hash_table_size; ui++) {
+               int ret;
+
+               if (!ui_used(ui) || !ui_admissible(ui))
+                       continue;
+               ret = func(ui, data);
+               if (ret < 0)
+                       return ret;
+       }
+       return 1;
+}
+
+#define PRIME1 0xb11924e1
 #define PRIME2 0x01000193
 
-void create_hash_table(void)
+void create_hash_table(unsigned bits)
 {
-       uid_hash_table = adu_calloc(uid_hash_table_size
-               * sizeof(struct user_info));
+       uid_hash_table_size = 1 << bits;
+       uid_hash_table = adu_calloc(uid_hash_table_size *
+               sizeof(struct user_info));
 }
 
 static void free_hash_table(void)
@@ -315,12 +338,10 @@ static void close_dir_table(void)
        dir_table = NULL;
 }
 
-static void close_user_table(struct user_info *ui)
+static int close_user_table(struct user_info *ui, __a_unused void *data)
 {
        int ret;
 
-       if (!ui || !ui_used(ui) || !ui_admissible(ui))
-               return;
        ret = osl(osl_close_table(ui->table, OSL_MARK_CLEAN));
        if (ret < 0)
                ERROR_LOG("failed to close user table %u: %s\n",
@@ -335,14 +356,12 @@ static void close_user_table(struct user_info *ui)
        ui->desc = NULL;
        ui->table = NULL;
        ui->flags = 0;
+       return 1;
 }
 
 static void close_user_tables(void)
 {
-       struct user_info *ui;
-
-       FOR_EACH_USER(ui)
-               close_user_table(ui);
+       for_each_admissible_user(close_user_table, NULL);
 }
 
 void close_all_tables(void)
@@ -372,6 +391,8 @@ static int init_signals(void)
                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;
 }
 
@@ -452,6 +473,12 @@ char *get_uid_list_name(void)
        return make_message("%s/uid_list", conf.database_dir_arg);
 }
 
+void sort_hash_table(int (*comp)(const void *, const void *))
+{
+       qsort(uid_hash_table, uid_hash_table_size, sizeof(struct user_info),
+               comp);
+}
+
 int open_dir_table(int create)
 {
        dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
@@ -470,6 +497,10 @@ static int check_args(void)
 {
        int i, ret;
 
+
+       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);
@@ -504,8 +535,8 @@ int main(int argc, char **argv)
        struct cmdline_parser_params params = {
                .override = 0,
                .initialize = 1,
-               .check_required = 0,
-               .check_ambiguity = 0,
+               .check_required = 1,
+               .check_ambiguity = 1,
                .print_errors = 1
        };
 
@@ -519,8 +550,10 @@ int main(int argc, char **argv)
        ret = -E_SYNTAX;
        if (conf.select_given)
                ret = com_select();
-       else
+       else if (conf.create_given)
                ret = com_create();
+       else
+               ret = com_interactive();
        if (ret < 0)
                goto out;
 out: