projects
/
petitboot
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ui/ncurses: Always provide a key definition for backtab
[petitboot]
/
ui
/
twin
/
pbt-main.c
diff --git
a/ui/twin/pbt-main.c
b/ui/twin/pbt-main.c
index cc69b4b22362eca5f38af00fb7db5e730e833886..cf546625090f8305e43fd777c42cbec2cfe45fe8 100644
(file)
--- a/
ui/twin/pbt-main.c
+++ b/
ui/twin/pbt-main.c
@@
-19,7
+19,6
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#define _GNU_SOURCE
#include <stdio.h>
#include <getopt.h>
#include <stdio.h>
#include <getopt.h>
@@
-27,15
+26,17
@@
void pbt_print_version(void)
{
void pbt_print_version(void)
{
- printf("p
b
-twin (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
+ printf("p
etitboot
-twin (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
}
void pbt_print_usage(void)
{
pbt_print_version();
printf(
}
void pbt_print_usage(void)
{
pbt_print_version();
printf(
-"Usage: pb-twin [-h, --help] [-l, --log log-file] [-r, --reset-defaults]\n"
-" [-t, --timeout] [-V, --version] [[-f --fbdev] | [-x --x11]]\n");
+"Usage: petitboot-twin [-h, --help] [-l, --log log-file]\n"
+" [-r, --reset-defaults] [-s, --start-daemon]\n"
+" [-t, --timeout] [-V, --version]\n"
+" [[-f --fbdev] | [-x --x11]]\n");
}
/**
}
/**
@@
-49,15
+50,16
@@
int pbt_opts_parse(struct pbt_opts *opts, int argc, char *argv[])
{"help", no_argument, NULL, 'h'},
{"log", required_argument, NULL, 'l'},
{"reset-defaults", no_argument, NULL, 'r'},
{"help", no_argument, NULL, 'h'},
{"log", required_argument, NULL, 'l'},
{"reset-defaults", no_argument, NULL, 'r'},
+ {"start-daemon", no_argument, NULL, 's'},
{"timeout", no_argument, NULL, 't'},
{"version", no_argument, NULL, 'V'},
{"x11", no_argument, NULL, 'x'},
{ NULL, 0, NULL, 0},
};
{"timeout", no_argument, NULL, 't'},
{"version", no_argument, NULL, 'V'},
{"x11", no_argument, NULL, 'x'},
{ NULL, 0, NULL, 0},
};
- static const char short_options[] = "
fhl:
trVx";
+ static const char short_options[] = "
dfhl:s
trVx";
static const struct pbt_opts default_values = {
.backend = pbt_twin_x11,
static const struct pbt_opts default_values = {
.backend = pbt_twin_x11,
- .log_file = "
pb
-twin.log",
+ .log_file = "
/var/log/petitboot/petitboot
-twin.log",
};
*opts = default_values;
};
*opts = default_values;
@@
-79,6
+81,9
@@
int pbt_opts_parse(struct pbt_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 = pbt_opt_yes;
+ break;
case 't':
opts->use_timeout = pbt_opt_yes;
break;
case 't':
opts->use_timeout = pbt_opt_yes;
break;