X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=3b68857328b230877e2f8cd9061fb07ee789902c;hp=8ef9ac1afa2db2860d12eec33c68f18581fbeb11;hb=aa74a903545250506fd4c29791e6f4aef3a01c41;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953

diff --git a/filter.c b/filter.c
index 8ef9ac1a..3b688573 100644
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -47,30 +47,22 @@ INIT_STDERR_LOGGING(loglevel);
 
 __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);
+	struct ggo_help h = DEFINE_GGO_HELP(filter);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	print_filter_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
 	exit(0);
 }
 
-static int parse_config(int argc, char *argv[])
+static int parse_config(void)
 {
 	static char *cf; /* config file */
 	struct stat statbuf;
 
-	if (filter_cmdline_parser(argc, argv, &conf))
-		return -E_FILTER_SYNTAX;
-	HANDLE_VERSION_FLAG("filter", conf);
+	version_handle_flag("filter", conf.version_given);
 	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);
@@ -84,8 +76,8 @@ static int parse_config(int argc, char *argv[])
 			.check_ambiguity = 0,
 			.print_errors = 1
 		};
-		if (filter_cmdline_parser_config_file(cf, &conf, &params))
-			return -E_FILTER_SYNTAX;
+		filter_cmdline_parser_config_file(cf, &conf, &params);
+		loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	}
 	if (!conf.filter_given)
 		return -E_NO_FILTERS;
@@ -112,8 +104,10 @@ int main(int argc, char *argv[])
 	struct btr_node *parent;
 	struct filter_node **fns;
 
+	filter_cmdline_parser(argc, argv, &conf); /* aborts on errors */
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	filter_init();
-	ret = parse_config(argc, argv);
+	ret = parse_config();
 	if (ret < 0)
 		goto out;
 	sit->btrn = btr_new_node(&(struct btr_node_description)
@@ -161,13 +155,14 @@ out_cleanup:
 		f = filters + fn->filter_num;
 		if (f->close)
 			f->close(fn);
-		btr_free_node(fn->btrn);
-		free(fn->conf);
+		btr_remove_node(&fn->btrn);
+		if (f->free_config)
+			f->free_config(fn->conf);
 		free(fn);
 	}
 	free(fns);
-	btr_free_node(sit->btrn);
-	btr_free_node(sot->btrn);
+	btr_remove_node(&sit->btrn);
+	btr_remove_node(&sot->btrn);
 out:
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));