X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=recv.c;h=f28809da6c2b8c5b03f975e940cbe61cbdd4b27c;hb=985ba0546ab18eadf73d0a2686029a3ac876c846;hp=a3fdd30d013287322ced72df98e85d9b34d53b0b;hpb=06b3e7bc1b04def7488a5c5cd65de00aca655612;p=paraslash.git

diff --git a/recv.c b/recv.c
index a3fdd30d..f28809da 100644
--- a/recv.c
+++ b/recv.c
@@ -39,15 +39,11 @@ INIT_RECV_ERRLISTS;
 
 __noreturn static void print_help_and_die(void)
 {
-	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", version_single_line("recv"));
-	printf_or_die("%s\n\n", recv_args_info_usage);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
-	print_receiver_helps(d);
+	struct ggo_help h = DEFINE_GGO_HELP(recv);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	print_receiver_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
 	exit(0);
 }
 
@@ -67,7 +63,7 @@ int main(int argc, char *argv[])
 	int ret, r_opened = 0, receiver_num;
 	struct receiver *r = NULL;
 	struct receiver_node rn;
-	struct stdout_task sot;
+	struct stdout_task sot = {.btrn = NULL};
 	static struct sched s;
 
 	recv_cmdline_parser(argc, argv, &conf);
@@ -93,7 +89,6 @@ int main(int argc, char *argv[])
 		goto out;
 	r_opened = 1;
 
-	memset(&sot, 0, sizeof(struct stdout_task));
 	sot.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.parent = rn.btrn, .name = "stdout"));
 	stdout_set_defaults(&sot);