X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=7b46d78cac4602b1032508818c710fbcd2b0cc98;hp=ae8a1f663b725cbed40f763e0105fd04d2d4dcc9;hb=da13797a119f8ce621a67145ca1c7acb8d338a3c;hpb=65a0002eb560b7248cbb0b4f143d00053b66bccc diff --git a/recv.c b/recv.c index ae8a1f66..7b46d78c 100644 --- a/recv.c +++ b/recv.c @@ -1,63 +1,52 @@ -/* - * Copyright (C) 2005-2011 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file recv.c the stand-alone audio stream receiver */ #include #include -#include -#include +#include +#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 "buffer_tree.h" #include "version.h" -/** The gengetopt args info struct. */ -static struct recv_args_info conf; +/** Array of error strings. */ +DEFINE_PARA_ERRLIST; + +#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) { - int d = conf.detailed_help_given; - const char **p = d? recv_args_info_detailed_help - : recv_args_info_help; + char *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); -} - -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); + 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); } /** @@ -73,52 +62,64 @@ static void *parse_config(int argc, char *argv[], int *receiver_num) */ 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; + 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; - s.default_timeout.tv_sec = 1; - s.default_timeout.tv_usec = 0; - - 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); - if (!rn.conf) { - PARA_EMERG_LOG("parse failed\n"); + 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); + recv_init(); + 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_set_defaults(&sot); - register_task(&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(&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); +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 (r_opened) - r->close(&rn); - btr_free_node(rn.btrn); - btr_free_node(sot.btrn); - if (rn.conf) - r->free_config(rn.conf); - if (ret < 0) + 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; }