Merge commit 'fml/master' into next
[paraslash.git] / recv_common.c
index 953e2a1..a568939 100644 (file)
@@ -6,8 +6,9 @@
 
 /** \file recv_common.c common functions of para_recv and para_audiod */
 
-#include "para.h"
+#include <regex.h>
 
+#include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
@@ -35,16 +36,17 @@ static void *parse_receiver_args(int receiver_num, char *options)
        void *conf;
 
 
-//     PARA_DEBUG_LOG("%s, options: %s\n", r->name,
-//             options? options : "(none)");
+       PARA_DEBUG_LOG("%s, options: %s\n", r->name,
+               options? options : "(none)");
        if (options) {
                PARA_DEBUG_LOG("options: %s\n", options);
-               argc = split_args(options, &argv, " \t");
+               argc = create_argv(options, " \t", &argv);
+               if (argc < 0)
+                       return NULL;
                for (i = argc - 1; i >= 0; i--)
                        argv[i + 1] = argv[i];
-               argv[0] = para_strdup(r->name);
-               argc += 1;
-               PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
+               argv[0] = NULL;
+               argc++;
        } else {
                argc = 1;
                argv = para_malloc(2 * sizeof(char*));
@@ -52,7 +54,8 @@ static void *parse_receiver_args(int receiver_num, char *options)
                argv[1] = NULL;
        }
        conf = r->parse_config(argc, argv);
-       free(argv[0]);
+       for (i = 1; i < argc; i++)
+               free(argv[i]);
        free(argv);
        return conf;
 }