/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \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"
#include "ggo.h"
+#include "buffer_tree.h"
#include "filter.h"
#include "string.h"
#include "stdin.h"
#include "stdout.h"
#include "error.h"
+#include "version.h"
/** The list of all status items used by para_{server,audiod,gui}. */
const char *status_item_list[] = {STATUS_ITEM_ARRAY};
/** pointer to the stdin task. */
static struct stdin_task *sit = &stdin_task_struct;
-/** The task that filters the data. */
-static struct filter_chain filter_chain_struct;
-/** Pointer to the filter chain. */
-static struct filter_chain *fc = &filter_chain_struct;
-
/** The task that writes converted data to stdout. */
static struct stdout_task stdout_task_struct;
/** Pointer to the stdout task. */
static int loglevel;
INIT_STDERR_LOGGING(loglevel);
-static void open_filters(void)
-{
- int i;
- struct filter_node *fn;
-
- FOR_EACH_FILTER_NODE(fn, fc, i) {
- struct filter *f = filters + fn->filter_num;
- f->open(fn);
- PARA_INFO_LOG("opened %s filter\n", f->name);
- 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;
- struct filter_node *fn;
-
- if (!conf.filter_given)
- return -E_NO_FILTERS;
- fc->num_filters = conf.filter_given;
- 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;
- sprintf(fc->task.status, "filter chain");
-
- FOR_EACH_FILTER_NODE(fn, fc, i) {
- char *fa = conf.filter_arg[i];
- fn = fc->filter_nodes + i;
- ret = check_filter_arg(fa, &fn->conf);
- if (ret < 0)
- goto err;
- fn->filter_num = ret;
- fn->fc = fc;
- INIT_LIST_HEAD(&fn->callbacks);
- PARA_DEBUG_LOG("filter #%d: %s\n", i, filters[fn->filter_num].name);
- }
- open_filters();
- return 1;
-err:
- free_filter_confs();
- free(fc->filter_nodes);
- return ret;
-}
-
__noreturn static void print_help_and_die(void)
{
int d = conf.detailed_help_given;
.override = 0,
.initialize = 0,
.check_required = 0,
- .check_ambiguity = 0
+ .check_ambiguity = 0,
+ .print_errors = 1
};
if (filter_cmdline_parser_config_file(cf, &conf, ¶ms))
return -E_FILTER_SYNTAX;
}
+ if (!conf.filter_given)
+ return -E_NO_FILTERS;
return 1;
}
*/
int main(int argc, char *argv[])
{
- int ret;
static struct sched s;
-
- stdin_set_defaults(sit);
- sit->buf = para_malloc(sit->bufsize),
+ int i, ret;
+ struct filter *f;
+ struct btr_node *parent;
+ struct filter_node **fns;
filter_init();
ret = parse_config(argc, argv);
if (ret < 0)
goto out;
- ret = init_filter_chain();
- if (ret < 0)
- goto out;
- sit->output_error = &fc->task.error;
+ sit->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "stdin"));
+ stdin_set_defaults(sit);
+ register_task(&s, &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;
+
+ fn = fns[i] = para_calloc(sizeof(*fn));
+ ret = check_filter_arg(fa, &fn->conf);
+ if (ret < 0) {
+ free(fn);
+ goto out_cleanup;
+ }
+ fn->filter_num = ret;
+ f = filters + fn->filter_num;
+ sprintf(fn->task.status, "%s", f->name);
+ 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;
+ fn->task.post_select = f->post_select;
+ f->open(fn);
+ register_task(&s, &fn->task);
+ parent = fn->btrn;
+ }
+ sot->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "stdout", .parent = parent));
stdout_set_defaults(sot);
- sot->bufp = fc->outbufp;
- sot->loaded = fc->out_loaded;
- sot->input_error = &fc->task.error;
+ register_task(&s, &sot->task);
- register_task(&sit->task);
- register_task(&fc->task);
- register_task(&sot->task);
s.default_timeout.tv_sec = 1;
s.default_timeout.tv_usec = 0;
+ btr_log_tree(sit->btrn, LL_INFO);
ret = schedule(&s);
- free_filter_confs();
- close_filters(fc);
+out_cleanup:
+ for (i--; i >= 0; i--) {
+ struct filter_node *fn = fns[i];
+
+ f = filters + fn->filter_num;
+ if (f->close)
+ 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);
out:
- free(sit->buf);
if (ret < 0)
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
- return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
+ exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
}
projects / paraslash.git / blobdiff