X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.c;h=9a0e513d941338195ddab459fc854a3792c05391;hp=8f5ff8d655b439191108d372459fe15a153ec64d;hb=cab88f141a9550dcceee0ad8eab978660e0ae0de;hpb=66dc72e7781e232e7fd166a0d420eb586250a4ea

diff --git a/adu.c b/adu.c
index 8f5ff8d..9a0e513 100644
--- a/adu.c
+++ b/adu.c
@@ -1,5 +1,6 @@
 #include "adu.h"
 #include <dirent.h> /* readdir() */
+#include <pwd.h>
 
 #include "gcc-compat.h"
 #include "cmdline.h"
@@ -9,26 +10,23 @@
 #include "portable_io.h"
 
 DEFINE_ERRLIST;
+int osl_errno;
+
+/** In case a signal is received, its number is stored here. */
+static int signum;
 
 /** Command line and config file options. */
-static struct gengetopt_args_info conf;
+struct gengetopt_args_info conf;
 
-enum uid_info_flags {
-	/** whether this slot of the hash table is used. */
-	UI_FL_SLOT_USED = 1,
-	/** whether this uid should be taken into account. */
-	UI_FL_ADMISSIBLE = 2,
-};
+/** Global dir count. */
+uint64_t num_dirs = 0;
+/** Global files count. */
+uint64_t num_files = 0;
+/** Global bytes count. */
+uint64_t num_bytes = 0;
 
-struct user_info {
-	uint32_t uid;
-	uint32_t flags;
-	struct osl_table *table;
-	uint64_t files;
-	uint64_t bytes;
-	uint64_t dirs;
-	struct osl_table_description *desc;
-};
+/** The number of different uids found so far. */
+uint32_t num_uids = 0;
 
 /**
  * Contains info for each user that owns at least one regular file.
@@ -37,113 +35,20 @@ struct user_info {
  * 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.
  */
