Remove an overambitious sanity check in the fecdec filter.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 0fe46411df8348cb92b65d2f22902f36f03d133f..4f595e39aae21cbef207fc1418c5973d0fbd68a1 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -12,47 +12,49 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "para.h"
 #include "list.h"
 #include "sched.h"

+#include "ggo.h"

 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"
 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"

+#include "string.h"

 #include "error.h"
 #include "stdout.h"
 
 /** the gengetopt args info struct */
 struct recv_args_info conf;
 
 #include "error.h"
 #include "stdout.h"
 
 /** the gengetopt args info struct */
 struct recv_args_info conf;
 

-/** always log to stderr */
-INIT_STDERR_LOGGING(conf.loglevel_arg);
+static int loglevel;
+/** Always log to stderr. */
+INIT_STDERR_LOGGING(loglevel);

 
 /** init array of error codes used by para_recv */
 INIT_RECV_ERRLISTS;
 
 
 /** init array of error codes used by para_recv */
 INIT_RECV_ERRLISTS;
 

-static void *parse_config(int argc, char *argv[], int *receiver_num)
+__noreturn static void print_help_and_die(void)

 {
 {

-       int i;
+       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);
+}

 
 

+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 (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);
-       }
+       if (conf.help_given || conf.detailed_help_given)
+               print_help_and_die();

        return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
        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->eof = 1;
-       unregister_task(t);
-}
-

 /**
  * the main function of para_recv
  *
 /**
  * the main function of para_recv
  *


@@ -70,20 +72,21 @@ int main(int argc, char *argv[])
        struct receiver *r = NULL;
        struct receiver_node rn;
        struct stdout_task sot;
        struct receiver *r = NULL;
        struct receiver_node rn;
        struct stdout_task sot;

-       struct sched s;
+       static struct sched s;

 
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
 
 
        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));
        memset(&rn, 0, sizeof(struct receiver_node));

-       for (ret = 0; receivers[ret].name; ret++)
-               receivers[ret].init(&receivers[ret]);
+       recv_init();

        ret = -E_RECV_SYNTAX;
        rn.conf = parse_config(argc, argv, &receiver_num);
        if (!rn.conf) {
        ret = -E_RECV_SYNTAX;
        rn.conf = parse_config(argc, argv, &receiver_num);
        if (!rn.conf) {

-               PARA_EMERG_LOG("%s", "parse failed\n");
+               PARA_EMERG_LOG("parse failed\n");

                goto out;
        }
                goto out;
        }

+       loglevel = get_loglevel_by_name(conf.loglevel_arg);

        r = &receivers[receiver_num];
        rn.receiver = r;
        ret = r->open(&rn);
        r = &receivers[receiver_num];
        rn.receiver = r;
        ret = r->open(&rn);


@@ -94,13 +97,11 @@ int main(int argc, char *argv[])
        stdout_set_defaults(&sot);
        sot.buf = rn.buf;
        sot.loaded = &rn.loaded;
        stdout_set_defaults(&sot);
        sot.buf = rn.buf;
        sot.loaded = &rn.loaded;

-       sot.input_eof = &rn.eof;
+       sot.input_error = &rn.task.error;

        register_task(&sot.task);
 
        register_task(&sot.task);
 

-       rn.task.private_data = &rn;

        rn.task.pre_select = r->pre_select;
        rn.task.post_select = r->post_select;
        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);
 
        sprintf(rn.task.status, "receiver node");
        register_task(&rn.task);
 


@@ -111,6 +112,6 @@ out:
        if (r)
                r->shutdown();
        if (ret < 0)
        if (r)
                r->shutdown();
        if (ret < 0)

-               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;
 }