X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=ca505561f2a1dbb65f4426ff29fd4fb44888a3b0;hp=42fd335f1466a7c01419b59872d29d5be679f907;hb=b7243e074d583c5977bf89b0a2d8ac4635aebbb6;hpb=a37e903213215dd36b11bbde4ea98e1d4590a472

diff --git a/recv.c b/recv.c
index 42fd335f..ca505561 100644
--- a/recv.c
+++ b/recv.c
@@ -9,6 +9,7 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -20,9 +21,10 @@
 #include "string.h"
 #include "error.h"
 #include "stdout.h"
+#include "buffer_tree.h"
 
-/** the gengetopt args info struct */
-struct recv_args_info conf;
+/** The gengetopt args info struct. */
+static struct recv_args_info conf;
 
 static int loglevel;
 /** Always log to stderr. */
@@ -53,6 +55,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
 	HANDLE_VERSION_FLAG("recv", conf);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
@@ -87,14 +90,18 @@ int main(int argc, char *argv[])
 		PARA_EMERG_LOG("parse failed\n");
 		goto out;
 	}
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	r = &receivers[receiver_num];
 	rn.receiver = r;
+	if (conf.buffer_tree_given)
+		rn.btrn = btr_new_node("receiver", NULL, NULL, NULL);
 	ret = r->open(&rn);
 	if (ret < 0)
 		goto out;
 	r_opened = 1;
 
+	if (conf.buffer_tree_given)
+		sot.btrn = btr_new_node("stdout", rn.btrn, NULL, NULL);
+
 	stdout_set_defaults(&sot);
 	sot.bufp = &rn.buf;
 	sot.loaded = &rn.loaded;
@@ -110,6 +117,11 @@ int main(int argc, char *argv[])
 out:
 	if (r_opened)
 		r->close(&rn);
+	if (conf.buffer_tree_given) {
+		btr_free_node(rn.btrn);
+		btr_free_node(sot.btrn);
+	}
+	free(rn.conf);
 	if (r)
 		r->shutdown();
 	if (ret < 0)