Merge branch 'maint'

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 1df476f79c2e4c2dce5c0a78d57c8c972b4ae3af..9d6f028319fc6e1e8f36f7406fc64475fb3576df 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -1,11 +1,12 @@
 /*
- * 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.
  */
 
 /** \file recv.c the stand-alone audio stream receiver */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -16,22 +17,23 @@
 #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;
+/** The gengetopt args info struct. */
+static 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;
 
 __noreturn static void print_help_and_die(void)
 {
-       printf("dsfsfsd\n");
-       int i, d = conf.detailed_help_given;
+       int d = conf.detailed_help_given;
        const char **p = d? recv_args_info_detailed_help
                : recv_args_info_help;
 
@@ -40,19 +42,7 @@ __noreturn static void print_help_and_die(void)
        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);
-       }
+       print_receiver_helps(d);
        exit(0);
 }
 
@@ -63,6 +53,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
        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);
 }
 
@@ -90,8 +81,7 @@ int main(int argc, char *argv[])
 
        memset(&sot, 0, sizeof(struct stdout_task));
        memset(&rn, 0, sizeof(struct receiver_node));
-       FOR_EACH_RECEIVER(ret)
-               receivers[ret].init(&receivers[ret]);
+       recv_init();
        ret = -E_RECV_SYNTAX;
        rn.conf = parse_config(argc, argv, &receiver_num);
        if (!rn.conf) {
@@ -106,7 +96,7 @@ int main(int argc, char *argv[])
        r_opened = 1;
 
        stdout_set_defaults(&sot);
-       sot.buf = rn.buf;
+       sot.bufp = &rn.buf;
        sot.loaded = &rn.loaded;
        sot.input_error = &rn.task.error;
        register_task(&sot.task);