X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;h=7537f4cae3b638bccf6c51c23282ccb68b9b693c;hp=a58ec39a4ad6338c827d2d275fd220443fcab2b2;hb=06ed2a8ccb7f05eacb530a34f222a1d900f35bf5;hpb=0249d53c34a7b4d233c3c12b02d546cca56764da

diff --git a/select.c b/select.c
index a58ec39..7537f4c 100644
--- a/select.c
+++ b/select.c
@@ -14,11 +14,10 @@
 #include "fd.h"
 #include "string.h"
 #include "error.h"
-#include "portable_io.h"
-
-/** The decimal representation of an uint64_t never exceeds that size. */
-#define FORMATED_VALUE_SIZE 25
+#include "user.h"
+#include "select.cmdline.h"
 
+/* global list */
 #define GLOBAL_LIST_ATOMS \
 	ATOM(size, SIZE) \
 	ATOM(files, COUNT) \
@@ -34,6 +33,7 @@ struct atom global_list_atoms[] = {
 enum global_list_atoms {GLOBAL_LIST_ATOMS};
 #undef ATOM
 
+/* global summary */
 #define GLOBAL_SUMMARY_ATOMS \
 	ATOM(dirs, COUNT) \
 	ATOM(files, COUNT) \
@@ -49,6 +49,25 @@ struct atom global_summary_atoms[] = {
 enum global_summary_atoms {GLOBAL_SUMMARY_ATOMS};
 #undef ATOM
 
+/* user list */
+#define USER_LIST_ATOMS \
+	ATOM(pw_name, STRING) \
+	ATOM(uid, ID) \
+	ATOM(size, SIZE) \
+	ATOM(files, COUNT) \
+	ATOM(dirname, STRING) \
+
+#define ATOM(x, y) { .name = #x, .type = AT_ ## y},
+struct atom user_list_atoms[] = {
+	USER_LIST_ATOMS
+	{.name = NULL}
+};
+#undef ATOM
+#define ATOM(x, y) ula_ ## x,
+enum user_list_atoms {USER_LIST_ATOMS};
+#undef ATOM
+
+/* user summary */
 #define USER_SUMMARY_ATOMS \
 	ATOM(pw_name, STRING) \
 	ATOM(uid, ID) \
@@ -66,11 +85,6 @@ struct atom user_summary_atoms[] = {
 enum user_summary_atoms {USER_SUMMARY_ATOMS};
 #undef ATOM
 
-
-
-/* these get filled in by the select command. */
-static char count_unit_buf[4] = "( )", size_unit_buf[4] = "( )";
-
 struct global_list_info {
 	uint32_t count;
 	int ret;
@@ -89,81 +103,25 @@ struct global_summary_info {
 	int osl_errno;
 };
 
-struct user_summary_info {
+struct user_list_info {
+	uint32_t count;
 	struct user_info *ui;
+	struct format_info *fi;
 	int ret;
 	int osl_errno;
 };
 
-
-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_summary_info {
+	struct user_info *ui;
 	int ret;
 	int osl_errno;
-	struct user_info *ui;
-};
-
-static 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,
 };
 
-static 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,
+struct user_summary_line_info {
+	struct format_info *fi;
+	uint32_t count;
 };
 
-static const char size_unit_abbrevs[] = " BKMGT";
-static const char count_unit_abbrevs[] = "  kmgt";
-static enum enum_size_unit format_size_value(enum enum_size_unit unit,
-		uint64_t value, int print_unit, char *result)
-{
-	enum enum_size_unit u = unit;
-	char unit_buf[2] = "\0\0";
-
-	if (unit == size_unit_arg_h) /* human readable */
-		for (u = size_unit_arg_b; u < size_unit_arg_t &&
-				value > size_unit_divisors[u + 1]; u++)
-			; /* nothing */
-	if (print_unit)
-		unit_buf[0] = size_unit_abbrevs[u];
-	sprintf(result, "%llu%s",
-		(long long unsigned)value / size_unit_divisors[u], unit_buf);
-	return u;
-}
-
-static enum enum_count_unit format_count_value(enum enum_count_unit unit,
-		uint64_t value, int print_unit, char *result)
-{
-	enum enum_count_unit u = unit;
-	char unit_buf[2] = "\0\0";
-
-	if (unit == count_unit_arg_h) /* human readable */
-		for (u = count_unit_arg_n; u < count_unit_arg_t &&
-				value > count_unit_divisors[u + 1]; u++)
-			; /* nothing */
-	if (print_unit)
-		unit_buf[0] = count_unit_abbrevs[u];
-	sprintf(result, "%llu%s",
-		(long long unsigned)value / count_unit_divisors[u], unit_buf);
-	return u;
-}
-
 static FILE *output_file;
 
 __printf_1_2 static int output(const char const *fmt, ...)
@@ -228,6 +186,18 @@ static int get_dir_name_of_row(struct osl_row *dir_table_row, char **name)
 	return get_dir_name_by_number((uint64_t *)obj.data, name);
 }
 
+static int get_dir_name_of_user_row(struct osl_row *user_table_row,
+		struct user_info *ui, char **dirname)
+{
+	struct osl_object obj;
+	int ret = osl(osl_get_object(ui->table, user_table_row,
+		UT_DIR_NUM, &obj));
+
+	if (ret < 0)
+		return ret;
+	return get_dir_name_by_number((uint64_t *)obj.data, dirname);
+}
+
 static int get_num_files_of_row(struct osl_row *row, uint64_t *num_files)
 {
 	struct osl_object obj;
@@ -272,86 +242,6 @@ static int get_num_user_bytes(struct osl_row *row, struct user_info *ui,
 	return 1;
 }
 
-
-static int user_stats_loop_function(struct osl_row *row, void *data)
-{
-	struct user_stats_info *usi = data;
-	struct osl_object obj;
-	int ret, summary = usi->flags & USF_COMPUTE_SUMMARY;
-	char formated_value[FORMATED_VALUE_SIZE];
-
-	check_signals();
-	if (!usi->count && !summary) {
-		ret = -E_LOOP_COMPLETE;
-		goto err;
-	}
-	if (summary || (usi->count && (usi->flags & USF_PRINT_FILES))) {
-		uint64_t files;
-		ret = osl(osl_get_object(usi->ui->table, row, UT_FILES, &obj));
-		if (ret < 0)
-			goto err;
-		files = *(uint64_t *)obj.data;
-		if (usi->count && (usi->flags & USF_PRINT_FILES)) {
-			format_count_value(select_conf.count_unit_arg, files,
-				select_conf.count_unit_arg == count_unit_arg_h,
-				formated_value);
-			ret = output("\t%s%s", formated_value,
-				(usi->flags & (USF_PRINT_BYTES | USF_PRINT_DIRNAME))?
-					"\t" : "\n");
-			if (ret < 0)
-				goto err;
-		}
-		if (summary)
-			usi->ui->files += files;
-	}
-	if (summary || (usi->count && (usi->flags & USF_PRINT_BYTES))) {
-		uint64_t bytes;
-		ret = osl(osl_get_object(usi->ui->table, row, UT_BYTES, &obj));
-		if (ret < 0)
-			goto err;
-		bytes = *(uint64_t *)obj.data;
-		if (usi->count && (usi->flags & USF_PRINT_BYTES)) {
-			format_size_value(select_conf.size_unit_arg, bytes,
-				select_conf.size_unit_arg == size_unit_arg_h,
-				formated_value);
-			ret = output("%s%s%s",
-				(usi->flags & USF_PRINT_FILES)? "" : "\t",
-				formated_value,
-				usi->flags & USF_PRINT_DIRNAME?  "\t" : "\n"
-			);
-			if (ret < 0)
-				goto err;
-		}
-		if (summary) {
-			usi->ui->bytes += bytes;
-			usi->ui->dirs++;
-		}
-
-	}
-	if (usi->count && (usi->flags & USF_PRINT_DIRNAME)) {
-		char *dirname;
-		ret = osl(osl_get_object(usi->ui->table, row, UT_DIR_NUM, &obj));
-		if (ret < 0)
-			goto err;
-		ret = get_dir_name_by_number((uint64_t *)obj.data, &dirname);
-		if (ret < 0)
-			goto err;
-		ret = output("%s%s\n",
-			(usi->flags & (USF_PRINT_BYTES | USF_PRINT_FILES))? "" : "\t",
-			dirname);
-		free(dirname);
-		if (ret < 0)
-			goto err;
-	}
-	if (usi->count > 0)
-		usi->count--;
-	return 1;
-err:
-	usi->ret = ret;
-	usi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
-	return -1;
-}
-
 static int check_loop_return(int ret, int loop_ret, int loop_osl_errno)
 {
 	if (ret >= 0)
@@ -397,7 +287,7 @@ static int global_summary_loop_function(struct osl_row *row, void *data)
 err:
 	gsi->ret = ret;
 	gsi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
-	return -1;
+	return ret;
 }
 
 static int print_global_summary(struct format_info *fi)
@@ -449,7 +339,7 @@ static int user_summary_loop_function(struct osl_row *row, void *data)
 err:
 	usi->ret = ret;
 	usi->osl_errno = (ret == -E_OSL)? osl_errno : 0;
-	return -1;
+	return ret;
 }
 
 static int compute_user_summary(struct user_info *ui, __a_unused void *data)
@@ -462,7 +352,7 @@ static int compute_user_summary(struct user_info *ui, __a_unused void *data)
 
 static int print_user_summary_line(struct user_info *ui, void *data)
 {
-	struct format_info *fi = data;
+	struct user_summary_line_info *usli = data;
 	union atom_value values[] = {
 		[usa_pw_name] = {.string_value = ui->pw_name?
 			ui->pw_name : "?"},
@@ -472,18 +362,22 @@ static int print_user_summary_line(struct user_info *ui, void *data)
 		[usa_size] = {.num_value =  (long long unsigned)ui->bytes}
 	};
 	char *buf;
-	int ret;
+	int ret = -E_LOOP_COMPLETE;
 
-	buf = format_items(fi, values);
+	if (!usli->count)
+		return ret;
+
+	buf = format_items(usli->fi, values);
 	ret = output("%s", buf);
 	free(buf);
+	usli->count--;
 	return ret;
 }
 
-static int name_comp(const void *a, const void *b)
+static int name_comp(struct user_info *a, struct user_info *b)
 {
-	char *x = ((struct user_info *)a)->pw_name;
-	char *y = ((struct user_info *)b)->pw_name;
+	char *x = a->pw_name;
+	char *y = b->pw_name;
 
 	if (!x)
 		return 1;
@@ -492,119 +386,138 @@ static int name_comp(const void *a, const void *b)
 	return strcmp(x, y);
 }
 
-static int uid_comp(const void *a, const void *b)
+static int uid_comp(struct user_info *a, struct user_info *b)
 {
-	return -NUM_COMPARE(((struct user_info *)a)->uid,
-		((struct user_info *)b)->uid);
+	return -NUM_COMPARE(a->uid, b->uid);
 }
 
-static int dir_count_comp(const void *a, const void *b)
+static int dir_count_comp(struct user_info *a, struct user_info *b)
 {
-	return NUM_COMPARE(((struct user_info *)a)->dirs,
-		((struct user_info *)b)->dirs);
+	return NUM_COMPARE(a->dirs, b->dirs);
 }
 
-static int file_count_comp(const void *a, const void *b)
+static int file_count_comp(struct user_info *a, struct user_info *b)
 {
-	return NUM_COMPARE(((struct user_info *)a)->files,
-		((struct user_info *)b)->files);
+	return NUM_COMPARE(a->files, b->files);
 }
 
-static int size_comp(const void *a, const void *b)
+static int size_comp(struct user_info *a, struct user_info *b)
 {
-	return NUM_COMPARE(((struct user_info *)a)->bytes,
-		((struct user_info *)b)->bytes);
+	return NUM_COMPARE(a->bytes, b->bytes);
 }
 
-/*
- * The comparators for sorting the user summary.
- *
- * This is an array of pointers to functions taking two constant void *
- * pointers and returning an int.
- */
-static int (*summary_comparators[])(const void *, const void *) = {
-	[user_summary_sort_arg_name] = name_comp,
-	[user_summary_sort_arg_uid] = uid_comp,
-	[user_summary_sort_arg_dir_count] = dir_count_comp,
-	[user_summary_sort_arg_file_count] = file_count_comp,
-	[user_summary_sort_arg_size] = size_comp,
-};
-
 static int print_user_summary(struct format_info *fi)
 {
+	int ret;
+	int (*comp)(struct user_info *a, struct user_info *b);
+	struct user_summary_line_info usli = {
+		.fi = fi,
+		.count = select_conf.limit_arg
+	};
+
 	if (!select_conf.no_headers_given) {
-		int ret = output("User summary\n");
+		ret = output("User summary\n");
 		if (ret < 0)
 			return ret;
 	}
-	int ret = for_each_admissible_user(compute_user_summary, fi);
+	ret = for_each_admissible_user(compute_user_summary, NULL);
 	if (ret < 0)
 		return ret;
-	sort_hash_table(summary_comparators[select_conf.user_summary_sort_arg]);
-	return for_each_admissible_user(print_user_summary_line, fi);
+	switch (select_conf.user_summary_sort_arg) {
+	case user_summary_sort_arg_name:
+		comp = name_comp;
+		break;
+	case user_summary_sort_arg_uid:
+		comp = uid_comp;
+		break;
+	case user_summary_sort_arg_dir_count:
+		comp = dir_count_comp;
+		break;
+	case user_summary_sort_arg_file_count:
+		comp = file_count_comp;
+		break;
+	case user_summary_sort_arg_size:
+		comp = size_comp;
+		break;
+	}
+	sort_hash_table(comp);
+	ret = for_each_admissible_user(print_user_summary_line, &usli);
+	if (ret == -E_LOOP_COMPLETE)
+		ret = 1;
+	return ret;
 }
 
-static int print_user_list(struct user_info *ui, __a_unused void *data)
+static int user_list_loop_function(struct osl_row *row, void *data)
 {
+	struct user_list_info *uli = data;
+	union atom_value values[] = {
+		[ula_pw_name] = {.string_value = uli->ui->pw_name?
+			uli->ui->pw_name : "?"},
+		[ula_uid] = {.num_value = (long long unsigned)uli->ui->uid},
+		[ula_files] = {.num_value = 0ULL},
+		[ula_size] = {.num_value =  0ULL},
+		[ula_dirname] = {.string_value = NULL}
+	};
+	uint64_t num;
 	int ret;
-	struct user_stats_info usi;
-	enum enum_user_list ula = select_conf.user_list_arg;
-	int print_size_list = (ula == user_list_arg_size
-		|| ula == user_list_arg_both);
-
-	if (print_size_list) {
-		usi.count = select_conf.limit_arg;
-		usi.ui = ui;
-		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
-		if (!select_conf.no_headers_given) {
-			ret = output("%s (uid %u), by size%s:\n",
-				ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
-				size_unit_buf);
-			if (ret < 0)
-				return ret;
-		}
-		ret = adu_loop_reverse(ui->table, UT_BYTES, &usi, user_stats_loop_function,
-			&usi.ret, &usi.osl_errno);
-		if (ret < 0)
-			return ret;
-		ret = output("\n");
-		if (ret < 0)
-			return ret;
-	}
-	if (ula == user_list_arg_file_count || ula == user_list_arg_both) {
-		if (!select_conf.no_headers_given) {
-			ret = output("%s (uid %u), by file count%s:\n",
-				ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid,
-				count_unit_buf);
-			if (ret < 0)
-				return ret;
-		}
-		usi.count = select_conf.limit_arg,
-		usi.ui = ui;
-		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_FILES;
-		ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
-			&usi.ret, &usi.osl_errno);
-		if (ret < 0)
-			return ret;
-		ret = output("\n");
-		if (ret < 0)
-			return ret;
-	}
-	if (ula == user_list_arg_none && !select_conf.no_user_summary_given) {
-		usi.count = select_conf.limit_arg;
-		usi.ui = ui;
-		usi.flags = USF_COMPUTE_SUMMARY;
-		ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
-			&usi.ret, &usi.osl_errno);
-		if (ret < 0)
-			return ret;
-	}
-	return 1;
+	char *dirname, *buf;
+
+	check_signals();
+	ret = -E_LOOP_COMPLETE;
+	if (!uli->count)
+		goto err;
+
+	ret = get_num_user_files(row, uli->ui, &num);
+	if (ret < 0)
+		goto err;
+	values[ula_files].num_value = num;
+
+	ret = get_num_user_bytes(row, uli->ui, &num);
+	if (ret < 0)
+		goto err;
+	values[ula_size].num_value = num;
+
+	ret = get_dir_name_of_user_row(row, uli->ui, &dirname);
+	if (ret < 0)
+		goto err;
+	values[ula_dirname].string_value = dirname;
+
+	buf = format_items(uli->fi, values);
+	free(dirname);
+	ret = output("%s", buf);
+	free(buf);
+	if (ret < 0)
+		goto err;
+	uli->count--;
+	return ret;
+err:
+	uli->ret = ret;
+	uli->osl_errno = (ret == -E_OSL)? osl_errno : 0;
+	return ret;
 }
 
-static int print_user_lists(void)
+static int print_user_list(struct user_info *ui, void *data)
 {
-	return for_each_admissible_user(print_user_list, NULL);
+	struct format_info *fi = data;
+	int ret;
+	enum user_table_columns sort_column = UT_BYTES;
+	struct user_list_info uli = {
+		.ui = ui,
+		.fi = fi,
+		.count = select_conf.limit_arg
+	};
+
+	if (select_conf.list_sort_arg == list_sort_arg_file_count)
+		sort_column = UT_FILES;
+
+	if (!select_conf.no_headers_given) {
+		ret = output("%s (uid %u)\n",
+			ui->pw_name? ui->pw_name : "?", (unsigned)ui->uid);
+		if (ret < 0)
+			return ret;
+	}
+	return adu_loop_reverse(ui->table, sort_column, &uli, user_list_loop_function,
+		&uli.ret, &uli.osl_errno);
 }
 
 static int global_list_loop_function(struct osl_row *row, void *data)
@@ -643,6 +556,8 @@ static int global_list_loop_function(struct osl_row *row, void *data)
 	free(dirname);
 	ret = output("%s", buf);
 	free(buf);
+	if (ret < 0)
+		goto err;
 	if (gli->count > 0)
 		gli->count--;
 	return ret;
@@ -672,111 +587,184 @@ static int print_global_list(struct format_info *fi)
 		global_list_loop_function, &gli.ret, &gli.osl_errno);
 }
 
