X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=2386c1ef58930f140109918764acba5266c33a13;hp=f9e5b9337f2e6775f0605d19e579438439e762d0;hb=9627e8157c8c916555b993d7254b0b638815ebc1;hpb=335730538150250f32c0df0b184fb494e2bb0df3

diff --git a/recv.c b/recv.c
index f9e5b933..2386c1ef 100644
--- a/recv.c
+++ b/recv.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.
  */
@@ -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,28 @@ 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;
+	int 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);
+	print_receiver_helps(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);
 }
 
@@ -62,13 +70,14 @@ int main(int argc, char *argv[])
 	struct receiver *r = NULL;
 	struct receiver_node rn;
 	struct stdout_task sot;
-	struct sched s;
+	static struct sched s;
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 
+	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);