X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=49a96cb0037f108a7e5b76228877638b04520ab4;hp=560e3e5683e9b32b9ee9c965a4df01e32580a458;hb=4a2dbb71fdcf234302760d20333420a6e6566d56;hpb=293fca73b2fe077e7780c1a42216a3db41a6e737

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 560e3e5..49a96cb 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -18,11 +18,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#if defined(HAVE_CONFIG_H)
 #include "config.h"
-#endif
 
 #define _GNU_SOURCE
+
+#include <assert.h>
 #include <errno.h>
 #include <getopt.h>
 #include <signal.h>
@@ -143,12 +143,13 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 		return NULL;
 	}
 
-	m->on_open = cui_on_open;
+	m->on_new = cui_item_new;
 
-	m->scr.frame.title = talloc_asprintf(m,
+	m->scr.frame.ltitle = talloc_asprintf(m,
 		"Petitboot (" PACKAGE_VERSION ")");
+	m->scr.frame.rtitle = NULL;
 	m->scr.frame.help = talloc_strdup(m,
-		"ESC=exit, Enter=accept, e=edit, o=open");
+		"Enter=accept, e=edit, n=new, x=exit");
 	m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
 
 	i = pmenu_item_init(m, 0, "Exit to Shell");
@@ -206,6 +207,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 +226,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");
 
@@ -259,7 +256,6 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 
 	pb.mm = pb_mm_init(&pb);
-	ui_timer_disable(&pb.cui->timer);
 
 	cui_result = cui_run(pb.cui, pb.mm, 0);