From 286253c656aa40437455dd4f691ad9054a328ef2 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 11 Jan 2010 19:16:03 +0000 Subject: moved default log target to options --- src/anylike.c | 31 +++++++++++++------------------ src/options.c | 8 ++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/anylike.c b/src/anylike.c index 427477f..826824a 100644 --- a/src/anylike.c +++ b/src/anylike.c @@ -219,26 +219,21 @@ int main(int argc, char* argv[]) exit(ret); } string_list_element_t* tmp = opt.log_targets_.first_; - if(!tmp) { - log_add_target("syslog:3,anylike,daemon"); - } - else { - while(tmp) { - ret = log_add_target(tmp->string_); - if(ret) { - switch(ret) { - case -2: fprintf(stderr, "memory error on log_add_target, exitting\n"); break; - case -3: fprintf(stderr, "unknown log target: '%s', exitting\n", tmp->string_); break; - case -4: fprintf(stderr, "this log target is only allowed once: '%s', exitting\n", tmp->string_); break; - default: fprintf(stderr, "syntax error near: '%s', exitting\n", tmp->string_); break; - } - - options_clear(&opt); - log_close(); - exit(ret); + while(tmp) { + ret = log_add_target(tmp->string_); + if(ret) { + switch(ret) { + case -2: fprintf(stderr, "memory error on log_add_target, exitting\n"); break; + case -3: fprintf(stderr, "unknown log target: '%s', exitting\n", tmp->string_); break; + case -4: fprintf(stderr, "this log target is only allowed once: '%s', exitting\n", tmp->string_); break; + default: fprintf(stderr, "syntax error near: '%s', exitting\n", tmp->string_); break; } - tmp = tmp->next_; + + options_clear(&opt); + log_close(); + exit(ret); } + tmp = tmp->next_; } log_printf(NOTICE, "just started..."); diff --git a/src/options.c b/src/options.c index 27241ac..8de7cc6 100644 --- a/src/options.c +++ b/src/options.c @@ -188,6 +188,14 @@ int options_parse(options_t* opt, int argc, char* argv[]) return i; } + if(!opt->log_targets_.first_) { +#ifndef WINVER + string_list_add(&opt->log_targets_, "syslog:3,anylike,daemon"); +#else + string_list_add(&opt->log_targets_, "stdout:3"); +#endif + } + return 0; } -- cgit v1.2.3