-static int print_statistics(struct select_format_info *sli)
+static int print_statistics(struct format_info *fi)
 {
-	int ret;
-
 	switch (select_conf.select_mode_arg) {
 		case select_mode_arg_global_list:
-			ret = print_global_list(sli->global_list_fi);
-			free_format_info(sli->global_list_fi);
-			return ret;
+			return print_global_list(fi);
 		case select_mode_arg_global_summary:
-			ret = print_global_summary(sli->global_summary_fi);
-			free_format_info(sli->global_summary_fi);
-			return ret;
+			return print_global_summary(fi);
 		case select_mode_arg_user_list:
-			ret = print_user_lists();
-			return ret;
+			return for_each_admissible_user(print_user_list, fi);
 		case select_mode_arg_user_summary:
-			ret = print_user_summary(sli->user_summary_fi);
-			free_format_info(sli->user_summary_fi);
-			return ret;
+			return print_user_summary(fi);
 	};
 	ERROR_LOG("bad select mode\n");
-	return ERRNO_TO_ERROR(-EINVAL);
+	return -ERRNO_TO_ERROR(EINVAL);
 }
 
-static int read_uid_file(struct uid_range *admissible_uids)
+static int open_pipe(char *path)
 {
-	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);
-	unsigned bits;
+	int p[2], ret, argc;
+	char **argv;
 
