X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=10d55d218071ccf6a314fc87d4e5f78001012db4;hp=d127882a8e02d72219140325460fd73d9e050794;hb=b3c68fd8519a426d6b6285dcb5a865670285e99a;hpb=c1b282afb8e8422d12ae01a77937f27281748f1b

diff --git a/recv.c b/recv.c
index d127882a..10d55d21 100644
--- a/recv.c
+++ b/recv.c
@@ -1,50 +1,52 @@
-/*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file recv.c the stand-alone audio stream receiver */
 
 #include <regex.h>
 #include <sys/types.h>
+#include <lopsub.h>
 
+#include "recv_cmd.lsg.h"
+#include "recv.lsg.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 "version.h"
 
-extern void afh_recv_init(struct receiver *r);
-#undef AFH_RECEIVER
-#define AFH_RECEIVER {.name = "afh", .init = afh_recv_init},
-DEFINE_RECEIVER_ARRAY;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
 
-/** The gengetopt args info struct. */
-static struct recv_args_info conf;
+#define CMD_PTR (lls_cmd(0, recv_suite))
+#define OPT_RESULT(_name, _lpr) \
+	(lls_opt_result(LSG_RECV_PARA_RECV_OPT_ ## _name, lpr))
+#define OPT_GIVEN(_name, _lpr) (lls_opt_given(OPT_RESULT(_name, _lpr)))
+#define OPT_UINT32_VAL(_name, _lpr) (lls_uint32_val(0, OPT_RESULT(_name, _lpr)))
+#define OPT_STRING_VAL(_name, _lpr) (lls_string_val(0, OPT_RESULT(_name, _lpr)))
 
 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)
+static void handle_help_flag(struct lls_parse_result *lpr)
 {
-	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);
+	char *help;
+
+	if (OPT_GIVEN(DETAILED_HELP, lpr))
+		help = lls_long_help(CMD_PTR);
+	else if (OPT_GIVEN(HELP, lpr))
+		help = lls_short_help(CMD_PTR);
+	else
+		return;
+	printf("%s\n", help);
+	free(help);
+	print_receiver_helps(OPT_GIVEN(DETAILED_HELP, lpr));
+	exit(EXIT_SUCCESS);
 }
 
 /**
@@ -60,41 +62,41 @@ __noreturn static void print_help_and_die(void)
  */
 int main(int argc, char *argv[])
 {
-	int ret, r_opened = 0, receiver_num;
-	struct receiver *r = NULL;
+	int ret;
+	const struct receiver *r = NULL;
 	struct receiver_node rn;
 	struct stdout_task sot = {.btrn = NULL};
 	static struct sched s;
 	struct task_info ti;
+	const struct lls_command *cmd;
+	struct lls_parse_result *lpr; /* command line */
+	struct lls_parse_result *receiver_lpr; /* receiver specific options */
+	char *errctx;
 
-	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(&rn, 0, sizeof(struct receiver_node));
-	rn.conf = check_receiver_arg(conf.receiver_arg, &receiver_num);
-	if (!rn.conf) {
-		PARA_EMERG_LOG("invalid receiver specifier\n");
-		ret = -E_RECV_SYNTAX;
+	ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx));
+	if (ret < 0)
 		goto out;
-	}
-	r = &receivers[receiver_num];
+	loglevel = OPT_UINT32_VAL(LOGLEVEL, lpr);
+	version_handle_flag("recv", OPT_GIVEN(VERSION, lpr));
+	handle_help_flag(lpr);
+	memset(&rn, 0, sizeof(struct receiver_node));
+	ret = check_receiver_arg(OPT_STRING_VAL(RECEIVER, lpr), &receiver_lpr);
+	if (ret < 0)
+		goto free_lpr;
+	cmd = lls_cmd(ret, recv_cmd_suite);
+	r = lls_user_data(cmd);
 	rn.receiver = r;
+	rn.lpr = receiver_lpr;
 	rn.btrn = btr_new_node(&(struct btr_node_description)
-		EMBRACE(.name = r->name));
+		EMBRACE(.name = lls_command_name(cmd)));
 	ret = r->open(&rn);
 	if (ret < 0)
-		goto out;
-	r_opened = 1;
-
+		goto remove_btrn;
 	sot.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.parent = rn.btrn, .name = "stdout"));
 	stdout_task_register(&sot, &s);
 
-	ti.name = r->name;
+	ti.name = lls_command_name(cmd);
 	ti.pre_select = r->pre_select;
 	ti.post_select = r->post_select;
 	ti.context = &rn;
@@ -104,15 +106,19 @@ int main(int argc, char *argv[])
 	s.default_timeout.tv_usec = 0;
 	ret = schedule(&s);
 	sched_shutdown(&s);
-out:
-	if (r_opened)
-		r->close(&rn);
-	btr_remove_node(&rn.btrn);
+	r->close(&rn);
 	btr_remove_node(&sot.btrn);
-	if (rn.conf)
-		r->free_config(rn.conf);
-
-	if (ret < 0)
+remove_btrn:
+	btr_remove_node(&rn.btrn);
+	lls_free_parse_result(receiver_lpr, cmd);
+free_lpr:
+	lls_free_parse_result(lpr, CMD_PTR);
+out:
+	if (ret < 0) {
+		if (errctx)
+			PARA_ERROR_LOG("%s\n", errctx);
+		free(errctx);
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	}
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }