X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=5de9c6be1779855b00a4698b6638aa4d67072305;hp=52935a8840462af33589ed1378b481c593c405a1;hb=343a65bc48b4e0cda4d9a14afcd7e96cca9c5de9;hpb=40de1dd2fdbb054444d585aa70e2d50166a66e07

diff --git a/recv.c b/recv.c
index 52935a88..5de9c6be 100644
--- a/recv.c
+++ b/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,14 +16,16 @@
 #include "recv.h"
 #include "recv.cmdline.h"
 #include "fd.h"
+#include "string.h"
 #include "error.h"
 #include "stdout.h"
 
 /** the gengetopt args info struct */
 struct recv_args_info conf;
 
-/** always log to stderr */
-INIT_STDERR_LOGGING(conf.loglevel_arg);
+static int loglevel;
+/** Always log to stderr. */
+INIT_STDERR_LOGGING(loglevel);
 
 /** init array of error codes used by para_recv */
 INIT_RECV_ERRLISTS;
@@ -77,14 +79,14 @@ int main(int argc, char *argv[])
 
 	memset(&sot, 0, sizeof(struct stdout_task));
 	memset(&rn, 0, sizeof(struct receiver_node));
-	FOR_EACH_RECEIVER(ret)
-		receivers[ret].init(&receivers[ret]);
+	recv_init();
 	ret = -E_RECV_SYNTAX;
 	rn.conf = parse_config(argc, argv, &receiver_num);
 	if (!rn.conf) {
 		PARA_EMERG_LOG("parse failed\n");
 		goto out;
 	}
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	r = &receivers[receiver_num];
 	rn.receiver = r;
 	ret = r->open(&rn);
@@ -93,7 +95,7 @@ int main(int argc, char *argv[])
 	r_opened = 1;
 
 	stdout_set_defaults(&sot);
-	sot.buf = rn.buf;
+	sot.bufp = &rn.buf;
 	sot.loaded = &rn.loaded;
 	sot.input_error = &rn.task.error;
 	register_task(&sot.task);