-	if (ret < 0) {
-		INFO_LOG("failed to map %s\n", filename);
-		free(filename);
-		return ret;
+	ret = pipe(p);
+	if (ret < 0)
+		return ERRNO_TO_ERROR(errno);
+	ret = fork();
+	if (ret < 0)
+		return ERRNO_TO_ERROR(errno);
+	if (ret) { /* parent */
+		DEBUG_LOG("created process %d\n", ret);
+		close(p[0]);
+		output_file = fdopen(p[1], "w");
+		if (!output_file)
+			return ERRNO_TO_ERROR(errno);
+		return 1;
+	}
+	close(p[1]);
+	if (p[0] != STDIN_FILENO)
+		dup2(p[0], STDIN_FILENO);
+	DEBUG_LOG("executing %s\n", path);
+	argc = split_args(path, &argv, " \t");
+	execvp(argv[0], argv);
+	ERROR_LOG("error executing %s: %s\n", path,
+		adu_strerror(ERRNO_TO_ERROR(errno)));
+	_exit(EXIT_FAILURE);
+}
+
+static int open_output_stream(void)
+{
+	char *p;
+	int ret, flags = O_WRONLY | O_CREAT;
+
+	if (!select_conf.output_given)
+		goto use_stdout;
+	p = select_conf.output_arg;
+	switch (p[0]) {
+	case '\0': /* empty string */
+		goto bad_output_arg;
+	case '-':
+		if (!p[1]) /* "-" means stdout */
+			goto use_stdout;
+		/* string starting with a dash */
+		flags |= O_EXCL;
+		goto open_file;
+	case '>':
+		if (!p[1]) /* ">" is invalid */
+			goto bad_output_arg;
+		if (p[1] != '>') {
+			p++;
+			flags |= O_TRUNC;
+			goto open_file;
+		}
+		/* string starting with ">>" */
+		if (!p[2]) /* ">>" is invalid */
+			goto bad_output_arg;
+		flags |= O_APPEND;
+		p += 2;
+		goto open_file;
+	case '|':
+		if (!p[1]) /* "|" is invalid */
+			goto bad_output_arg;
+		p++;
+		return open_pipe(p);
+	default: /* args starts with no magic character */
+		flags |= O_EXCL;
+		goto open_file;
 	}
-	num_uids = size / 4;
-	INFO_LOG("found %u uids in %s\n", (unsigned)num_uids, filename);
-	free(filename);
+use_stdout:
+	output_file = stdout;
+	return 1;
+bad_output_arg:
+	output_file = NULL;
+	return -E_BAD_OUTPUT_ARG;
+open_file:
 	/*
-	 * Compute number of hash table bits. The hash table size must be a
-	 * power of two and larger than the number of uids.
+	 * glibc's 'x' mode to fopen is not portable, so use open() and
+	 * fdopen().
 	 */
-	bits = 2;
-	while (1 << bits < num_uids)
-		bits++;
-	create_hash_table(bits);
-	for (n = 0; n < num_uids; n++) {
-		uint32_t uid = read_u32(map + n * sizeof(uid));
-		ret = search_uid(uid, admissible_uids, OPEN_USER_TABLE, NULL);
-		if (ret < 0)
-			goto out;
-	}
-out:
-	adu_munmap(map, size);
-	return ret;
+	ret = open(p, flags, 0644);
+	if (ret < 0)
+		return -ERRNO_TO_ERROR(errno);
+	output_file = fdopen(ret, "w");
+	if (!output_file)
+		return -ERRNO_TO_ERROR(errno);
+	return 1;
 }
 