-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;
-}
-
-struct uid_range {
-	uint32_t low;
-	uint32_t high;
-};
-
-static struct uid_range *admissible_uids;
-
-static inline 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 = para_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 = para_strdup(orig_arg), *p = strchr(arg, '-');
-
-	if (!p || p == arg) {
-		if (p == arg) /* -42 */
-			p++;
-		ret = check_uid_arg(p, &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;
-}
-
+struct user_info *uid_hash_table = NULL;
 
-/** 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)))
+/**
+ * The table containing the directory names and statistics.
+ */
+struct osl_table *dir_table = NULL;
 
 /**
- * The log function.
- *
- * \param ll Loglevel.
- * \param fml Usual format string.
- *
- * All XXX_LOG() macros use this function.
+ * The array of all uid ranges that were given at the command line.
  */
-__printf_2_3 void __log(int ll, const char* fmt,...)
-{
-	va_list argp;
-	FILE *outfd;
-	struct tm *tm;
-	time_t t1;
-	char str[255] = "";
+struct uid_range *admissible_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);
-}
+/** 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
@@ -167,29 +72,6 @@ static int size_compare(const struct osl_object *obj1, const struct osl_object *
 	return NUM_COMPARE(obj2->data, obj1->data);
 }
 
-/**
- * Compare two osl objects of string type.
- *
- * \param obj1 Pointer to the first object.
- * \param obj2 Pointer to the second object.
- *
- * In any case, only \p MIN(obj1->size, obj2->size) characters of each string
- * are taken into account.
- *
- * \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.
- */
-static int string_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));
-}
-
 /**
  * Compare two osl objects pointing to unsigned integers of 64 bit size.
  *
@@ -213,26 +95,11 @@ static int uint64_compare(const struct osl_object *obj1,
 	return 0;
 }
 
-/** 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
-};
-
 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,
@@ -241,6 +108,13 @@ static struct osl_column_description dir_table_cols[] = {
 		.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,
 		.storage_flags =  OSL_RBTREE | OSL_FIXED_SIZE,
@@ -264,18 +138,6 @@ static struct osl_table_description dir_table_desc = {
 	.column_descriptions = dir_table_cols,
 };
 
-/** 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[] = {
 	[UT_DIR_NUM] = {
 		.storage_type = OSL_MAPPED_STORAGE,
@@ -300,53 +162,139 @@ static struct osl_column_description user_table_cols[] = {
 	},
 };
 
-static struct osl_table *dir_table;
+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);
 
-static int add_directory(char *dirname, uint64_t dir_num, uint64_t *dir_size,
-		uint64_t *dir_files)
+	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.
+ *
+ * \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,...)
+{
+	va_list argp;
+	FILE *outfd;
+	struct tm *tm;
+	time_t t1;
+	char str[255] = "";
+
+	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);
+}
+
+static int add_directory(char *dirname, uint64_t *dir_num, uint64_t *parent_dir_num,
+		uint64_t *dir_size, uint64_t *dir_files)
 {
 	struct osl_object dir_objects[NUM_DT_COLUMNS];
 
-	INFO_LOG("adding #%llu: %s\n", (long long unsigned)dir_num, dirname);
+	INFO_LOG("adding #%llu: %s\n", (long long unsigned)*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_NUM].data = dir_num;
+	dir_objects[DT_NUM].size = sizeof(*dir_num);
+	dir_objects[DT_PARENT_NUM].data = parent_dir_num;
+	dir_objects[DT_PARENT_NUM].size = sizeof(*parent_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);
+	return osl(osl_add_row(dir_table, dir_objects));
 }
 
-static uint32_t num_uids;
-
 static int open_user_table(struct user_info *ui, int create)
 {
 	int ret;
+	struct passwd *pw;
 
-	ui->desc = para_malloc(sizeof(*ui->desc));
+	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 = para_strdup(conf.database_dir_arg);
+	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)ui->uid);
 	if (create) {
-		ret = osl_create_table(ui->desc);
+		ret = osl(osl_create_table(ui->desc));
 		if (ret < 0)
 			goto err;
 		num_uids++;
 	}
-	ret = osl_open_table(ui->desc, &ui->table);
+	ret = osl(osl_open_table(ui->desc, &ui->table));
 	if (ret < 0)
 		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;
@@ -357,13 +305,13 @@ err:
 }
 
 #define uid_hash_bits 8
-static uint32_t uid_hash_table_size = 1 << uid_hash_bits;
+uint32_t uid_hash_table_size = 1 << uid_hash_bits;
 #define PRIME1 0x811c9dc5
 #define PRIME2 0x01000193
 
-static void create_hash_table(void)
+void create_hash_table(void)
 {
-	uid_hash_table = para_calloc(uid_hash_table_size
+	uid_hash_table = adu_calloc(uid_hash_table_size
 		* sizeof(struct user_info));
 }
 
@@ -377,14 +325,87 @@ static int create_tables(void)
 {
 	int ret;
 
-	dir_table_desc.dir = para_strdup(conf.database_dir_arg);
-	ret = osl_create_table(&dir_table_desc);
+	dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
+	ret = osl(osl_create_table(&dir_table_desc));
 	if (ret < 0)
 		return ret;
 	create_hash_table();
 	return 1;
 }
 
+static void close_dir_table(void)
+{
+	int ret;
+
+	if (!dir_table)
+		return;
+	ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN));
+	if (ret < 0)
+		ERROR_LOG("failed to close dir table: %s\n", adu_strerror(-ret));
+	free((char *)dir_table_desc.dir);
+	dir_table = NULL;
+}
+
+static void close_user_table(struct user_info *ui)
+{
+	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",
+			(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;
+}
+
+static void close_user_tables(void)
+{
+	struct user_info *ui;
+
+	FOR_EACH_USER(ui)
+		close_user_table(ui);
+}
+
+void close_all_tables(void)
+{
+	close_dir_table();
+	close_user_tables();
+	free_hash_table();
+}
+
+static void signal_handler(int s)
+{
+	signum = s;
+}
+
+void check_signals(void)
+{
+	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;
+	return 1;
+}
+
 /*
  * 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.
@@ -407,14 +428,6 @@ static uint32_t double_hash(uint32_t uid, uint32_t probe_num)
 		% uid_hash_table_size;
 }
 
-#define FOR_EACH_USER(ui) for (ui = uid_hash_table; ui && ui < uid_hash_table \
-		+ uid_hash_table_size; ui++)
-
-enum search_uid_flags {
-	OPEN_USER_TABLE = 1,
-	CREATE_USER_TABLE = 2,
-};
-
 static int uid_is_admissible(uint32_t uid)
 {
 	int i;
@@ -431,7 +444,7 @@ static int uid_is_admissible(uint32_t uid)
 	return i;
 }
 
-static int search_uid(uint32_t uid, enum search_uid_flags flags,
+int search_uid(uint32_t uid, enum search_uid_flags flags,
 		struct user_info **ui_ptr)
 {
 	uint32_t p;
@@ -471,9 +484,9 @@ static int update_user_row(struct osl_table *t, uint64_t dir_num,
 	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);
+	int ret = osl(osl_get_row(t, UT_DIR_NUM, &obj, &row));
 
-	if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+	if (ret == -E_OSL && osl_errno != E_OSL_RB_KEY_NOT_FOUND)
 		return ret;
 	if (ret < 0) { /* this is the first file we add */
 		struct osl_object objects[NUM_UT_COLUMNS];
