X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fmain-ps3.c;h=f98aca83674c213c95f5c3c70c24bc5db047ff77;hp=db0539a5076101d337f379b5c91bdd3c93434509;hb=c4be9490a5d94b662370576157b6e0ed73f2fe77;hpb=bd0c684c9941c24ee4191f4550ec966d5b1fa8ab diff --git a/ui/twin/main-ps3.c b/ui/twin/main-ps3.c index db0539a..f98aca8 100644 --- a/ui/twin/main-ps3.c +++ b/ui/twin/main-ps3.c @@ -21,7 +21,6 @@ #include "config.h" #endif -#define _GNU_SOURCE #include #include #include @@ -148,7 +147,7 @@ static int ps3_setup_test_item(struct pbt_menu *menu, struct pbt_item *sub_item; twin_pixmap_t *icon; - icon = pbt_icon_load(PB_ARTWORK_PATH "/hdd.png"); + icon = pbt_icon_load(PB_ARTWORK_PATH "/drive-harddisk.png"); /* Main item */ @@ -372,7 +371,6 @@ int main(int argc, char *argv[]) int result; int ui_result = -1; unsigned int mode; - FILE *log; result = pbt_opts_parse(&opts, argc, argv); @@ -391,9 +389,13 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } - log = fopen(opts.log_file, "a"); - assert(log); - pb_log_set_stream(log); + 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); @@ -409,7 +411,7 @@ int main(int argc, char *argv[]) result += sigaction(SIGWINCH, &sa, NULL); if (result) { - pb_log("%s sigaction failed.\n", __func__); + pb_log_fn("sigaction failed.\n"); return EXIT_FAILURE; }