X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=e6c75556b91e5ecc0c3ca1f005f5471056bdfb7a;hp=adfadea7733d01862d1a767504e298f7d601ffa8;hb=badcf6125a8e0b2845348aca46d288f141e4f509;hpb=02000a1a24aa9d4f3e437821dc1f2f6b792bc79a

diff --git a/filter.c b/filter.c
index adfadea7..e6c75556 100644
--- a/filter.c
+++ b/filter.c
@@ -1,16 +1,18 @@
 /*
- * 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 "para.h"
 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
 #include "string.h"
 #include "stdin.h"
@@ -43,7 +45,8 @@ static struct stdout_task *sot = &stdout_task_struct;
 /** 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)
 {
@@ -54,11 +57,20 @@ static void open_filters(void)
 		struct filter *f = filters + fn->filter_num;
 		f->open(fn);
 		PARA_INFO_LOG("opened %s filter\n", f->name);
-		fc->outbuf = fn->buf;
+		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;
@@ -67,8 +79,8 @@ 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->inbuf = sit->buf;
+	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;
@@ -90,19 +102,37 @@ static int init_filter_chain(void)
 	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;
+	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);
@@ -118,15 +148,7 @@ static int parse_config(int argc, char *argv[])
 		if (filter_cmdline_parser_config_file(cf, &conf, &params))
 			return -E_FILTER_SYNTAX;
 	}
-	if (!conf.list_filters_given)
-		return 1;
-	printf("available filters: ");
-	for (i = 0; filters[i].name; 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);
+	return 1;
 }
 
 /**
@@ -149,7 +171,7 @@ int main(int argc, char *argv[])
 	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;
@@ -159,7 +181,7 @@ int main(int argc, char *argv[])
 	sit->output_error = &fc->task.error;
 
 	stdout_set_defaults(sot);
-	sot->buf = fc->outbuf;
+	sot->bufp = fc->outbufp;
 	sot->loaded = fc->out_loaded;
 	sot->input_error = &fc->task.error;
 
@@ -169,6 +191,7 @@ 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);