X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.c;h=4c1c62c0d56bb3955dabd1cfb52499d6d6fca4a3;hp=1aaea35900d67a89163d51625dee4425fc36354e;hb=b542a1e3c66b7b01cd2dc91749c5154e25cbff1e;hpb=677f261ca511c8976e2945b34b9d08f06b0ce1d1

diff --git a/adu.c b/adu.c
index 1aaea35..4c1c62c 100644
--- a/adu.c
+++ b/adu.c
@@ -1,64 +1,57 @@
 #include "adu.h"
 #include <dirent.h> /* readdir() */
+#include <pwd.h>
 
 #include "gcc-compat.h"
 #include "cmdline.h"
-#include "osl.h"
 #include "fd.h"
-#include "hash.h"
 #include "string.h"
 #include "error.h"
+#include "portable_io.h"
 
 DEFINE_ERRLIST;
+int osl_errno;
 
-#define DATABASE_DIR "/tmp/adu"
-#define UID_LIST DATABASE_DIR "/" "uid_list"
+/** 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 user_info {
-	uint32_t uid;
-	struct osl_table *table;
-	uint64_t files;
-	uint64_t bytes;
-	uint64_t dirs;
-	struct osl_table_description *desc;
-};
+struct gengetopt_args_info conf;
 
-static struct user_info *uid_hash_table;
+/** Global dir count. */
+uint64_t num_dirs = 0;
+/** Global files count. */
+uint64_t num_files = 0;
+/** Global bytes count. */
+uint64_t num_bytes = 0;
 
-/** 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 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,...)
-{
-	va_list argp;
-	FILE *outfd;
-	struct tm *tm;
-	time_t t1;
-	char str[255] = "";
+static struct user_info *uid_hash_table;
 
-	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);
-}
+/**
+ * The table containing the directory names and statistics.
+ */
+struct osl_table *dir_table = NULL;
+
+/**
+ * The array of all uid ranges that were given at the command line.
+ */
+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
@@ -82,29 +75,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.
  *
@@ -128,26 +98,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,
@@ -156,6 +111,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,
@@ -177,19 +139,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[] = {
@@ -216,70 +165,157 @@ 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);
+
+	if (ret < 0)
+		return ret;
+	if (val < 0 || val > max)
+		return -ERRNO_TO_ERROR(EINVAL);
+	*uid = val;
+	return 1;
+}
 
-static int add_directory(char *dirname, uint64_t dir_num, uint64_t *dir_size,
-		uint64_t *dir_files)
+static int parse_uid_range(const char *orig_arg, struct uid_range *ur)
 {
-	struct osl_object dir_objects[NUM_DT_COLUMNS];
-
-	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_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);
+	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;
 }
 
-static uint32_t num_uids;
+/**
+ * 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 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(DATABASE_DIR);
+	ui->desc->dir = adu_strdup(conf.database_dir_arg);
 	ui->desc->name = make_message("%u", (unsigned)ui->uid);
-	num_uids++;
+	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;
 	ui->desc = NULL;
 	ui->table = NULL;
+	ui->flags = 0;
 	return ret;
 }
 
-#define uid_hash_bits 8
-static uint32_t uid_hash_table_size = 1 << uid_hash_bits;
+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 0x811c9dc5
 #define PRIME2 0x01000193
 
-static void create_hash_table(void)
+void create_hash_table(unsigned bits)
 {
-	uid_hash_table = para_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)
@@ -288,33 +324,116 @@ static void free_hash_table(void)
 	uid_hash_table = NULL;
 }
 
-static int create_tables(void)
+static void close_dir_table(void)
 {
 	int ret;
 
-	ret = osl_create_table(&dir_table_desc);
+	if (!dir_table)
+		return;
+	ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN));
 	if (ret < 0)
-		return ret;
-	create_hash_table();
+		ERROR_LOG("failed to close dir table: %s\n", adu_strerror(-ret));
+	free((char *)dir_table_desc.dir);
+	dir_table = NULL;
+}
+
+static int close_user_table(struct user_info *ui, __a_unused void *data)
+{
+	int ret;
+
+	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;
 	return 1;
 }
 
+static void close_user_tables(void)
+{
+	for_each_admissible_user(close_user_table, NULL);
+}
+
+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;
+	if (signal(SIGPIPE, &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.
+ * 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;
 }
 
-#define FOR_EACH_USER(ui) for (ui = uid_hash_table; ui && ui < uid_hash_table \
-		+ uid_hash_table_size; ui++)
+static int uid_is_admissible(uint32_t uid)
+{
+	int i;
 
-enum search_uid_flags {
-	OPEN_USER_TABLE = 1,
-	CREATE_USER_TABLE = 2,
-};
+	for (i = 0; i < conf.uid_given; i++) {
+		struct uid_range *ur = admissible_uids + i;
 
-static int search_uid(uint32_t uid, enum search_uid_flags flags,
+		if (ur->low <= uid && ur->high >= uid)
+			break;
+	}
+	i = !conf.uid_given || i < conf.uid_given;
+	DEBUG_LOG("uid %u is %sadmissible\n", (unsigned)uid,
+		i? "" : "not ");
+	return i;
+}
+
+int search_uid(uint32_t uid, enum search_uid_flags flags,
 		struct user_info **ui_ptr)
 {
 	uint32_t p;
@@ -322,15 +441,19 @@ static int search_uid(uint32_t uid, enum search_uid_flags flags,
 	for (p = 0; p < uid_hash_table_size; p++) {
 		struct user_info *ui = uid_hash_table + double_hash(uid, p);
 
-		if (!ui->table) {
+		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))
+				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;
@@ -344,493 +467,90 @@ static int search_uid(uint32_t uid, enum search_uid_flags flags,
 	return flags? -E_HASH_TABLE_OVERFLOW : -E_BAD_UID;
 }
 
-static int update_user_row(struct osl_table *t, uint64_t dir_num,
-		uint64_t *add)
+char *get_uid_list_name(void)
 {
-	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);
-		if (ret < 0)
-			return ret;
-		num = *(uint64_t *)obj1.data + 1;
-		return osl_update_object(t, row, UT_FILES, &obj2);
-	}
+	return make_message("%s/uid_list", conf.database_dir_arg);
 }
 
-static uint64_t num_dirs;
-static uint64_t num_files;
-static uint64_t num_bytes;
-
-int scan_dir(char *dirname)
+int open_dir_table(int create)
 {
-	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++;
-
-	DEBUG_LOG("----------------- %llu: %s\n", (long long unsigned)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, CREATE_USER_TABLE | OPEN_USER_TABLE, &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;
-}
-
-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;
-}
-
-enum global_stats_flags {
-	GSF_PRINT_DIRNAME = 1,
-	GSF_PRINT_BYTES = 2,
-	GSF_PRINT_FILES = 4,
-	GSF_COMPUTE_SUMMARY = 8,
-};
+	dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
 
-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;
-	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))
-			printf("%llu%s", (long long unsigned)files,
-				(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)
+	if (create) {
+		int ret = osl(osl_create_table(&dir_table_desc));
+		if (ret < 0) {
+			free((char *)dir_table_desc.dir);
 			return ret;
-		bytes = *(uint64_t *)obj.data;
-		if (gsi->count && (gsi->flags & GSF_PRINT_BYTES))
-			printf("%llu\n", (long long unsigned)bytes);
-		if (summary) {
-			num_bytes += bytes;
-			num_dirs++;
 		}
 	}
-	if (gsi->count)
-		gsi->count--;
-	return 1;
+	return osl(osl_open_table(&dir_table_desc, &dir_table));
 }
 
-static void print_id_stats(void)
-{
-	struct user_info *ui;
-
-	printf("--------------------- user summary (uid/dirs/files/bytes):\n");
-	FOR_EACH_USER(ui) {
-		if (!ui->table)
-			continue;
-		printf("%u\t%llu\t%llu\t%llu\n", (unsigned)ui->uid,
-			(long long unsigned)ui->dirs,
-			(long long unsigned)ui->files,
-			(long long unsigned)ui->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)
+static int check_args(void)
 {
-	struct user_stats_info *usi = data;
-	struct osl_row *dir_row;
-	struct osl_object obj;
-	int ret, summary = usi->flags & GSF_COMPUTE_SUMMARY;
-
-	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))
-			printf("%llu%s",
-				(long long unsigned)files,
-				(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))
-			printf("%llu\n", (long long unsigned)bytes);
-		if (summary) {
-			usi->ui->bytes += bytes;
-			usi->ui->dirs++;
+	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);
+		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 (usi->count)
-		usi->count--;
-	return 1;
-}
-
-static void print_user_stats(void)
-{
-	struct user_info *ui;
-
-	FOR_EACH_USER(ui) {
-		struct user_stats_info usi = {
-			.count = 10,
-			.ui = ui
-		};
-		if (!ui->table)
-			continue;
-		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
-		printf("************************************************ uid %u\n",
-			(unsigned) ui->uid);
-		if (!ui->table)
-			continue;
-		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 = 10;
-		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 = 10,
-		.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 = 10;
-
-	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 int write_uid_list(void)
-{
-	char *buf;
-	uint32_t count = 0;
-	struct user_info *ui;
-	size_t size = num_uids * sizeof(uint32_t);
-	int ret;
-
-	if (!num_uids)
+	if (!conf.uid_given)
 		return 0;
-	buf = para_malloc(size);
-	FOR_EACH_USER(ui) {
-		if (!ui->table)
-			continue;
-		write_u32(buf + count++ * sizeof(uint32_t), ui->uid);
-	}
-	ret = para_write_file(UID_LIST, buf, size);
-	free(buf);
-	return ret;
-}
-
-static int open_dir_table(void)
-{
-	return 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));
-	dir_table = NULL;
-}
-
-static void close_user_table(struct user_info *ui)
-{
-	int ret;
-
-	if (!ui || !ui->table)
-		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;
-}
-
-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(char *dirname)
-{
-	int ret = create_tables();
-	if (ret < 0)
-		return ret;
-	ret = open_dir_table();
-	if (ret < 0)
-		return ret;
-	ret = scan_dir(dirname);
-	if (ret < 0)
-		goto out;
-	ret = write_uid_list();
-out:
-	close_all_tables();
-	return ret;
-}
-
-static int read_uid_file(void)
-{
-	char *map;
-	size_t size;
-	int ret = mmap_full_file(UID_LIST, O_RDONLY, (void **)&map, &size, NULL);
-	uint32_t n;
-
-	if (ret < 0)
-		return ret;
-	num_uids = size / 4;
-	/* 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);
+	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)
-			goto out;
+			goto err;
 	}
-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;
+err:
+	free(admissible_uids);
+	admissible_uids = NULL;
+	return ret;
 }
 
 int main(int argc, char **argv)
 {
-	int ret = -E_SYNTAX;
+	int ret;
 	struct cmdline_parser_params params = {
 		.override = 0,
 		.initialize = 1,
-		.check_required = 0,
-		.check_ambiguity = 0,
+		.check_required = 1,
+		.check_ambiguity = 1,
 		.print_errors = 1
 	};
 
 	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
-	if (argc > 2)
+	ret = check_args();
+	if (ret < 0)
+		goto out;
+	ret = init_signals();
+	if (ret < 0)
 		goto out;
-	if (argc == 1)
+	ret = -E_SYNTAX;
+	if (conf.select_given)
 		ret = com_select();
 	else
-		ret = com_create(argv[1]);
+		ret = com_create();
 	if (ret < 0)
 		goto out;
 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;