X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=babd1e306989b18f2702ec14ef0e26e5706e99e5;hp=a37e4d08dc0be08d1c092cfd3156b5b413de9d3b;hb=42ddd68159d7eff0f3e7c225665c97f9abd59425;hpb=83ab4b5d38bb63cf4724022c3804d3eaa2ac51d3

diff --git a/recv.c b/recv.c
index a37e4d08..babd1e30 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -39,28 +39,12 @@ 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);
 }
 
 /**
@@ -82,16 +66,18 @@ int main(int argc, char *argv[])
 	struct stdout_task sot;
 	static struct sched s;
 
-	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];
@@ -103,6 +89,7 @@ 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);
@@ -113,6 +100,8 @@ int main(int argc, char *argv[])
 	sprintf(rn.task.status, "%s", r->name);
 	register_task(&s, &rn.task);
 
+	s.default_timeout.tv_sec = 1;
+	s.default_timeout.tv_usec = 0;
 	ret = schedule(&s);
 out:
 	if (r_opened)