X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;h=ded4a095ca751574bbfa9153d3ec61ad7aa32bb2;hp=f929c35016c8b46ede7d8867e7bb63b0c77e8df9;hb=8230b9164cf013b77bcb86028cba43b4d0b721fa;hpb=b6077bec588bd4a699f499acdab59bda8137718e

diff --git a/select.c b/select.c
index f929c35..ded4a09 100644
--- a/select.c
+++ b/select.c
@@ -14,7 +14,8 @@
 #include "fd.h"
 #include "string.h"
 #include "error.h"
-#include "portable_io.h"
+#include "user.h"
+#include "select.cmdline.h"
 
 /* global list */
 #define GLOBAL_LIST_ATOMS \
@@ -282,7 +283,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)
@@ -334,7 +335,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)
@@ -468,12 +469,14 @@ static int user_list_loop_function(struct osl_row *row, void *data)
 	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 -1;
+	return ret;
 }
 
 static int print_user_list(struct user_info *ui, void *data)
@@ -536,6 +539,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;
@@ -565,80 +570,118 @@ 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 = for_each_admissible_user(print_user_list,
-				sli->user_list_fi);
-			free_format_info(sli->user_list_fi);
-			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;
 	}
-	num_uids = size / 4;
-	INFO_LOG("found %u uids in %s\n", (unsigned)num_uids, filename);
-	free(filename);
+	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;
+	}
+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;
+	int ret = open_output_stream();
 
+	if (ret < 0)
+		goto out;
 	ret = open_dir_table(0);
 	if (ret < 0)
 		goto out;
@@ -647,22 +690,65 @@ int run_select_query(struct uid_range *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;
 
@@ -676,35 +762,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;
-	ret = parse_format_string(select_conf.user_list_format_arg,
-		user_list_atoms, &sfi->user_list_fi);
-	if (ret < 0)
-		goto user_list_err;
-	return 1;
-user_list_err:
-	free_format_info(sfi->global_list_fi);
-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;
@@ -721,8 +789,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,
@@ -733,8 +801,10 @@ int com_select(void)
 
 	select_cmdline_parser_init(&select_conf);
 	ret = parse_select_options(conf.select_options_arg, &params,
-		&admissible_uids, &sfi);
+		&admissible_uids, &fi);
 	if (ret <= 0) /* do not run query if help was given */
 		return ret;
-	return run_select_query(admissible_uids, &sfi);
+	ret = run_select_query(admissible_uids, fi);
+	free_format_info(fi);
+	return ret;
 }