X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=1df476f79c2e4c2dce5c0a78d57c8c972b4ae3af;hp=7ef78a90368c7770c58e7878e60fa78aa819da75;hb=5ba8f6dff01904907d1dcfaa1555c8ceb5a72c90;hpb=e10e01c82d08f58b16ea28508bc86e68528a6aa3

diff --git a/recv.c b/recv.c
index 7ef78a90..1df476f7 100644
--- a/recv.c
+++ b/recv.c
@@ -12,6 +12,7 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"
@@ -27,21 +28,41 @@ INIT_STDERR_LOGGING(conf.loglevel_arg);
 /** init array of error codes used by para_recv */
 INIT_RECV_ERRLISTS;
 
-static void *parse_config(int argc, char *argv[], int *receiver_num)
+__noreturn static void print_help_and_die(void)
 {
-	int i;
+	printf("dsfsfsd\n");
+	int i, d = conf.detailed_help_given;
+	const char **p = d? recv_args_info_detailed_help
+		: recv_args_info_help;
+
+	printf_or_die("%s\n\n", RECV_CMDLINE_PARSER_PACKAGE "-"
+		RECV_CMDLINE_PARSER_VERSION);
+	printf_or_die("%s\n\n", recv_args_info_usage);
+	for (; *p; p++)
+		printf_or_die("%s\n", *p);
+
+	printf_or_die("\nAvailable receivers: \n\t");
+	FOR_EACH_RECEIVER(i)
+		printf_or_die("%s%s", i? " " : "", receivers[i].name);
+	printf_or_die("\n\n");
+	FOR_EACH_RECEIVER(i) {
+		struct receiver *r = receivers + i;
 
+		if (!r->help.short_help)
+			continue;
+		printf_or_die("Options for %s:\n", r->name);
+		ggo_print_help(&r->help, d);
+	}
+	exit(0);
+}
+
+static void *parse_config(int argc, char *argv[], int *receiver_num)
+{
 	if (recv_cmdline_parser(argc, argv, &conf))
 		return NULL;
 	HANDLE_VERSION_FLAG("recv", conf);
-	if (conf.list_receivers_given) {
-		printf("available receivers: ");
-		for (i = 0; receivers[i].name; i++)
-			printf("%s%s", i? " " : "", receivers[i].name);
-		printf("\nTry\n\tpara_recv -r '<receivername> -h'\n"
-			"for help on <receivername>.\n");
-		exit(EXIT_SUCCESS);
-	}
+	if (conf.help_given || conf.detailed_help_given)
+		print_help_and_die();
 	return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
@@ -69,7 +90,7 @@ int main(int argc, char *argv[])
 
 	memset(&sot, 0, sizeof(struct stdout_task));
 	memset(&rn, 0, sizeof(struct receiver_node));
-	for (ret = 0; receivers[ret].name; ret++)
+	FOR_EACH_RECEIVER(ret)
 		receivers[ret].init(&receivers[ret]);
 	ret = -E_RECV_SYNTAX;
 	rn.conf = parse_config(argc, argv, &receiver_num);