com_lsblob: Print an error message if no blob matched.

[paraslash.git] / recv_common.c

diff --git a/recv_common.c b/recv_common.c
index 953e2a1143ebd28424fb09a978611eaf52bf28d6..53a105dfb107e2feab388fbe29729fa210e6306a 100644 (file)
--- a/recv_common.c
+++ b/recv_common.c
@@ -1,18 +1,21 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \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;
 
@@ -35,24 +38,25 @@ 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]);
+               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 = 0; i < argc; i++)
+               free(argv[i]);
        free(argv);
        return conf;
 }
@@ -118,3 +122,27 @@ void print_receiver_helps(int detailed)
                ggo_print_help(&r->help, detailed);
        }
 }
+
+/**
+ * Simple pre-select hook, used by all receivers.
+ *
+ * \param s Scheduler info.
+ * \param t Determines the receiver node.
+ *
+ * This requests a minimal delay from the scheduler if the status of the buffer
+ * tree node indicates an error/eof condition. No file descriptors are added to
+ * the fd sets of \a s.
+ *
+ * \return The status of the btr node of the receiver node, i.e. the return
+ * value of the underlying call to \ref btr_node_status().
+ */
+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)
+               sched_min_delay(s);
+       return ret;
+}