@@ -486,42 +499,42 @@ static int update_user_row(struct osl_table *t, uint64_t dir_num,
 		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);
+		ret = osl(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);
+		ret = osl(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);
+		ret = osl(osl_update_object(t, row, UT_BYTES, &obj2));
 		if (ret < 0)
 			return ret;
-		ret = osl_get_object(t, row, UT_FILES, &obj1);
+		ret = osl(osl_get_object(t, row, UT_FILES, &obj1));
 		if (ret < 0)
 			return ret;
 		num = *(uint64_t *)obj1.data + 1;
-		return osl_update_object(t, row, UT_FILES, &obj2);
+		return osl(osl_update_object(t, row, UT_FILES, &obj2));
 	}
 }
 
-static uint64_t num_dirs;
-static uint64_t num_files;
-static uint64_t num_bytes;
+/* id of the device containing the base dir. */
+static dev_t device_id;
 
-int scan_dir(char *dirname)
+static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 {
 	DIR *dir;
 	struct dirent *entry;
 	int ret, cwd_fd, ret2;
 	uint64_t dir_size = 0, dir_files = 0;
-	uint64_t this_dir_num = num_dirs++;
+	uint64_t this_dir_num = ++num_dirs;
 
+	check_signals();
 	DEBUG_LOG("----------------- %llu: %s\n", (long long unsigned)num_dirs, dirname);
-	ret = para_opendir(dirname, &dir, &cwd_fd);
+	ret = adu_opendir(dirname, &dir, &cwd_fd);
 	if (ret < 0) {
 		if (ret != -ERRNO_TO_ERROR(EACCES))
 			return ret;
@@ -530,7 +543,6 @@ int scan_dir(char *dirname)
 	}
 	while ((entry = readdir(dir))) {
 		mode_t m;
-		char *tmp;
 		struct stat s;
 		uint32_t uid;
 		uint64_t size;
@@ -549,9 +561,9 @@ int scan_dir(char *dirname)
 		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 (conf.one_file_system_given && s.st_dev != device_id)
+				continue;
+			ret = scan_dir(entry->d_name, &this_dir_num);
 			if (ret < 0)
 				goto out;
 			continue;
@@ -572,289 +584,18 @@ int scan_dir(char *dirname)
 		if (ret < 0)
 			goto out;
 	}
-	ret = add_directory(dirname, this_dir_num, &dir_size, &dir_files);
+	ret = add_directory(dirname, &this_dir_num, parent_dir_num,
+			&dir_size, &dir_files);
 out:
 	closedir(dir);
-	ret2 = para_fchdir(cwd_fd);
+	ret2 = adu_fchdir(cwd_fd);
 	if (ret2 < 0 && ret >= 0)
 		ret = ret2;
 	close(cwd_fd);
 	return ret;
 }
 
