discover/grub2: Allow EOF as a statement terminator

[petitboot] / ui / ncurses / generic-main.c

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 4d154eee067502cff1d93a4ee6ba44bc2cde31e1..9236a800beac18a11d1041037955687f109364c6 100644 (file)
--- 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>
@@ -45,8 +45,8 @@ static void print_usage(void)
 {
        print_version();
        printf(
-"Usage: petitboot-nc [-d, --start-daemon] [-h, --help] [-l, --log log-file]\n"
-"                    [-V, --version]\n");
+"Usage: petitboot-nc [-h, --help] [-l, --log log-file]\n"
+"                    [-s, --start-daemon] [-V, --version]\n");
 }
 
 /**
@@ -60,9 +60,9 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
  */
 
 struct opts {
-       enum opt_value start_daemon;
        enum opt_value show_help;
        const char *log_file;
+       enum opt_value start_daemon;
        enum opt_value show_version;
 };
 
@@ -73,13 +73,13 @@ struct opts {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
        static const struct option long_options[] = {
-               {"start-daemon", no_argument,       NULL, 'd'},
                {"help",         no_argument,       NULL, 'h'},
                {"log",          required_argument, NULL, 'l'},
+               {"start-daemon", no_argument,       NULL, 's'},
                {"version",      no_argument,       NULL, 'V'},
                { NULL,          0,                 NULL, 0},
        };
-       static const char short_options[] = "dhl:V";
+       static const char short_options[] = "dhl:sV";
        static const struct opts default_values = {
                .log_file = "/var/log/petitboot/petitboot-nc.log",
        };
@@ -94,15 +94,15 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
                        break;
 
                switch (c) {
-               case 'd':
-                       opts->start_daemon = opt_yes;
-                       break;
                case 'h':
                        opts->show_help = opt_yes;
                        break;
                case 'l':
                        opts->log_file = optarg;
                        break;
+               case 's':
+                       opts->start_daemon = opt_yes;
+                       break;
                case 'V':
                        opts->show_version = opt_yes;
                        break;
@@ -126,31 +126,6 @@ struct pb_cui {
        struct cui *cui;
 };
 
-static struct pb_cui *pb_from_cui(struct cui *cui)
-{
-       struct pb_cui *pb;
-
-       assert(cui->c_sig == pb_cui_sig);
-       pb = cui->platform_info;
-       assert(pb->cui->c_sig == pb_cui_sig);
-       return pb;
-}
-
-/**
- * pb_kexec_cb - The kexec callback.
- */
-
-static int pb_kexec_cb(struct cui *cui, struct cui_opt_data *cod)
-{
-       struct pb_cui *pb = pb_from_cui(cui);
-
-       pb_log("%s: %s\n", __func__, cod->name);
-
-       assert(pb->cui->current == &pb->cui->main->scr);
-
-       return pb_run_kexec(cod->kd);
-}
-
 /**
  * pb_mm_init - Setup the main menu instance.
  */
@@ -170,7 +145,8 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 
        m->on_open = cui_on_open;
 
-       m->scr.frame.title = talloc_strdup(m, "Petitboot");
+       m->scr.frame.title = talloc_asprintf(m,
+               "Petitboot (" PACKAGE_VERSION ")");
        m->scr.frame.help = talloc_strdup(m,
                "ESC=exit, Enter=accept, e=edit, o=open");
        m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
@@ -204,10 +180,6 @@ static void sig_handler(int signum)
        DBGS("%d\n", signum);
 
        switch (signum) {
-       case SIGALRM:
-               if (pb.cui)
-                       ui_timer_sigalrm(&pb.cui->timer);
-               break;
        case SIGWINCH:
                if (pb.cui)
                        cui_resize(pb.cui);
@@ -231,9 +203,10 @@ static void sig_handler(int signum)
 int main(int argc, char *argv[])
 {
        static struct sigaction sa;
-       static struct opts opts;
        int result;
        int cui_result;
+       struct opts opts;
+       FILE *log;
 
        result = opts_parse(&opts, argc, argv);
 
@@ -252,17 +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");
 
-               assert(log);
-               pb_log_set_stream(log);
-       } else
-               pb_log_set_stream(stderr);
+               if (!log)
+                       log = fopen("/dev/null", "a");
+       }
 
-#if defined(DEBUG)
-       pb_log_always_flush(1);
-#endif
+       pb_log_init(log);
 
        pb_log("--- petitboot-nc ---\n");
 
@@ -278,13 +249,12 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        }
 
-       pb.cui = cui_init(&pb, pb_kexec_cb, NULL, opts.start_daemon);
+       pb.cui = cui_init(&pb, NULL, opts.start_daemon);
 
        if (!pb.cui)
                return EXIT_FAILURE;
 
        pb.mm = pb_mm_init(&pb);
-       ui_timer_disable(&pb.cui->timer);
 
        cui_result = cui_run(pb.cui, pb.mm, 0);