X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=0d0a38af4dc6d3eeefc03209eb31bbaee5e0f734;hp=d9fd7d2d0415349d05c89a766a15d7e9c17a2449;hb=a1fb38f17bfa60aac89d0dd21dd8ccc739d794bf;hpb=6d1eff1e8e1db12e7aa179e8dc9c65050c045536 diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c index d9fd7d2..0d0a38a 100644 --- a/ui/ncurses/generic-main.c +++ b/ui/ncurses/generic-main.c @@ -18,9 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#if defined(HAVE_CONFIG_H) #include "config.h" - -#define _GNU_SOURCE +#endif #include #include @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "log/log.h" @@ -36,6 +37,8 @@ #include "ui/common/discover-client.h" #include "nc-cui.h" +extern const char *main_menu_help_text; + static void print_version(void) { printf("petitboot-nc (" PACKAGE_NAME ") " PACKAGE_VERSION "\n"); @@ -46,7 +49,7 @@ static void print_usage(void) print_version(); printf( "Usage: petitboot-nc [-h, --help] [-l, --log log-file]\n" -" [-s, --start-daemon] [-V, --version]\n"); +" [-s, --start-daemon] [-v, --verbose] [-V, --version]\n"); } /** @@ -63,6 +66,7 @@ struct opts { enum opt_value show_help; const char *log_file; enum opt_value start_daemon; + enum opt_value verbose; enum opt_value show_version; }; @@ -76,13 +80,12 @@ static int opts_parse(struct opts *opts, int argc, char *argv[]) {"help", no_argument, NULL, 'h'}, {"log", required_argument, NULL, 'l'}, {"start-daemon", no_argument, NULL, 's'}, + {"verbose", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'V'}, { NULL, 0, NULL, 0}, }; - static const char short_options[] = "dhl:sV"; - static const struct opts default_values = { - .log_file = "/var/log/petitboot/petitboot-nc.log", - }; + static const char short_options[] = "dhl:svV"; + static const struct opts default_values = { 0 }; *opts = default_values; @@ -103,6 +106,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[]) case 's': opts->start_daemon = opt_yes; break; + case 'v': + opts->verbose = opt_yes; + break; case 'V': opts->show_version = opt_yes; break; @@ -115,6 +121,31 @@ static int opts_parse(struct opts *opts, int argc, char *argv[]) return 0; } +static char *default_log_filename(void) +{ + const char *base = "/var/log/petitboot/petitboot-nc"; + static char name[PATH_MAX]; + char *tty; + int i; + + tty = ttyname(STDIN_FILENO); + + /* strip /dev/ */ + if (tty && !strncmp(tty, "/dev/", 5)) + tty += 5; + + /* change slashes to hyphens */ + for (i = 0; tty && tty[i]; i++) + if (tty[i] == '/') + tty[i] = '-'; + + if (!tty || !*tty) + tty = "unknown"; + + snprintf(name, sizeof(name), "%s.%s.log", base, tty); + + return name; +} /** * struct pb_cui - Main cui program instance. * @mm: Main menu. @@ -126,6 +157,24 @@ struct pb_cui { struct cui *cui; }; +static int pmenu_sysinfo(struct pmenu_item *item) +{ + cui_show_sysinfo(cui_from_item(item)); + return 0; +} + +static int pmenu_config(struct pmenu_item *item) +{ + cui_show_config(cui_from_item(item)); + return 0; +} + +static int pmenu_reinit(struct pmenu_item *item) +{ + cui_send_reinit(cui_from_item(item)); + return 0; +} + /** * pb_mm_init - Setup the main menu instance. */ @@ -136,7 +185,7 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui) struct pmenu *m; struct pmenu_item *i; - m = pmenu_init(pb_cui->cui, 1, cui_on_exit); + m = pmenu_init(pb_cui->cui, 5, cui_on_exit); if (!m) { pb_log("%s: failed\n", __func__); @@ -149,11 +198,28 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui) "Petitboot (" PACKAGE_VERSION ")"); m->scr.frame.rtitle = NULL; m->scr.frame.help = talloc_strdup(m, - "ESC=exit, Enter=accept, e=edit, n=new"); + "Enter=accept, e=edit, n=new, x=exit, h=help"); m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot"); - i = pmenu_item_init(m, 0, "Exit to Shell"); + i = pmenu_item_create(m, " "); + item_opts_off(i->nci, O_SELECTABLE); + pmenu_item_insert(m, i, 0); + + i = pmenu_item_create(m, "System information"); + i->on_execute = pmenu_sysinfo; + pmenu_item_insert(m, i, 1); + + i = pmenu_item_create(m, "System configuration"); + i->on_execute = pmenu_config; + pmenu_item_insert(m, i, 2); + + i = pmenu_item_create(m, "Rescan devices"); + i->on_execute = pmenu_reinit; + pmenu_item_insert(m, i, 3); + + i = pmenu_item_create(m, "Exit to shell"); i->on_execute = pmenu_exit_cb; + pmenu_item_insert(m, i, 4); result = pmenu_setup(m); @@ -163,6 +229,9 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui) goto fail_setup; } + m->help_title = "main menu"; + m->help_text = main_menu_help_text; + menu_opts_off(m->ncm, O_SHOWDESC); set_menu_mark(m->ncm, " *"); set_current_item(m->ncm, i->nci); @@ -204,6 +273,7 @@ static void sig_handler(int signum) int main(int argc, char *argv[]) { static struct sigaction sa; + const char *log_filename; int result; int cui_result; struct opts opts; @@ -226,9 +296,14 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } + if (opts.log_file) + log_filename = opts.log_file; + else + log_filename = default_log_filename(); + log = stderr; - if (strcmp(opts.log_file, "-")) { - log = fopen(opts.log_file, "a"); + if (strcmp(log_filename, "-")) { + log = fopen(log_filename, "a"); if (!log) log = fopen("/dev/null", "a"); @@ -236,6 +311,9 @@ int main(int argc, char *argv[]) pb_log_init(log); + if (opts.verbose) + pb_log_set_debug(true); + pb_log("--- petitboot-nc ---\n"); sa.sa_handler = sig_handler;