-static int get_dir_name(struct osl_row *row, char **name)
-{
-	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;
-}
-
-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,
-};
-
-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,
-};
-
-const char size_unit_abbrevs[] = " BKMGT";
-const char count_unit_abbrevs[] = "  KMGT";
-
-static void format_size_value(enum enum_size_unit unit, uint64_t value, char *result)
-{
-	if (unit == size_unit_arg_h) /* human readable */
-		for (unit = size_unit_arg_b; unit < size_unit_arg_t && value > size_unit_divisors[unit + 1]; unit++)
-				; /* nothing */
-	sprintf(result, "%llu%c", (long long unsigned)value / size_unit_divisors[unit], size_unit_abbrevs[unit]);
-}
-
-static void format_count_value(enum enum_count_unit unit, uint64_t value, char *result)
-{
-	if (unit == count_unit_arg_h) /* human readable */
-		for (unit = count_unit_arg_n; unit < count_unit_arg_t && value > count_unit_divisors[unit + 1]; unit++)
-				; /* nothing */
-	sprintf(result, "%llu%c", (long long unsigned)value / count_unit_divisors[unit], count_unit_abbrevs[unit]);
-}
-
-enum global_stats_flags {
-	GSF_PRINT_DIRNAME = 1,
-	GSF_PRINT_BYTES = 2,
-	GSF_PRINT_FILES = 4,
-	GSF_COMPUTE_SUMMARY = 8,
-};
-
-struct global_stats_info {
-	uint32_t count;
-	enum global_stats_flags flags;
-};
-
-static int global_stats_loop_function(struct osl_row *row, void *data)
-{
-	struct global_stats_info *gsi = data;
-	struct osl_object obj;
-	char *dirname, formated_value[25];
-	int ret, summary = gsi->flags & GSF_COMPUTE_SUMMARY;
-
-	if (!gsi->count && !summary)
-		return -E_LOOP_COMPLETE;
-	if (gsi->count && (gsi->flags & GSF_PRINT_DIRNAME)) {
-		ret = get_dir_name(row, &dirname);
-		if (ret < 0)
-			return ret;
-		printf("%s%s", dirname,
-			(gsi->flags & (GSF_PRINT_FILES | GSF_PRINT_BYTES))?
-				"\t" : "\n"
-		);
-	}
-	if (summary || (gsi->count && (gsi->flags & GSF_PRINT_FILES))) {
-		uint64_t files;
-		ret = osl_get_object(dir_table, row, DT_FILES, &obj);
-		if (ret < 0)
-			return ret;
-		files = *(uint64_t *)obj.data;
-		if (gsi->count && (gsi->flags & GSF_PRINT_FILES)) {
-			format_size_value(conf.size_unit_arg, files,
-				formated_value);
-			printf("%s%s", formated_value,
-				(gsi->flags & GSF_PRINT_BYTES)? "\t" : "\n");
-		}
-		if (summary)
-			num_files += files;
-	}
-	if (summary || (gsi->count && (gsi->flags & GSF_PRINT_BYTES))) {
-		uint64_t bytes;
-		ret = osl_get_object(dir_table, row, DT_BYTES, &obj);
-		if (ret < 0)
-			return ret;
-		bytes = *(uint64_t *)obj.data;
-		if (gsi->count && (gsi->flags & GSF_PRINT_BYTES)) {
-			format_size_value(conf.size_unit_arg, bytes,
-				formated_value);
-			printf("%s\n", formated_value);
-		}
-		if (summary) {
-			num_bytes += bytes;
-			num_dirs++;
-		}
-	}
-	if (gsi->count > 0)
-		gsi->count--;
-	return 1;
-}
-
-static void print_id_stats(void)
-{
-	struct user_info *ui;
-
-	printf("--------------------- user summary (uid/dirs/files/bytes):\n");
-	FOR_EACH_USER(ui) {
-		char formated_dir_count[25], formated_file_count[25],
-			formated_bytes[25];
-		if (!ui_used(ui))
-			continue;
-		format_count_value(conf.count_unit_arg, ui->dirs,
-			formated_dir_count);
-		format_count_value(conf.count_unit_arg, ui->files,
-			formated_file_count);
-		format_size_value(conf.size_unit_arg, ui->bytes,
-			formated_bytes);
-		printf("%u\t%s\t%s\t%s\n", (unsigned)ui->uid,
-			formated_dir_count,
-			formated_file_count,
-			formated_bytes
-		);
-	}
-}
-
-enum user_stats_flags {
-	USF_PRINT_DIRNAME = 1,
-	USF_PRINT_BYTES = 2,
-	USF_PRINT_FILES = 4,
-	USF_COMPUTE_SUMMARY = 8,
-};
-
-struct user_stats_info {
-	uint32_t count;
-	enum user_stats_flags flags;
-	struct user_info *ui;
-};
-
-static int user_stats_loop_function(struct osl_row *row, void *data)
-{
-	struct user_stats_info *usi = data;
-	struct osl_row *dir_row;
-	struct osl_object obj;
-	int ret, summary = usi->flags & GSF_COMPUTE_SUMMARY;
-	char formated_value[25];
-
-	if (!usi->count && !summary)
-		return -E_LOOP_COMPLETE;
-	if (usi->count && (usi->flags & USF_PRINT_DIRNAME)) {
-		char *dirname;
-		ret = osl_get_object(usi->ui->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%s",
-			dirname,
-			(usi->flags & (USF_PRINT_FILES | USF_PRINT_BYTES))?
-				"\t" : "\n"
-		);
-	}
-	if (summary || (usi->count && (usi->flags & USF_PRINT_FILES))) {
-		uint64_t files;
-		ret = osl_get_object(usi->ui->table, row, UT_FILES, &obj);
-		if (ret < 0)
-			return ret;
-		files = *(uint64_t *)obj.data;
-		if (usi->count && (usi->flags & USF_PRINT_FILES)) {
-			format_size_value(conf.size_unit_arg, files,
-				formated_value);
-			printf("%s%s", formated_value,
-				(usi->flags & USF_PRINT_BYTES)? "\t" : "\n"
-			);
-		}
-		if (summary)
-			usi->ui->files += files;
-	}
-	if (summary || (usi->count && (usi->flags & USF_PRINT_BYTES))) {
-		uint64_t bytes;
-		ret = osl_get_object(usi->ui->table, row, UT_BYTES, &obj);
-		if (ret < 0)
-			return ret;
-		bytes = *(uint64_t *)obj.data;
-		if (usi->count && (usi->flags & USF_PRINT_BYTES)) {
-			format_size_value(conf.size_unit_arg, bytes,
-				formated_value);
-			printf("%s\n", formated_value);
-		}
-		if (summary) {
-			usi->ui->bytes += bytes;
-			usi->ui->dirs++;
-		}
-
-	}
-	if (usi->count > 0)
-		usi->count--;
-	return 1;
-}
-
-static void print_user_stats(void)
-{
-	struct user_info *ui;
-
-	FOR_EACH_USER(ui) {
-		struct user_stats_info usi = {
-			.count = conf.limit_arg,
-			.ui = ui
-		};
-		if (!ui_used(ui) || !ui_admissible(ui))
-			continue;
-		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
-		printf("************************************************ uid %u\n",
-			(unsigned) ui->uid);
-		printf("----------------- Largest dirs -------------------\n");
-		osl_rbtree_loop_reverse(ui->table, UT_BYTES, &usi,
-			user_stats_loop_function);
-		printf("---------- dirs containing most files ------------\n");
-		usi.count = conf.limit_arg,
-		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_FILES;
-		osl_rbtree_loop_reverse(ui->table, UT_FILES, &usi,
-			user_stats_loop_function);
-	}
-}
-
-static int print_statistics(void)
-{
-	int ret;
-	struct global_stats_info gsi = {
-		.count = conf.limit_arg,
-		.flags = GSF_PRINT_DIRNAME | GSF_PRINT_BYTES | GSF_COMPUTE_SUMMARY
-	};
-
-	printf("----------------- Largest dirs -------------------\n");
-	ret = osl_rbtree_loop_reverse(dir_table, DT_BYTES, &gsi,
-		global_stats_loop_function);
-	if (ret < 0 && ret != -E_LOOP_COMPLETE)
-		return ret;
-	gsi.count = conf.limit_arg;
-
-	gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_FILES;
-	printf("---------- dirs containing most files ------------\n");
-	ret = osl_rbtree_loop_reverse(dir_table, DT_FILES, &gsi,
-		global_stats_loop_function);
-	if (ret < 0 && ret != -E_LOOP_COMPLETE)
-		return ret;
-
-	printf("------------------ Global summary (dirs/files/bytes)\n"
-		"%llu\t%llu\t%llu\n",
-		(long long unsigned)num_dirs, (long long unsigned)num_files,
-		(long long unsigned)num_bytes);
-	print_user_stats();
-	print_id_stats();
-	return 1;
-}
-
-static char *get_uid_list_name(void)
+char *get_uid_list_name(void)
 {
 	return make_message("%s/uid_list", conf.database_dir_arg);
 }
