X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=9378e4695b6b113843d7d1b34a96ded4bdebd79e;hp=07b78aed59e5d2a04c400003d2136cd2e956a1c4;hb=3ea5399aeec092dcdb9f039288f1e146aadbb2f7;hpb=9c00a79ed817c854ed10ee6bd1b908df8dc13a2f

diff --git a/filter.c b/filter.c
index 07b78aed..9378e469 100644
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,6 +24,12 @@
 /** The list of all status items used by para_{server,audiod,gui}. */
 const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 
+/**
+ * Dummy version which only contains NULL pointers.
+ *
+ * This is used by the amp filter which first tries to obtain the amplification
+ * value from an element in this array.
+ */
 char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
 
 /** Initialize the array of errors for para_filter. */
@@ -47,30 +53,22 @@ INIT_STDERR_LOGGING(loglevel);
 
 __noreturn static void print_help_and_die(void)
 {
-	int d = conf.detailed_help_given;
-	const char **p = d? filter_args_info_detailed_help
-		: filter_args_info_help;
-
-	printf_or_die("%s\n\n", FILTER_CMDLINE_PARSER_PACKAGE "-"
-		FILTER_CMDLINE_PARSER_VERSION);
-	printf_or_die("%s\n\n", filter_args_info_usage);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
-	print_filter_helps(d);
-	exit(0);
+	struct ggo_help h = DEFINE_GGO_HELP(filter);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	print_filter_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
+	exit(EXIT_SUCCESS);
 }
 
-static int parse_config(int argc, char *argv[])
+static int parse_config(void)
 {
 	static char *cf; /* config file */
 	struct stat statbuf;
 
-	if (filter_cmdline_parser(argc, argv, &conf))
-		return -E_FILTER_SYNTAX;
-	HANDLE_VERSION_FLAG("filter", conf);
+	version_handle_flag("filter", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (!cf) {
 		char *home = para_homedir();
 		cf = make_message("%s/.paraslash/filter.conf", home);
@@ -84,8 +82,8 @@ static int parse_config(int argc, char *argv[])
 			.check_ambiguity = 0,
 			.print_errors = 1
 		};
-		if (filter_cmdline_parser_config_file(cf, &conf, &params))
-			return -E_FILTER_SYNTAX;
+		filter_cmdline_parser_config_file(cf, &conf, &params);
+		loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	}
 	if (!conf.filter_given)
 		return -E_NO_FILTERS;
@@ -108,23 +106,25 @@ int main(int argc, char *argv[])
 {
 	static struct sched s;
 	int i, ret;
-	struct filter *f;
+	const struct filter *f;
 	struct btr_node *parent;
 	struct filter_node **fns;
 
+	filter_cmdline_parser(argc, argv, &conf); /* aborts on errors */
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	filter_init();
-	ret = parse_config(argc, argv);
+	ret = parse_config();
 	if (ret < 0)
 		goto out;
 	sit->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdin"));
-	stdin_set_defaults(sit);
-	register_task(&s, &sit->task);
+	stdin_task_register(sit, &s);
 
 	fns = para_malloc(conf.filter_given * sizeof(*fns));
 	for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) {
 		char *fa = conf.filter_arg[i];
 		struct filter_node *fn;
+		struct task_info ti;
 
 		fn = fns[i] = para_calloc(sizeof(*fn));
 		ret = check_filter_arg(fa, &fn->conf);
@@ -133,38 +133,33 @@ int main(int argc, char *argv[])
 			goto out_cleanup;
 		}
 		fn->filter_num = ret;
-		f = filters + fn->filter_num;
-		sprintf(fn->task.status, "%s", f->name);
+		f = filter_get(fn->filter_num);
 		PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);
 		fn->btrn = btr_new_node(&(struct btr_node_description)
 			EMBRACE(.name = f->name, .parent = parent,
 			.handler = f->execute, .context = fn));
-		fn->task.pre_select = f->pre_select;
-		if (f->new_post_select) {
-			fn->task.new_post_select = f->new_post_select;
-			fn->task.post_select = NULL;
-		} else {
-			fn->task.new_post_select = NULL;
-			fn->task.post_select = f->post_select;
-		}
+		ti.name = f->name;
+		ti.pre_select = f->pre_select;
+		ti.post_select = f->post_select;
+		ti.context = fn;
 		f->open(fn);
-		register_task(&s, &fn->task);
+		fn->task = task_register(&ti, &s);
 		parent = fn->btrn;
 	}
 	sot->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdout", .parent = parent));
-	stdout_set_defaults(sot);
-	register_task(&s, &sot->task);
+	stdout_task_register(sot, &s);
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	btr_log_tree(sit->btrn, LL_INFO);
 	ret = schedule(&s);
+	sched_shutdown(&s);
 out_cleanup:
 	for (i--; i >= 0; i--) {
 		struct filter_node *fn = fns[i];
 
-		f = filters + fn->filter_num;
+		f = filter_get(fn->filter_num);
 		if (f->close)
 			f->close(fn);
 		btr_remove_node(&fn->btrn);