* 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>
{
print_version();
printf(
-"Usage: petitboot-nc [-d, --dry-run] [-h, --help] [-l, --log log-file]\n"
+"Usage: petitboot-nc [-h, --help] [-l, --log log-file]\n"
" [-s, --start-daemon] [-V, --version]\n");
}
*/
struct opts {
- enum opt_value dry_run;
enum opt_value show_help;
const char *log_file;
enum opt_value start_daemon;
static int opts_parse(struct opts *opts, int argc, char *argv[])
{
static const struct option long_options[] = {
- {"dry-run", no_argument, NULL, 'd'},
{"help", no_argument, NULL, 'h'},
{"log", required_argument, NULL, 'l'},
{"start-daemon", no_argument, NULL, 's'},
break;
switch (c) {
- case 'd':
- opts->dry_run = opt_yes;
- break;
case 'h':
opts->show_help = opt_yes;
break;
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;
+}
+
/**
* pb_mm_init - Setup the main menu instance.
*/
struct pmenu *m;
struct pmenu_item *i;
- m = pmenu_init(pb_cui->cui, 1, cui_on_exit);
+ m = pmenu_init(pb_cui->cui, 4, cui_on_exit);
if (!m) {
pb_log("%s: failed\n", __func__);
return NULL;
}
- m->on_open = cui_on_open;
+ m->on_new = cui_item_new;
- m->scr.frame.title = talloc_asprintf(m,
- "Petitboot (" PACKAGE_VERSION ")%s",
- (pb_cui->cui->dry_run ? " (dry-run)" : ""));
+ 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");
+ i = pmenu_item_init(m, 0, " ");
+ item_opts_off(i->nci, O_SELECTABLE);
+ i = pmenu_item_init(m, 1, "System information");
+ i->on_execute = pmenu_sysinfo;
+ i = pmenu_item_init(m, 2, "System configuration");
+ i->on_execute = pmenu_config;
+ i = pmenu_item_init(m, 3, "Exit to shell");
i->on_execute = pmenu_exit_cb;
result = pmenu_setup(m);
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);
int result;
int cui_result;
struct opts opts;
+ FILE *log;
result = opts_parse(&opts, argc, 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");
return EXIT_FAILURE;
}
- pb.cui = cui_init(&pb, NULL, opts.start_daemon, opts.dry_run);
+ 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);