X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=ca505561f2a1dbb65f4426ff29fd4fb44888a3b0;hp=1bb0532a9f51622e645bd69074b19504be9068f6;hb=810761a3cdf3f75dd8e07a5d903793048c36df1d;hpb=4b694c91983ce8c70562a8fa1d897e426f8e870b

diff --git a/recv.c b/recv.c
index 1bb0532a..ca505561 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.btrn = 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,10 +115,13 @@ int main(int argc, char *argv[])
 
 	ret = schedule(&s);
 out:
-	if (r_opened) {
-		btr_del_node(rn.btrn);
+	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)