summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/ncurses/generic-main.c14
-rw-r--r--ui/twin/main-generic.c15
2 files changed, 11 insertions, 18 deletions
diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index cafd23a..9236a80 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -206,6 +206,7 @@ int main(int argc, char *argv[])
int result;
int cui_result;
struct opts opts;
+ FILE *log;
result = opts_parse(&opts, argc, argv);
@@ -224,20 +225,15 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
+ log = stderr;
if (strcmp(opts.log_file, "-")) {
- FILE *log = fopen(opts.log_file, "a");
+ log = fopen(opts.log_file, "a");
if (!log)
log = fopen("/dev/null", "a");
+ }
- assert(log);
- pb_log_set_stream(log);
- } else
- pb_log_set_stream(stderr);
-
-#if defined(DEBUG)
- pb_log_always_flush(1);
-#endif
+ pb_log_init(log);
pb_log("--- petitboot-nc ---\n");
diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index 99520d0..649ad00 100644
--- a/ui/twin/main-generic.c
+++ b/ui/twin/main-generic.c
@@ -268,6 +268,7 @@ int main(int argc, char *argv[])
int result;
int ui_result;
struct pbt_client *client;
+ FILE *log;
result = pbt_opts_parse(&opts, argc, argv);
@@ -286,17 +287,13 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
+ log = stderr;
if (strcmp(opts.log_file, "-")) {
FILE *log = fopen(opts.log_file, "a");
-
- assert(log);
- pb_log_set_stream(log);
- } else
- pb_log_set_stream(stderr);
-
-#if defined(DEBUG)
- pb_log_always_flush(1);
-#endif
+ if (!log)
+ log = stderr;
+ }
+ pb_log_init(log);
pb_log("--- petitboot-twin ---\n");
OpenPOWER on IntegriCloud