ui/common/url: remove scheme separator from URL scheme definitions

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

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 4d154eee067502cff1d93a4ee6ba44bc2cde31e1..dfeb1ba6217a331dd3ce181d1b49282ea781e0b7 100644 (file)
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -45,8 +45,8 @@ static void print_usage(void)
 {
        print_version();
        printf(
 {
        print_version();
        printf(

-"Usage: petitboot-nc [-d, --start-daemon] [-h, --help] [-l, --log log-file]\n"
-"                    [-V, --version]\n");
+"Usage: petitboot-nc [-d, --dry-run] [-h, --help] [-l, --log log-file]\n"
+"                    [-s, --start-daemon] [-V, --version]\n");

 }
 
 /**
 }
 
 /**


@@ -60,9 +60,10 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
  */
 
 struct opts {
  */
 
 struct opts {

-       enum opt_value start_daemon;
+       enum opt_value dry_run;

        enum opt_value show_help;
        const char *log_file;
        enum opt_value show_help;
        const char *log_file;

+       enum opt_value start_daemon;

        enum opt_value show_version;
 };
 
        enum opt_value show_version;
 };
 


@@ -73,13 +74,14 @@ struct opts {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
        static const struct option long_options[] = {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
        static const struct option long_options[] = {

-               {"start-daemon", no_argument,       NULL, 'd'},
+               {"dry-run",      no_argument,       NULL, 'd'},

                {"help",         no_argument,       NULL, 'h'},
                {"log",          required_argument, NULL, 'l'},
                {"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},
        };
                {"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",
        };
        static const struct opts default_values = {
                .log_file = "/var/log/petitboot/petitboot-nc.log",
        };


@@ -95,7 +97,7 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 
                switch (c) {
                case 'd':
 
                switch (c) {
                case 'd':

-                       opts->start_daemon = opt_yes;
+                       opts->dry_run = opt_yes;

                        break;
                case 'h':
                        opts->show_help = opt_yes;
                        break;
                case 'h':
                        opts->show_help = opt_yes;


@@ -103,6 +105,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
                case 'l':
                        opts->log_file = optarg;
                        break;
                case 'l':
                        opts->log_file = optarg;
                        break;

+               case 's':
+                       opts->start_daemon = opt_yes;
+                       break;

                case 'V':
                        opts->show_version = opt_yes;
                        break;
                case 'V':
                        opts->show_version = opt_yes;
                        break;


@@ -148,7 +153,7 @@ static int pb_kexec_cb(struct cui *cui, struct cui_opt_data *cod)
 
        assert(pb->cui->current == &pb->cui->main->scr);
 
 
        assert(pb->cui->current == &pb->cui->main->scr);
 

-       return pb_run_kexec(cod->kd);
+       return pb_run_kexec(cod->kd, pb->cui->dry_run);

 }
 
 /**
 }
 
 /**


@@ -170,7 +175,9 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 
        m->on_open = cui_on_open;
 
 
        m->on_open = cui_on_open;
 

-       m->scr.frame.title = talloc_strdup(m, "Petitboot");
+       m->scr.frame.title = talloc_asprintf(m,
+               "Petitboot (" PACKAGE_VERSION ")%s",
+               (pb_cui->cui->dry_run ? " (dry-run)" : ""));

        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");
        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");


@@ -231,9 +238,9 @@ static void sig_handler(int signum)
 int main(int argc, char *argv[])
 {
        static struct sigaction sa;
 int main(int argc, char *argv[])
 {
        static struct sigaction sa;

-       static struct opts opts;

        int result;
        int cui_result;
        int result;
        int cui_result;

+       struct opts opts;

 
        result = opts_parse(&opts, argc, argv);
 
 
        result = opts_parse(&opts, argc, argv);
 


@@ -278,7 +285,8 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        }
 
                return EXIT_FAILURE;
        }
 

-       pb.cui = cui_init(&pb, pb_kexec_cb, NULL, opts.start_daemon);
+       pb.cui = cui_init(&pb, pb_kexec_cb, NULL, opts.start_daemon,
+               opts.dry_run);

 
        if (!pb.cui)
                return EXIT_FAILURE;
 
        if (!pb.cui)
                return EXIT_FAILURE;