buffer tree: Fix btr_splice_out_node().

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index 99b12217b8cc1e701c428928478a03a00ccd0c74..45f4bff099873be853cd2bf1f38d7327b9496822 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -7,12 +7,14 @@
 /** \file filter.c The stand-alone filter program. */
 
 #include <regex.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
 #include "stdin.h"
@@ -62,6 +64,15 @@ static void open_filters(void)
        }
 }
 
+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;
@@ -70,13 +81,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->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) {
@@ -93,6 +104,7 @@ static int init_filter_chain(void)
        open_filters();
        return 1;
 err:
+       free_filter_confs();
        free(fc->filter_nodes);
        return ret;
 }
@@ -133,7 +145,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;
@@ -141,6 +154,44 @@ static int parse_config(int argc, char *argv[])
        return 1;
 }
 
+/* TODO: support more than one filter, actually parse options */
+static int __noreturn main_btr(int argc, char *argv[])
+{
+       static struct sched s;
+       struct filter_node *fn = para_calloc(sizeof(*fn));
+       int ret;
+       struct filter *f;
+
+       sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
+       stdin_set_defaults(sit);
+       register_task(&sit->task);
+
+       ret = check_filter_arg("mp3dec ", &fn->conf);
+       if (ret < 0)
+               goto err;
+       fn->filter_num = ret;
+       f = filters + fn->filter_num;
+       fn->btrn = btr_new_node(f->name, sit->btrn, f->execute, fn);
+       fn->task.pre_select = f->pre_select;
+       fn->task.post_select = f->post_select;
+       sprintf(fn->task.status, "mp3dec");
+       f->open(fn);
+       register_task(&fn->task);
+
+       sot->btrn = btr_new_node("stdout", fn->btrn, NULL, NULL);
+       stdout_set_defaults(sot);
+       register_task(&sot->task);
+
+       s.default_timeout.tv_sec = 1;
+       s.default_timeout.tv_usec = 0;
+       ret = schedule(&s);
+err:
+       free(fn);
+       if (ret < 0)
+               PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+       exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
 /**
  * The main function of para_filter.
  *
@@ -158,13 +209,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(argc, argv);
+               goto out;
+       }
+       stdin_set_defaults(sit);
+       sit->buf = para_malloc(sit->bufsize),
+
        ret = init_filter_chain();
        if (ret < 0)
                goto out;
@@ -176,11 +231,12 @@ 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);
+       free_filter_confs();
        close_filters(fc);
 out:
        free(sit->buf);