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

diff --git a/recv.c b/recv.c
index a3fdd30d..9de3033f 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -22,6 +22,9 @@
 #include "stdout.h"
 #include "version.h"
 
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
+
 extern void afh_recv_init(struct receiver *r);
 #undef AFH_RECEIVER
 #define AFH_RECEIVER {.name = "afh", .init = afh_recv_init},
@@ -34,20 +37,13 @@ static int loglevel;
 /** Always log to stderr. */
 INIT_STDERR_LOGGING(loglevel);
 
-/** init array of error codes used by para_recv */
-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,8 +63,9 @@ 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;
+	struct task_info ti;
 
 	recv_cmdline_parser(argc, argv, &conf);
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
@@ -93,20 +90,20 @@ 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);
-	register_task(&s, &sot.task);
+	stdout_task_register(&sot, &s);
 
-	rn.task.pre_select = r->pre_select;
-	rn.task.post_select = r->post_select;
-	sprintf(rn.task.status, "%s", r->name);
-	register_task(&s, &rn.task);
+	ti.name = r->name;
+	ti.pre_select = r->pre_select;
+	ti.post_select = r->post_select;
+	ti.context = &rn;
+	rn.task = task_register(&ti, &s);
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	ret = schedule(&s);
+	sched_shutdown(&s);
 out:
 	if (r_opened)
 		r->close(&rn);