X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=9d6f028319fc6e1e8f36f7406fc64475fb3576df;hp=0dca8eadd7241588e145135fc3b1b0f205b56b5f;hb=fc8dfbb416ff07cca08fbf4e13efcaa25e17cc54;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde

diff --git a/recv.c b/recv.c
index 0dca8ead..abebbfc2 100644
--- a/recv.c
+++ b/recv.c
@@ -1,60 +1,52 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file recv.c the stand-alone audio stream receiver */
 
+#include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
+#include <inttypes.h>
+#include <lopsub.h>
 
+#include "recv_cmd.lsg.h"
 #include "para.h"
 #include "list.h"
 #include "sched.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"
 
-/** the gengetopt args info struct */
-struct recv_args_info conf;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
 
-/** always log to stderr */
-INIT_STDERR_LOGGING(conf.loglevel_arg);
+/** The gengetopt args info struct. */
+static struct recv_args_info conf;
 
-/** init array of error codes used by para_recv */
-INIT_RECV_ERRLISTS;
+static int loglevel;
+/** Always log to stderr. */
+INIT_STDERR_LOGGING(loglevel);
 
-static void *parse_config(int argc, char *argv[], int *receiver_num)
+__noreturn static void print_help_and_die(void)
 {
-	int i;
-
-	if (recv_cmdline_parser(argc, argv, &conf))
-		return NULL;
-	HANDLE_VERSION_FLAG("recv", conf);
-	if (conf.list_receivers_given) {
-		printf("available receivers: ");
-		for (i = 0; receivers[i].name; i++)
-			printf("%s%s", i? " " : "", receivers[i].name);
-		printf("\nTry\n\tpara_recv -r '<receivername> -h'\n"
-			"for help on <receivername>.\n");
-		exit(EXIT_SUCCESS);
-	}
-	return check_receiver_arg(conf.receiver_arg, receiver_num);
-}
-
-static void rn_event_handler(struct task *t)
-{
-	struct receiver_node *rn = t->private_data;
-	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-	rn->error = t->ret;
-	unregister_task(t);
+	bool d = conf.detailed_help_given;
+	if (d)
+		recv_cmdline_parser_print_detailed_help();
+	else
+		recv_cmdline_parser_print_help();
+	print_receiver_helps(d);
+	exit(EXIT_SUCCESS);
 }
 
 /**
- * the main function of para_recv
+ * The main function of para_recv.
  *
  * \param argc number of arguments
  * \param argv vector of arguments
@@ -66,50 +58,63 @@ static void rn_event_handler(struct task *t)
  */
 int main(int argc, char *argv[])
 {
-	int ret, r_opened = 0, receiver_num;
-	struct receiver *r = NULL;
+	int ret;
+	bool r_opened = false;
+	const struct receiver *r = NULL;
 	struct receiver_node rn;
-	struct stdout_task sot;
-	struct sched s;
+	struct stdout_task sot = {.btrn = NULL};
+	static struct sched s;
+	struct task_info ti;
+	const struct lls_command *cmd;
+	struct lls_parse_result *receiver_lpr; /* receiver specific options */
 
-	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(&rn, 0, sizeof(struct receiver_node));
-	for (ret = 0; receivers[ret].name; ret++)
-		receivers[ret].init(&receivers[ret]);
-	ret = -E_RECV_SYNTAX;
-	rn.conf = parse_config(argc, argv, &receiver_num);
-	if (!rn.conf) {
-		PARA_EMERG_LOG("%s", "parse failed\n");
+	ret = check_receiver_arg(conf.receiver_arg, &receiver_lpr);
+	if (ret < 0)
 		goto out;
-	}
-	r = &receivers[receiver_num];
+	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 = lls_command_name(cmd)));
 	ret = r->open(&rn);
 	if (ret < 0)
-		goto out;
-	r_opened = 1;
+		goto free_receiver_lpr;
+	r_opened = true;
 
-	stdout_set_defaults(&sot);
-	sot.buf = rn.buf;
-	sot.loaded = &rn.loaded;
-	sot.input_error = &rn.error;
-	register_task(&sot.task);
+	sot.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.parent = rn.btrn, .name = "stdout"));
+	stdout_task_register(&sot, &s);
 
-	rn.task.private_data = &rn;
-	rn.task.pre_select = r->pre_select;
-	rn.task.post_select = r->post_select;
-	rn.task.event_handler = rn_event_handler;
-	sprintf(rn.task.status, "receiver node");
-	register_task(&rn.task);
+	ti.name = lls_command_name(cmd);
+	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);
+	r->close(&rn);
+	btr_remove_node(&sot.btrn);
+	btr_remove_node(&rn.btrn);
+free_receiver_lpr:
+	lls_free_parse_result(receiver_lpr, cmd);
 out:
 	if (r_opened)
 		r->close(&rn);
-	if (r)
-		r->shutdown();
+	btr_remove_node(&rn.btrn);
+	btr_remove_node(&sot.btrn);
+
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;