-int run_select_query(struct uid_range *admissible_uids,
-		struct select_format_info *sfi)
+int run_select_query(struct uid_range *admissible_uids, struct format_info *fi)
 {
-	int ret;
-
-	if (select_conf.output_given && strcmp(select_conf.output_arg, "-")) {
-		output_file = fopen(select_conf.output_arg, "w");
-		if (!output_file)
-			return -ERRNO_TO_ERROR(errno);
-	} else
-		output_file = stdout;
-
-	if (select_conf.count_unit_arg != count_unit_arg_h)
-		count_unit_buf[1] = count_unit_abbrevs[select_conf.count_unit_arg];
-	else
-		count_unit_buf[0] = '\0';
-	if (select_conf.size_unit_arg != size_unit_arg_h)
-		size_unit_buf[1] = size_unit_abbrevs[select_conf.size_unit_arg];
-	else
-		size_unit_buf[0] = '\0';
+	int ret = open_output_stream();
 
+	if (ret < 0)
+		goto out;
 	ret = open_dir_table(0);
 	if (ret < 0)
 		goto out;
 	check_signals();
-	ret = read_uid_file(admissible_uids);
+	ret = open_admissible_user_tables(admissible_uids);
 	if (ret < 0)
 		goto out;
 	check_signals();
-	ret = print_statistics(sfi);
+	ret = print_statistics(fi);
 out:
-	close_all_tables();
-	if (output_file != stdout)
+	if (output_file && output_file != stdout) {
 		fclose(output_file);
+		output_file = NULL;
+	}
 	return ret;
 }
 
