Convert para_recv to lopsub.

This converts the gengetopt parser for para_recv to lopsub format,
replacing the ggo file by a lopsub suite.

The conversion is rather simple because para_recv does not have
a config file parser and because changes to the build system are
small because we already link para_recv with -llopsub due to the
recv_cmd suite.

diff --git a/Makefile.real b/Makefile.real
index 26a4ae51f5566cd6b160a20f797ad9e8d1889ea6..0ecd3f9ae452805a5ac3a4fb39ee08a4dbf09d38 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -43,7 +43,7 @@ all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
        $(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
        $(write_objs) $(afh_objs) $(play_objs))
 deps := $(addprefix $(dep_dir)/, $(filter-out %.cmdline.d, $(all_objs:.o=.d)))
        $(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
        $(write_objs) $(afh_objs) $(play_objs))
 deps := $(addprefix $(dep_dir)/, $(filter-out %.cmdline.d, $(all_objs:.o=.d)))

-converted_executables := audioc client fade play
+converted_executables := audioc client fade play recv

 unconverted_executables := $(filter-out $(converted_executables), $(executables))
 
 audioc_objs += audioc.lsg.o
 unconverted_executables := $(filter-out $(converted_executables), $(executables))
 
 audioc_objs += audioc.lsg.o


@@ -52,7 +52,7 @@ client_objs += client.lsg.o
 fade_objs += fade.lsg.o
 filter_objs += filter_cmd.lsg.o
 play_objs += $(addsuffix _cmd.lsg.o, recv filter play write) play.lsg.o
 fade_objs += fade.lsg.o
 filter_objs += filter_cmd.lsg.o
 play_objs += $(addsuffix _cmd.lsg.o, recv filter play write) play.lsg.o

-recv_objs += recv_cmd.lsg.o
+recv_objs += recv_cmd.lsg.o recv.lsg.o

 server_objs += server_cmd.lsg.o
 write_objs += write_cmd.lsg.o
 
 server_objs += server_cmd.lsg.o
 write_objs += write_cmd.lsg.o
 

diff --git a/configure.ac b/configure.ac
index 648f2a635bc0e99f50b8c7010ac7106eb62f848d..3d43af026392cfc57d888b724bc5afea2a3a95d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -715,10 +715,6 @@ filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 ########################################################################## recv
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 ########################################################################## recv

-recv_cmdline_objs="
-       recv
-"
-

 recv_errlist_objs="
        http_recv
        recv_common
 recv_errlist_objs="
        http_recv
        recv_common


@@ -748,7 +744,7 @@ NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh"
 if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
        recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 fi
 if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
        recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 fi

-recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
+recv_objs="$recv_errlist_objs"

 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 ########################################################################### afh
 audio_format_handlers="mp3 wma"

diff --git a/m4/gengetopt/recv.m4 b/m4/gengetopt/recv.m4
deleted file mode 100644 (file)
index 9a9a880..0000000
--- a/m4/gengetopt/recv.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-args "--no-handle-help --no-handle-version"
-
-purpose "A command line HTTP/DCCP/UDP stream grabber"
-
-include(header.m4)
-include(loglevel.m4)
-
-<qu>
-option "receiver" r
-"Select receiver"
-string typestr="receiver_spec"
-default="http"
-optional
-details="
-       Any options for the selected receiver must
-       be quoted. Example:
-
-               -r 'http -i www.paraslash.org -p 8009'
-"
-</qu>

diff --git a/m4/lls/recv.suite.m4 b/m4/lls/recv.suite.m4
new file mode 100644 (file)
index 0000000..793a2f5
--- /dev/null
+++ b/m4/lls/recv.suite.m4
@@ -0,0 +1,22 @@
+m4_define(PROGRAM, para_recv)
+[suite recv]
+version-string = GIT_VERSION()
+[supercommand para_recv]
+       purpose = a command line HTTP/DCCP/UDP stream grabber
+       m4_include(common-option-section.m4)
+       m4_include(help.m4)
+       m4_include(detailed-help.m4)
+       m4_include(version.m4)
+       m4_include(loglevel.m4)
+       m4_include(per-command-options-section.m4)
+       [option receiver]
+               short_opt = r
+               summary = select the receiver
+               arg_info = required_arg
+               arg_type = string
+               typestr = receiver_spec
+               [help]
+                       Any options for the selected receiver must be quoted. Example:
+
+                               -r 'http -i www.paraslash.org -p 8009'
+               [/help]