@@ -869,7 +610,7 @@ static int write_uid_list(void)
 
 	if (!num_uids)
 		return 0;
-	buf = para_malloc(size);
+	buf = adu_malloc(size);
 	FOR_EACH_USER(ui) {
 		if (!ui_used(ui) || !ui_admissible(ui))
 			continue;
@@ -877,76 +618,38 @@ static int write_uid_list(void)
 		write_u32(buf + count++ * sizeof(uint32_t), ui->uid);
 	}
 	filename = get_uid_list_name();
-	ret = para_write_file(filename, buf, size);
+	ret = adu_write_file(filename, buf, size);
 	free(filename);
 	free(buf);
 	return ret;
 }
 
-static int open_dir_table(void)
+int open_dir_table(void)
 {
 	if (!dir_table_desc.dir) /* we did not create the table */
-		dir_table_desc.dir = para_strdup(conf.database_dir_arg);
-	return osl_open_table(&dir_table_desc, &dir_table);
+		dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
+	return osl(osl_open_table(&dir_table_desc, &dir_table));
 }
-
-static void close_dir_table(void)
-{
-	int ret;
-
-	if (!dir_table)
-		return;
-	ret = osl_close_table(dir_table, OSL_MARK_CLEAN);
-	if (ret < 0)
-		ERROR_LOG("failed to close dir table: %s\n", error_txt(-ret));
-	free((char *)dir_table_desc.dir);
-	dir_table = NULL;
-}
-
-static void close_user_table(struct user_info *ui)
-{
-	int ret;
-
-	if (!ui || !ui_used(ui) || !ui_admissible(ui))
-		return;
-	ret = osl_close_table(ui->table, OSL_MARK_CLEAN);
-	if (ret < 0)
-		ERROR_LOG("failed to close user table %u: %s\n",
-			(unsigned) ui->uid, error_txt(-ret));
-	free((char *)ui->desc->name);
-	ui->desc->name = NULL;
-	free((char *)ui->desc->dir);
-	ui->desc->dir = NULL;
-	free(ui->desc);
-	ui->desc = NULL;
-	ui->table = NULL;
-	ui->flags = 0;
-}
-
-static void close_user_tables(void)
-{
-	struct user_info *ui;
-
-	FOR_EACH_USER(ui)
-		close_user_table(ui);
-}
-
-static void close_all_tables(void)
-{
-	close_dir_table();
-	close_user_tables();
-	free_hash_table();
-}
-
 static int com_create()
 {
-	int ret = create_tables();
+	uint64_t zero = 0ULL;
+	int ret;
+	struct stat statbuf;
+
+	if (lstat(conf.base_dir_arg, &statbuf) == -1)
+		return -ERRNO_TO_ERROR(errno);
+	if (!S_ISDIR(statbuf.st_mode))
+		return -ERRNO_TO_ERROR(ENOTDIR);
+	device_id = statbuf.st_dev;
+	ret = create_tables();
 	if (ret < 0)
 		return ret;
+	check_signals();
 	ret = open_dir_table();
 	if (ret < 0)
 		return ret;
-	ret = scan_dir(conf.base_dir_arg);
+	check_signals();
+	ret = scan_dir(conf.base_dir_arg, &zero);
 	if (ret < 0)
 		goto out;
 	ret = write_uid_list();
@@ -955,61 +658,26 @@ out:
 	return ret;
 }
 