+#define GLOBAL_LIST_DFLT_FMT "%(size:r:8) %(files:r:8) %(dirname)\n"
+#define GLOBAL_SUMMARY_DFLT_FMT "#directories: %(dirs), #files: %(files), size: %(size)\n\n"
+#define USER_LIST_DFLT_FMT "%(size:r:5) %(files:r:5) %(dirname)\n"
+#define USER_SUMMARY_DFLT_FMT "%(pw_name:l:16) %(uid:r:5) %(dirs:r:5) %(files:r:5) %(size:r:5)\n"
+
+static int setup_format_string(char *fmt, struct format_info **fi)
+{
+	struct atom *atoms;
+
+	if (!fmt)
+		INFO_LOG("using default format string\n");
+	switch (select_conf.select_mode_arg) {
+	case select_mode_arg_global_list:
+		if (!fmt)
+			fmt = GLOBAL_LIST_DFLT_FMT;
+		atoms = global_list_atoms;
+		break;
+	case select_mode_arg_global_summary:
+		if (!fmt)
+			fmt = GLOBAL_SUMMARY_DFLT_FMT;
+		atoms = global_summary_atoms;
+		break;
+	case select_mode_arg_user_list:
+		if (!fmt)
+			fmt = USER_LIST_DFLT_FMT;
+		atoms = user_list_atoms;
+		break;
+	case select_mode_arg_user_summary:
+		if (!fmt)
+			fmt = USER_SUMMARY_DFLT_FMT;
+		atoms = user_summary_atoms;
+		break;
+	default:
+		ERROR_LOG("bad select mode\n");
+		return -ERRNO_TO_ERROR(EINVAL);
+	};
+	INFO_LOG("format string: %s\n", fmt);
+	return parse_format_string(fmt, atoms, fi);
+}
+
 /* return: < 0: error, >0: OK, == 0: help given */
 int parse_select_options(char *string, struct select_cmdline_parser_params *params,
-		struct uid_range **admissible_uids, struct select_format_info *sfi)
+		struct uid_range **admissible_uids, struct format_info **fi)
 {
-	int ret;
+	int ret, num_uid_ranges;
 	const char **line;
+	char *fmt = NULL;
 
-	if (conf.select_options_given) {
+	if (string) {
 		int argc;
 		char **argv;
 
@@ -790,29 +778,17 @@ int parse_select_options(char *string, struct select_cmdline_parser_params *para
 			return -E_SYNTAX;
 		if (select_conf.help_given || select_conf.detailed_help_given)
 			goto help;
-
+		fmt = select_conf.format_arg;
 	}
 	ret = parse_uid_arg(select_conf.uid_arg, admissible_uids);
 	if (ret < 0)
 		return ret;
-	ret = parse_format_string(select_conf.user_summary_format_arg,
-		user_summary_atoms, &sfi->user_summary_fi);
+	num_uid_ranges = ret;
+	ret = append_users(select_conf.user_arg, select_conf.user_given,
+		admissible_uids, num_uid_ranges);
 	if (ret < 0)
 		return ret;
-	ret = parse_format_string(select_conf.global_summary_format_arg,
-		global_summary_atoms, &sfi->global_summary_fi);
-	if (ret < 0)
-		goto global_summary_err;
-	ret = parse_format_string(select_conf.global_list_format_arg,
-		global_list_atoms, &sfi->global_list_fi);
-	if (ret < 0)
-		goto global_list_err;
-	return 1;
-global_list_err:
-	free_format_info(sfi->global_summary_fi);
-global_summary_err:
-	free_format_info(sfi->user_summary_fi);
-	return ret;
+	return setup_format_string(fmt, fi);
 help:
 	line = select_conf.detailed_help_given?
 		select_args_info_detailed_help : select_args_info_help;
@@ -829,8 +805,8 @@ help:
 int com_select(void)
 {
 	struct uid_range *admissible_uids = NULL;
-	struct select_format_info sfi;
 	int ret;
+	struct format_info *fi;
 	struct select_cmdline_parser_params params = {
 		.override = 1,
 		.initialize = 1,
@@ -839,10 +815,16 @@ int com_select(void)
 		.print_errors = 1
 	};
 
-	select_cmdline_parser_init(&select_conf);
 	ret = parse_select_options(conf.select_options_arg, &params,
-		&admissible_uids, &sfi);
-	if (ret <= 0) /* do not run query if help was given */
-		return ret;
-	return run_select_query(admissible_uids, &sfi);
+		&admissible_uids, &fi);
+	if (ret > 0) {
+		ret = read_uid_file();
+		if (ret < 0)
+			goto out;
+		ret = run_select_query(admissible_uids, fi);
+		free_format_info(fi);
+	}
+out:
+	select_cmdline_parser_free(&select_conf);
+	return ret;
 }