/*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 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 <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"
/** 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. */
/** Gengetopt struct that holds the command line args. */
static struct filter_args_info conf;
-INIT_STDERR_LOGGING(conf.loglevel_arg);
+static int loglevel;
+INIT_STDERR_LOGGING(loglevel);
-static void open_filters(void)
+__noreturn static void print_help_and_die(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->outbuf = fn->buf;
- fc->out_loaded = &fn->loaded;
- }
-}
-
-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_malloc(fc->num_filters * sizeof(struct filter_node));
- fc->inbuf = 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(fc->filter_nodes);
- return ret;
+ int d = conf.detailed_help_given;
+ const char **p = d? filter_args_info_detailed_help
+ : filter_args_info_help;
+
+ printf_or_die("%s\n\n", FILTER_CMDLINE_PARSER_PACKAGE "-"
+ FILTER_CMDLINE_PARSER_VERSION);
+ printf_or_die("%s\n\n", filter_args_info_usage);
+ for (; *p; p++)
+ printf_or_die("%s\n", *p);
+ print_filter_helps(d);
+ exit(0);
}
static int parse_config(int argc, char *argv[])
{
static char *cf; /* config file */
struct stat statbuf;
- int i;
if (filter_cmdline_parser(argc, argv, &conf))
return -E_FILTER_SYNTAX;
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);
.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.list_filters_given)
- return 1;
- printf("available filters: ");
- FOR_EACH_SUPPORTED_FILTER(i)
- printf("%s%s%s", i? " " : "", filters[i].name,
- filters[i].parse_config? "*": "");
- printf("\nFilters marked with \"*\" have further command line options. Try\n"
- "\tpara_filter -f '<filtername> -h'\nfor more information.\n");
- exit(EXIT_SUCCESS);
+ if (!conf.filter_given)
+ return -E_NO_FILTERS;
+ return 1;
}
/**
*/
int main(int argc, char *argv[])
{
- int ret;
static struct sched s;
+ int i, ret;
+ struct filter *f;
+ struct btr_node *parent;
+ struct filter_node **fns;
- 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;
- 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(&sit->task);
- stdout_set_defaults(sot);
- sot->buf = fc->outbuf;
- sot->loaded = fc->out_loaded;
- sot->input_error = &fc->task.error;
+ 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;
- register_task(&sit->task);
- register_task(&fc->task);
+ 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(&fn->task);
+ parent = fn->btrn;
+ }
+ sot->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "stdout", .parent = parent));
+ stdout_set_defaults(sot);
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);
- 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