more audiod improvements

[paraslash.git] / recv_common.c

diff --git a/recv_common.c b/recv_common.c
index 3a09e7c0f8611f8666bfadf36f06c989a5e0a990..e39719da37dde6ab5524fc5d81880f0e4edb326b 100644 (file)
--- a/recv_common.c
+++ b/recv_common.c
@@ -20,6 +20,8 @@
 
 #include "para.h"
 
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "string.h"
 
@@ -38,12 +40,13 @@ static void *parse_receiver_args(int receiver_num, char *options)
 //     PARA_DEBUG_LOG("%s, options: %s\n", r->name,
 //             options? options : "(none)");
        if (options) {
-//             PARA_DEBUG_LOG("%s options: %s\n", name, options);
-               argc = split_args(options, &argv, ':');
-//             PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", fn->argc, fn->argv[0]);
-               for (i = argc; i >= 0; i--)
+               PARA_DEBUG_LOG("options: %s\n", options);
+               argc = split_args(options, &argv, " \t");
+               for (i = argc - 1; i >= 0; i--)
                        argv[i + 1] = argv[i];
-               argc += 2;
+               argv[0] = para_strdup(r->name);
+               argc += 1;
+               PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
        } else {
                argc = 1;
                argv = para_malloc(2 * sizeof(char*));
@@ -64,7 +67,7 @@ void *check_receiver_arg(char *ra, int *receiver_num)
 {
        int j;
 
-//     PARA_DEBUG_LOG("checking %s\n", ra);
+       PARA_DEBUG_LOG("checking %s\n", ra);
        for (j = 0; receivers[j].name; j++) {
                const char *name = receivers[j].name;
                size_t len = strlen(name);
@@ -74,13 +77,13 @@ void *check_receiver_arg(char *ra, int *receiver_num)
                if (strncmp(name, ra, len))
                        continue;
                c = ra[len];
-               if (c && c != ':')
+               if (c && c != ' ')
                        continue;
                if (c && !receivers[j].parse_config)
                        return NULL;
                *receiver_num = j;
                return parse_receiver_args(j, c? ra + len + 1: NULL);
        }
-       PARA_ERROR_LOG("%s", "receiver not found:");
+       PARA_ERROR_LOG("%s", "receiver not found\n");
        return NULL;
 }