Merge branch 'maint'

Conflicts:
	recv_common.c

diff --combined recv_common.c
index 535d8c16075dc931d4ec935630e1de92362e3af5,00c1dd849a94e22ae34337c21506d2f2b3238f42..bbaf139688ff6ccb0d78284f1bb495e7dd106a86
--- 1/recv_common.c
--- 2/recv_common.c
+++ b/recv_common.c
@@@ -6,16 -6,13 +6,16 @@@
  
  /** \file recv_common.c common functions of para_recv and para_audiod */
  
 -#include "para.h"
 +#include <regex.h>
 +#include <stdbool.h>
  
 +#include "para.h"
  #include "list.h"
  #include "sched.h"
  #include "ggo.h"
  #include "recv.h"
  #include "string.h"
 +#include "buffer_tree.h"
  
  DEFINE_RECEIVER_ARRAY;
  
@@@ -38,26 -35,22 +38,25 @@@ static void *parse_receiver_args(int re
        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] = NULL;
 -              argc += 1;
 +              argc++;
        } else {
                argc = 1;
                argv = para_malloc(2 * sizeof(char*));
-               argv[0] = NULL;
                argv[1] = NULL;
        }
+       argv[0] = make_message("%s_recv", r->name);
        conf = r->parse_config(argc, argv);
 -      free(argv[0]);
 +      for (i = 1; i < argc; i++)
 +              free(argv[i]);
        free(argv);
        return conf;
  }
@@@ -123,16 -116,3 +122,16 @@@ void print_receiver_helps(int detailed
                ggo_print_help(&r->help, detailed);
        }
  }
 +
 +int generic_recv_pre_select(struct sched *s, struct task *t)
 +{
 +      struct receiver_node *rn = container_of(t, struct receiver_node, task);
 +      int ret = btr_node_status(rn->btrn, 0, BTR_NT_ROOT);
 +
 +      t->error = 0;
 +      if (ret < 0) {
 +              s->timeout.tv_sec = 0;
 +              s->timeout.tv_usec = 1;
 +      }
 +      return ret;
 +}