X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=20ea1333b758b4302774a1c075980072d6ebf208;hp=796e445a8ed64149a0475567a8426d296a1d61d3;hb=d1e55304068a6a82553f40ae7bee746f5ca2233d;hpb=271c83d4fd9411be628fa650ce595ac79754d22e

diff --git a/filter.c b/filter.c
index 796e445a..20ea1333 100644
--- a/filter.c
+++ b/filter.c
@@ -7,6 +7,7 @@
 /** \file filter.c The stand-alone filter program. */
 
 #include <regex.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "filter.cmdline.h"
@@ -85,7 +86,7 @@ static int init_filter_chain(void)
 	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) {
@@ -152,6 +153,12 @@ static int parse_config(int argc, char *argv[])
 	return 1;
 }
 
+/* TODO: support more than one filter, actually parse options */
+static int main_btr(void)
+{
+	return 42;
+}
+
 /**
  * The main function of para_filter.
  *
@@ -169,13 +176,17 @@ int main(int argc, char *argv[])
 	int ret;
 	static struct sched s;
 
-	stdin_set_defaults(sit);
-	sit->buf = para_malloc(sit->bufsize),
-
 	filter_init();
 	ret = parse_config(argc, argv);
 	if (ret < 0)
 		goto out;
+	if (conf.buffer_tree_given) {
+		ret = main_btr();
+		goto out;
+	}
+	stdin_set_defaults(sit);
+	sit->buf = para_malloc(sit->bufsize),
+
 	ret = init_filter_chain();
 	if (ret < 0)
 		goto out;
@@ -187,8 +198,8 @@ int main(int argc, char *argv[])
 	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);