X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=803965c078078491bbfecdb3eb73209442dc167d;hp=e04f6484981a9659fe399d9df4066c06ca6dab2b;hb=3dd2078d278f922cb373dc7ed36fa2b18367098f;hpb=0d6679a8036a45c03d0c5872a4cf6e9c6f87618f

diff --git a/recv.c b/recv.c
index e04f6484..803965c0 100644
--- a/recv.c
+++ b/recv.c
@@ -92,12 +92,16 @@ int main(int argc, char *argv[])
 	}
 	r = &receivers[receiver_num];
 	rn.receiver = r;
-	rn.btr_root = btr_new_node("receiver", NULL /* no parent */);
+	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;
@@ -111,12 +115,13 @@ int main(int argc, char *argv[])
 
 	ret = schedule(&s);
 out:
-	if (r_opened) {
-		btr_del_node(rn.btr_root);
+	if (r_opened)
 		r->close(&rn);
+	if (conf.buffer_tree_given) {
+		btr_free_node(rn.btrn);
+		btr_free_node(sot.btrn);
 	}
-	if (r)
-		r->shutdown();
+	free(rn.conf);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;