diff --git a/recv.c b/recv.c
index abebbfc2dfd80a0d2373f7c0431395c03656433f..9842c7dc8f168fe5e4cd3daf2ee0d9f3f34df358 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -12,12 +12,12 @@
 #include <lopsub.h>
 
 #include "recv_cmd.lsg.h"
 #include <lopsub.h>
 
 #include "recv_cmd.lsg.h"

+#include "recv.lsg.h"

 #include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "buffer_tree.h"
 #include "recv.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 "fd.h"
 #include "string.h"
 #include "error.h"


@@ -27,21 +27,30 @@
 /** Array of error strings. */
 DEFINE_PARA_ERRLIST;
 
 /** 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);
 
 
 static int loglevel;
 /** Always log to stderr. */
 INIT_STDERR_LOGGING(loglevel);
 

-__noreturn static void print_help_and_die(void)
+static void handle_help_flag(struct lls_parse_result *lpr)

 {
 {

-       bool d = conf.detailed_help_given;
-       if (d)
-               recv_cmdline_parser_print_detailed_help();
+       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
        else

-               recv_cmdline_parser_print_help();
-       print_receiver_helps(d);
+               return;
+       printf("%s\n", help);
+       free(help);
+       print_receiver_helps(OPT_GIVEN(DETAILED_HELP, lpr));

        exit(EXIT_SUCCESS);
 }
 
        exit(EXIT_SUCCESS);
 }
 


@@ -59,26 +68,27 @@ __noreturn static void print_help_and_die(void)
 int main(int argc, char *argv[])
 {
        int ret;
 int main(int argc, char *argv[])
 {
        int ret;

-       bool r_opened = false;

        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;
        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 */
        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);
+       ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx));
+       if (ret < 0)
+               goto out;
+       loglevel = OPT_UINT32_VAL(LOGLEVEL, lpr);
+       version_handle_flag("recv", OPT_GIVEN(VERSION, lpr));
+       handle_help_flag(lpr);

        recv_init();
        recv_init();

-       if (conf.help_given || conf.detailed_help_given)
-               print_help_and_die();
-

        memset(&rn, 0, sizeof(struct receiver_node));
        memset(&rn, 0, sizeof(struct receiver_node));

-       ret = check_receiver_arg(conf.receiver_arg, &receiver_lpr);
+       ret = check_receiver_arg(OPT_STRING_VAL(RECEIVER, lpr), &receiver_lpr);

        if (ret < 0)
        if (ret < 0)

-               goto out;
+               goto free_lpr;

        cmd = lls_cmd(ret, recv_cmd_suite);
        r = lls_user_data(cmd);
        rn.receiver = r;
        cmd = lls_cmd(ret, recv_cmd_suite);
        r = lls_user_data(cmd);
        rn.receiver = r;


@@ -87,9 +97,7 @@ int main(int argc, char *argv[])
                EMBRACE(.name = lls_command_name(cmd)));
        ret = r->open(&rn);
        if (ret < 0)
                EMBRACE(.name = lls_command_name(cmd)));
        ret = r->open(&rn);
        if (ret < 0)

-               goto free_receiver_lpr;
-       r_opened = true;
-
+               goto remove_btrn;

        sot.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.parent = rn.btrn, .name = "stdout"));
        stdout_task_register(&sot, &s);
        sot.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.parent = rn.btrn, .name = "stdout"));
        stdout_task_register(&sot, &s);


@@ -106,16 +114,17 @@ int main(int argc, char *argv[])
        sched_shutdown(&s);
        r->close(&rn);
        btr_remove_node(&sot.btrn);
        sched_shutdown(&s);
        r->close(&rn);
        btr_remove_node(&sot.btrn);

+remove_btrn:

        btr_remove_node(&rn.btrn);
        btr_remove_node(&rn.btrn);

-free_receiver_lpr:

        lls_free_parse_result(receiver_lpr, cmd);
        lls_free_parse_result(receiver_lpr, cmd);

+free_lpr:
+       lls_free_parse_result(lpr, CMD_PTR);

 out:
 out:

-       if (r_opened)
-               r->close(&rn);
-       btr_remove_node(&rn.btrn);
-       btr_remove_node(&sot.btrn);
-
-       if (ret < 0)
+       if (ret < 0) {
+               if (errctx)
+                       PARA_ERROR_LOG("%s\n", errctx);
+               free(errctx);

                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));

+       }

        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }
        return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }