X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=7dbc07851b00c78de96b4889663286f468611398;hp=96880b7d31922221b9eb90e25a52a258a60d3245;hb=6b2414cd3ea3437ffb39d25ddc60eeecf3194ebc;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

diff --git a/filter.c b/filter.c
index 96880b7d..7dbc0785 100644
--- a/filter.c
+++ b/filter.c
@@ -6,8 +6,9 @@
 
 /** \file filter.c The stand-alone filter program. */
 
-#include "para.h"
+#include <regex.h>
 
+#include "para.h"
 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
@@ -56,11 +57,20 @@ static void open_filters(void)
 		struct filter *f = filters + fn->filter_num;
 		f->open(fn);
 		PARA_INFO_LOG("opened %s filter\n", f->name);
-		fc->outbuf = fn->buf;
+		fc->outbufp = &fn->buf;
 		fc->out_loaded = &fn->loaded;
 	}
 }
 
+static void free_filter_confs(void)
+{
+	int i;
+	struct filter_node *fn;
+
+	FOR_EACH_FILTER_NODE(fn, fc, i)
+		free(fn->conf);
+}
+
 static int init_filter_chain(void)
 {
 	int i, ret;
@@ -69,13 +79,13 @@ static int init_filter_chain(void)
 	if (!conf.filter_given)
 		return -E_NO_FILTERS;
 	fc->num_filters = conf.filter_given;
-	fc->filter_nodes = para_malloc(fc->num_filters * sizeof(struct filter_node));
-	fc->inbuf = sit->buf;
+	fc->filter_nodes = para_calloc(fc->num_filters * sizeof(struct filter_node));
+	fc->inbufp = &sit->buf;
 	fc->in_loaded = &sit->loaded;
 	fc->input_error = &sit->task.error;
 	fc->task.error = 0;
 	fc->output_error = &sot->task.error;
-	fc->task.pre_select = filter_pre_select;
+	fc->task.post_select = filter_post_select;
 	sprintf(fc->task.status, "filter chain");
 
 	FOR_EACH_FILTER_NODE(fn, fc, i) {
@@ -92,6 +102,7 @@ static int init_filter_chain(void)
 	open_filters();
 	return 1;
 err:
+	free_filter_confs();
 	free(fc->filter_nodes);
 	return ret;
 }
@@ -121,6 +132,7 @@ static int parse_config(int argc, char *argv[])
 	HANDLE_VERSION_FLAG("filter", conf);
 	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);
@@ -131,7 +143,8 @@ static int parse_config(int argc, char *argv[])
 			.override = 0,
 			.initialize = 0,
 			.check_required = 0,
-			.check_ambiguity = 0
+			.check_ambiguity = 0,
+			.print_errors = 1
 		};
 		if (filter_cmdline_parser_config_file(cf, &conf, &params))
 			return -E_FILTER_SYNTAX;
@@ -159,27 +172,27 @@ int main(int argc, char *argv[])
 	stdin_set_defaults(sit);
 	sit->buf = para_malloc(sit->bufsize),
 
-	filter_init(filters);
+	filter_init();
 	ret = parse_config(argc, argv);
 	if (ret < 0)
 		goto out;
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	ret = init_filter_chain();
 	if (ret < 0)
 		goto out;
 	sit->output_error = &fc->task.error;
 
 	stdout_set_defaults(sot);
-	sot->buf = fc->outbuf;
+	sot->bufp = fc->outbufp;
 	sot->loaded = fc->out_loaded;
 	sot->input_error = &fc->task.error;
 
 	register_task(&sit->task);
-	register_task(&fc->task);
 	register_task(&sot->task);
+	register_task(&fc->task);
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	ret = schedule(&s);
+	free_filter_confs();
 	close_filters(fc);
 out:
 	free(sit->buf);