X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=8ce66ea878c309d96e98e944f21af02670d9060c;hp=415824adb65f872a1815fb1f3a0af3dbd7efae6f;hb=7df87a748fae6a9f20d337d79ec83978856f0c48;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e

diff --git a/filter_common.c b/filter_common.c
index 415824ad..8ce66ea8 100644
--- a/filter_common.c
+++ b/filter_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -101,35 +101,41 @@ int check_filter_arg(char *fa, void **conf)
 /**
  * Print help text of each filter to stdout.
  *
- * \param detailed If non-zero, print detailed help.
+ * \param flags Passed to \ref ggo_print_help().
  */
-void print_filter_helps(int detailed)
+void print_filter_helps(unsigned flags)
 {
-	int i;
+	int i, num = 0;
 
-	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");
+	printf_or_die("\nAvailable filters: ");
+	FOR_EACH_SUPPORTED_FILTER(i) {
+		if (num > 50) {
+			printf_or_die("\n                  ");
+			num = 0;
+		}
+		num += printf_or_die("%s%s", i? " " : "", filters[i].name);
+	}
+	printf_or_die("\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, detailed);
+		printf_or_die("\nOptions for %s (%s):", f->name,
+			f->help.purpose);
+		ggo_print_help(&f->help, flags);
 	}
 }
 
 /**
- * Set select timeout of the the scheduler.
+ * Set select timeout of the scheduler.
  *
  * \param s The scheduler.
  * \param t The task struct of this filter.
  *
  * This looks at the status of the btr node of the filter. If data is available
- * in the input queue of the filter, or if an error occured, a minimal timeout
+ * in the input queue of the filter, or if an error occurred, a minimal timeout
  * for the next select call is requested from the scheduler. Otherwise the
  * scheduler timeout is left unchanged.
  */