X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=4458021c636b7163b97f92afe781206db96fed46;hp=b915156ab69da3725088f5b4a59ca1f3c96e7234;hb=ccef244fab11ebc96809b9de62e175b4d166b6e2;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953 diff --git a/recv.c b/recv.c index b915156a..4458021c 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -13,15 +13,20 @@ #include "list.h" #include "sched.h" #include "ggo.h" +#include "buffer_tree.h" #include "recv.h" #include "recv.cmdline.h" #include "fd.h" #include "string.h" #include "error.h" #include "stdout.h" -#include "buffer_tree.h" #include "version.h" +extern void afh_recv_init(struct receiver *r); +#undef AFH_RECEIVER +#define AFH_RECEIVER {.name = "afh", .init = afh_recv_init}, +DEFINE_RECEIVER_ARRAY; + /** The gengetopt args info struct. */ static struct recv_args_info conf; @@ -104,7 +109,13 @@ int main(int argc, char *argv[]) register_task(&s, &sot.task); rn.task.pre_select = r->pre_select; - rn.task.post_select = r->post_select; + if (r->new_post_select) { + rn.task.new_post_select = r->new_post_select; + rn.task.post_select = NULL; + } else { + rn.task.new_post_select = NULL; + rn.task.post_select = r->post_select;; + } sprintf(rn.task.status, "%s", r->name); register_task(&s, &rn.task); @@ -112,10 +123,11 @@ int main(int argc, char *argv[]) out: if (r_opened) r->close(&rn); - btr_free_node(rn.btrn); - btr_free_node(sot.btrn); + btr_remove_node(&rn.btrn); + btr_remove_node(&sot.btrn); if (rn.conf) r->free_config(rn.conf); + if (ret < 0) PARA_ERROR_LOG("%s\n", para_strerror(-ret)); return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;