X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=a5689390987ac9c9b063dad200653e990268824e;hp=a541d936e46c149b9b204a5811286d540073a02e;hb=5587494468627e20fe622b6055689717262d09ab;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/recv_common.c b/recv_common.c
index a541d936..a5689390 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -1,19 +1,33 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 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 "para.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "string.h"
 
 DEFINE_RECEIVER_ARRAY;
+
+/**
+ * Call the init function of each paraslash receiver.
+ */
+void recv_init(void)
+{
+	int i;
+
+	FOR_EACH_RECEIVER(i)
+		receivers[i].init(&receivers[i]);
+}
+
 static void *parse_receiver_args(int receiver_num, char *options)
 {
 	struct receiver *r = &receivers[receiver_num];
@@ -22,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*));
@@ -39,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;
 }
@@ -80,6 +96,28 @@ void *check_receiver_arg(char *ra, int *receiver_num)
 		*receiver_num = j;
 		return parse_receiver_args(j, c? ra + len + 1: NULL);
 	}
-	PARA_ERROR_LOG("%s", "receiver not found\n");
+	PARA_ERROR_LOG("receiver not found\n");
 	return NULL;
 }
+
+/**
+ * Print out the help texts to all receivers.
+ *
+ * \param detailed Whether the detailed help should be printed.
+ */
+void print_receiver_helps(int detailed)
+{
+	int i;
+
+	printf_or_die("\nAvailable receivers: \n\t");
+	FOR_EACH_RECEIVER(i)
+		printf_or_die("%s%s", i? " " : "", receivers[i].name);
+	printf_or_die("\n\n");
+	FOR_EACH_RECEIVER(i) {
+		struct receiver *r = receivers + i;
+		if (!r->help.short_help)
+			continue;
+		printf_or_die("Options for %s:\n", r->name);
+		ggo_print_help(&r->help, detailed);
+	}
+}