X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=599aaad97815b67c68464c094866ce4d1bd6e5a4;hp=88a0bd75dcb2ec3a70cd83854827aca3dce9b8a6;hb=3bb5d9c5f7e30c5b4d2216171ee9aff1389d70ae;hpb=4403d70f8ec547a17fcce25b0ba997e208732248

diff --git a/filter.c b/filter.c
index 88a0bd75..599aaad9 100644
--- a/filter.c
+++ b/filter.c
@@ -154,26 +154,29 @@ static int parse_config(int argc, char *argv[])
 	return 1;
 }
 
-/* TODO: support more than one filter, actually parse options */
+/* TODO: support buffer tree, not just a chain. */
 static int __noreturn main_btr(void)
 {
 	static struct sched s;
 	int i, ret;
 	struct filter *f;
 	struct btr_node *parent;
+	struct filter_node **fns;
 
 	sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
 	stdin_set_defaults(sit);
 	register_task(&sit->task);
 
+	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 = para_calloc(sizeof(*fn));
+		struct filter_node *fn;
 
+		fn = fns[i] = para_calloc(sizeof(*fn));
 		ret = check_filter_arg(fa, &fn->conf);
 		if (ret < 0) {
 			free(fn);
-			goto err;
+			goto out;
 		}
 		fn->filter_num = ret;
 		f = filters + fn->filter_num;
@@ -192,8 +195,21 @@ static int __noreturn main_btr(void)
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
+	btr_log_tree(sit->btrn, LL_INFO);
 	ret = schedule(&s);
-err:
+out:
+	for (i--; i >= 0; i--) {
+		struct filter_node *fn = fns[i];
+
+		f = filters + fn->filter_num;
+		f->close(fn);
+		btr_free_node(fn->btrn);
+		free(fn->conf);
+		free(fn);
+	}
+	free(fns);
+	btr_free_node(sit->btrn);
+	btr_free_node(sot->btrn);
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
@@ -243,7 +259,6 @@ int main(int argc, char *argv[])
 	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);