Improve help/man page of para_recv.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 0dca8eadd7241588e145135fc3b1b0f205b56b5f..1df476f79c2e4c2dce5c0a78d57c8c972b4ae3af 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -12,6 +12,7 @@
 #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"


@@ -27,30 +28,42 @@ INIT_STDERR_LOGGING(conf.loglevel_arg);
 /** 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;
+       printf("dsfsfsd\n");
+       int i, d = conf.detailed_help_given;
+       const char **p = d? recv_args_info_detailed_help
+               : recv_args_info_help;

 
 

-       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);
+       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);
+
+       printf_or_die("\nAvailable receivers: \n\t");
+       FOR_EACH_RECEIVER(i)
+               printf_or_die("%s%s", i? " " : "", receivers[i].name);
+       printf_or_die("\n\n");
+       FOR_EACH_RECEIVER(i) {
+               struct receiver *r = receivers + i;
+
+               if (!r->help.short_help)
+                       continue;
+               printf_or_die("Options for %s:\n", r->name);
+               ggo_print_help(&r->help, d);

        }
        }

-       return check_receiver_arg(conf.receiver_arg, receiver_num);
+       exit(0);

 }
 
 }
 

-static void rn_event_handler(struct task *t)
+static void *parse_config(int argc, char *argv[], int *receiver_num)

 {
 {

-       struct receiver_node *rn = t->private_data;
-       PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-       rn->error = t->ret;
-       unregister_task(t);
+       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();
+       return check_receiver_arg(conf.receiver_arg, receiver_num);

 }
 
 /**
 }
 
 /**


@@ -70,18 +83,19 @@ 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++)
+       FOR_EACH_RECEIVER(ret)

                receivers[ret].init(&receivers[ret]);
        ret = -E_RECV_SYNTAX;
        rn.conf = parse_config(argc, argv, &receiver_num);
        if (!rn.conf) {
                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");
+               PARA_EMERG_LOG("parse failed\n");

                goto out;
        }
        r = &receivers[receiver_num];
                goto out;
        }
        r = &receivers[receiver_num];


@@ -94,13 +108,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_error = &rn.error;
+       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);