X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=a5689390987ac9c9b063dad200653e990268824e;hp=953e2a1143ebd28424fb09a978611eaf52bf28d6;hb=5587494468627e20fe622b6055689717262d09ab;hpb=56955f95584f51709320262f7d2e0ea79301d346 diff --git a/recv_common.c b/recv_common.c index 953e2a11..a5689390 100644 --- a/recv_common.c +++ b/recv_common.c @@ -6,8 +6,9 @@ /** \file recv_common.c common functions of para_recv and para_audiod */ -#include "para.h" +#include +#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; }