-static int read_uid_file(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);
-
-	if (ret < 0) {
-		INFO_LOG("failed to map %s\n", filename);
-		free(filename);
-		return ret;
-	}
-	num_uids = size / 4;
-	INFO_LOG("found %u uids in %s\n", (unsigned)num_uids, filename);
-	free(filename);
-	/* hash table size should be a power of two and larger than the number of uids */
-	uid_hash_table_size = 4;
-	while (uid_hash_table_size < num_uids)
-		uid_hash_table_size *= 2;
-	create_hash_table();
-	for (n = 0; n < num_uids; n++) {
-		uint32_t uid = read_u32(map + n * sizeof(uid));
-		ret = search_uid(uid, OPEN_USER_TABLE, NULL);
-		if (ret < 0)
-			goto out;
-	}
-out:
-	para_munmap(map, size);
-	return ret;
-}
-
-static int com_select(void)
-{
-	int ret;
-
-	ret = open_dir_table();
-	if (ret < 0)
-		return ret;
-	ret = read_uid_file();
-	if (ret < 0)
-		return ret;
-	print_statistics();
-	close_all_tables();
-	return 1;
-}
-
 static int check_args(void)
 {
 	int i, ret;
 
+	/* 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';
+		}
+	}
 	if (!conf.uid_given)
 		return 0;
-
-	admissible_uids = para_malloc(conf.uid_given * sizeof(*admissible_uids));
-
+	admissible_uids = adu_malloc(conf.uid_given * sizeof(*admissible_uids));
 	for (i = 0; i < conf.uid_given; i++) {
 		ret = parse_uid_range(conf.uid_arg[i], admissible_uids + i);
 		if (ret < 0)
@@ -1034,6 +702,9 @@ int main(int argc, char **argv)
 	};
 
 	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
+	ret = init_signals();
+	if (ret < 0)
+		goto out;
 	ret = check_args();
 	if (ret < 0)
 		goto out;
@@ -1047,7 +718,7 @@ int main(int argc, char **argv)
 out:
 	free(admissible_uids);
 	if (ret < 0) {
-		ERROR_LOG("%s\n", error_txt(-ret));
+		ERROR_LOG("%s\n", adu_strerror(-ret));
 		return -EXIT_FAILURE;
 	}
 	return EXIT_SUCCESS;