X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=9de3033fee92925a4cd1446c8895f59055c82486;hp=9b63f517cd77cccd27db0cd4ddcc1dae99c8e082;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=8aa0f575bcca12ab63ab53141c2144448c457478

diff --git a/recv.c b/recv.c
index 9b63f517..9de3033f 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,21 +8,28 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"
 #include "string.h"
 #include "error.h"
 #include "stdout.h"
-#include "buffer_tree.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},
+DEFINE_RECEIVER_ARRAY;
+
 /** The gengetopt args info struct. */
 static struct recv_args_info conf;
 
@@ -30,33 +37,14 @@ 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", 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);
-}
+	struct ggo_help h = DEFINE_GGO_HELP(recv);
+	bool d = conf.detailed_help_given;
 
-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.help_given || conf.detailed_help_given)
-		print_help_and_die();
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
-	return check_receiver_arg(conf.receiver_arg, receiver_num);
+	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);
 }
 
 /**
@@ -75,19 +63,22 @@ 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;
 
-	s.default_timeout.tv_sec = 1;
-	s.default_timeout.tv_usec = 0;
+	recv_cmdline_parser(argc, argv, &conf);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	version_handle_flag("recv", conf.version_given);
+	recv_init();
+	if (conf.help_given || conf.detailed_help_given)
+		print_help_and_die();
 
-	memset(&sot, 0, sizeof(struct stdout_task));
 	memset(&rn, 0, sizeof(struct receiver_node));
-	recv_init();
-	ret = -E_RECV_SYNTAX;
-	rn.conf = parse_config(argc, argv, &receiver_num);
+	rn.conf = check_receiver_arg(conf.receiver_arg, &receiver_num);
 	if (!rn.conf) {
-		PARA_EMERG_LOG("parse failed\n");
+		PARA_EMERG_LOG("invalid receiver specifier\n");
+		ret = -E_RECV_SYNTAX;
 		goto out;
 	}
 	r = &receivers[receiver_num];
@@ -101,22 +92,26 @@ int main(int argc, char *argv[])
 
 	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);
-	btr_free_node(rn.btrn);
-	btr_free_node(sot.btrn);
+	btr_remove_node(&rn.btrn);
+	btr_remove_node(&sot.btrn);
 	if (rn.conf)
 		r->free_config(rn.conf);
+
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;