Move ggo files to a separate directory.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 55e97f1e49ed6248ec415598d95762ee9f3f82fa..2386c1ef58930f140109918764acba5266c33a13 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,6 +12,7 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"
@@ -27,32 +28,31 @@ INIT_STDERR_LOGGING(conf.loglevel_arg);
 /** 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 (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);
 }
 
-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);
-}
-
 /**
  * the main function of para_recv
  *
@@ -70,13 +70,14 @@ int main(int argc, char *argv[])
        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;
 
+       memset(&sot, 0, sizeof(struct stdout_task));
        memset(&rn, 0, sizeof(struct receiver_node));
-       for (ret = 0; receivers[ret].name; ret++)
+       FOR_EACH_RECEIVER(ret)
                receivers[ret].init(&receivers[ret]);
        ret = -E_RECV_SYNTAX;
        rn.conf = parse_config(argc, argv, &receiver_num);
@@ -94,13 +95,11 @@ int main(int argc, char *argv[])
        stdout_set_defaults(&sot);
        sot.buf = rn.buf;
        sot.loaded = &rn.loaded;
-       sot.input_error = &rn.error;
+       sot.input_error = &rn.task.error;
        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.event_handler = rn_event_handler;
        sprintf(rn.task.status, "receiver node");
        register_task(&rn.task);