X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fmain-generic.c;h=8ddec9ef2cd790044754196508114d08bf919e4b;hp=c9cb4923863c06b96807514e1ab46eb709ae406d;hb=218b5233de442ce67784f9f5e3cd43b2b3f3306b;hpb=dbf139003bd6c8c6ca03ae7f533aa74afd8060c6

diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index c9cb492..8ddec9e 100644
--- a/ui/twin/main-generic.c
+++ b/ui/twin/main-generic.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <errno.h>
 #include <getopt.h>
@@ -58,7 +57,7 @@ static int edit_preferences_cb(struct pbt_item *item)
 
 	(void)client;
 
-	pb_log("%s: TODO\n", __func__);
+	pb_debug("%s: TODO\n", __func__);
 
 	return 0;
 }
@@ -204,7 +203,7 @@ static int run(struct pbt_client *client)
 	while (1) {
 		int result = waiter_poll(client->waitset);
 
-		if (result < 0 && errno != EINTR) {
+		if (result < 0) {
 			pb_log("%s: poll: %s\n", __func__, strerror(errno));
 			break;
 		}
@@ -212,8 +211,6 @@ static int run(struct pbt_client *client)
 		if (client->signal_data.abort)
 			break;
 
-		ui_timer_process_sig(&client->signal_data.timer);
-
 		while (client->signal_data.resize) {
 			client->signal_data.resize = 0;
 			pbt_client_resize(client);
@@ -245,9 +242,6 @@ static void sig_handler(int signum)
 		return;
 
 	switch (signum) {
-	case SIGALRM:
-		ui_timer_sigalrm(&sd->timer);
-		break;
 	case SIGWINCH:
 		sd->resize = 1;
 		break;
@@ -273,6 +267,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);
 
@@ -291,17 +286,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");