/** 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;
*/
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.
*/
*/
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
},
};
-static int check_uid_arg(const char *arg, uint32_t *uid)
-{
- const uint32_t max = ~0U;
- /*
- * we need an 64-bit int for string -> uid conversion because strtoll()
- * returns a signed value.
- */
- int64_t val;
- int ret = atoi64(arg, &val);
-
- if (ret < 0)
- return ret;
- if (val < 0 || val > max)
- return -ERRNO_TO_ERROR(EINVAL);
- *uid = val;
- return 1;
-}
-
-static int parse_uid_range(const char *orig_arg, struct uid_range *ur)
-{
- int ret;
- char *arg = adu_strdup(orig_arg), *p = strchr(arg, '-');
-
- if (!p || p == arg) { /* -42 or 42 */
- ret = check_uid_arg(p? p + 1 : arg, &ur->high);
- if (ret < 0)
- goto out;
- ur->low = p? 0 : ur->high;
- ret = 1;
- goto out;
- }
- /* 42- or 42-4711 */
- *p = '\0';
- p++;
- ret = check_uid_arg(arg, &ur->low);
- if (ret < 0)
- goto out;
- ur->high = ~0U;
- if (*p) { /* 42-4711 */
- ret = check_uid_arg(p, &ur->high);
- if (ret < 0)
- goto out;
- }
- if (ur->low > ur->high)
- ret = -ERRNO_TO_ERROR(EINVAL);
-out:
- if (ret < 0)
- ERROR_LOG("bad uid option: %s\n", orig_arg);
- else
- INFO_LOG("admissible uid range: %u - %u\n", ur->low,
- ur->high);
- free(arg);
- return ret;
-}
-
/**
* The log function.
*
return 1;
}
-#define PRIME1 0x811c9dc5
+#define PRIME1 0xb11924e1
#define PRIME2 0x01000193
void create_hash_table(unsigned bits)
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);
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: