X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=50b17ad7f41293fd63068303bba5c1bef5e33605;hp=bab827d326c31d47063a8bf04e2083d18c966c52;hb=a94c0ad6767bf620e085a6c3c9bc3a5d16278801;hpb=4524d2408d085cca4af1a783f52174128e45b16c

diff --git a/filter.c b/filter.c
index bab827d3..50b17ad7 100644
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -11,12 +11,16 @@
 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
 #include "string.h"
 #include "stdin.h"
 #include "stdout.h"
 #include "error.h"
 
+/** The list of all status items used by para_{server,audiod,gui}. */
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
+
 char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
 
 /** Initialize the array of errors for para_filter. */
@@ -91,15 +95,31 @@ err:
 	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();
 	if (!cf) {
 		char *home = para_homedir();
 		cf = make_message("%s/.paraslash/filter.conf", home);
@@ -115,15 +135,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;
 }
 
 /**
@@ -153,6 +165,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;