X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=0ffb723e218793a2ac69f4d905b643adb04667c3;hp=09b644151a3cf4b8f081bf42743224b28a6829dd;hb=6442f07bb08eb6e557086587f997b1785ea18ef7;hpb=122af971c336b33df2e7233d3cea3287bbdae712

diff --git a/filter.c b/filter.c
index 09b64415..0ffb723e 100644
--- a/filter.c
+++ b/filter.c
@@ -11,6 +11,7 @@
 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
 #include "string.h"
 #include "stdin.h"
@@ -94,15 +95,44 @@ err:
 	return ret;
 }
 
+__noreturn static void print_help_and_die(void)
+{
+	int i, 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);
+
+	printf_or_die("\nAvailable filters: \n\t");
+	FOR_EACH_SUPPORTED_FILTER(i)
+		printf_or_die("%s%s", i? " " : "", filters[i].name);
+	printf_or_die("\n\n");
+
+	FOR_EACH_SUPPORTED_FILTER(i) {
+		struct filter *f = filters + i;
+
+		if (!f->help.short_help)
+			continue;
+		printf_or_die("Options for %s:\n", f->name);
+		ggo_print_help(&f->help, 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();
 	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;
 }
 
 /**
@@ -156,6 +178,7 @@ int main(int argc, char *argv[])
 	ret = init_filter_chain();
 	if (ret < 0)
 		goto out;
+	sit->output_error = &fc->task.error;
 
 	stdout_set_defaults(sot);
 	sot->buf = fc->outbuf;