X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=recv.c;h=57931943b4a02bdcaa501d0a149388c7d1874a0c;hb=c4d243653174f3f4ffc331a4bfc54de94d612f34;hp=42fd335f1466a7c01419b59872d29d5be679f907;hpb=a37e903213215dd36b11bbde4ea98e1d4590a472;p=paraslash.git diff --git a/recv.c b/recv.c index 42fd335f..57931943 100644 --- a/recv.c +++ b/recv.c @@ -9,6 +9,7 @@ #include #include #include +#include #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,7 +90,6 @@ 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; ret = r->open(&rn); @@ -95,6 +97,9 @@ int main(int argc, char *argv[]) goto out; r_opened = 1; + if (conf.buffer_tree_given) + sot.btrn = btr_new_node("stdout", rn.btrn, NULL); + stdout_set_defaults(&sot); sot.bufp = &rn.buf; sot.loaded = &rn.loaded;