aboutsummaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
Diffstat (limited to 'console-tools')
-rw-r--r--console-tools/loadfont.c6
-rw-r--r--console-tools/setconsole.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 623d98175..81d0c3db4 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -348,8 +348,7 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
unsigned char *buffer;
// no arguments allowed!
- opt_complementary = "=0";
- getopt32(argv, "");
+ getopt32(argv, "^" "" "\0" "=0");
/*
* We used to look at the length of the input file
@@ -437,8 +436,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
char *mapfilename;
const char *tty_name = CURRENT_TTY;
- opt_complementary = "=1";
- opts = getopt32(argv, "m:C:", &mapfilename, &tty_name);
+ opts = getopt32(argv, "^" "m:C:" "\0" "=1", &mapfilename, &tty_name);
argv += optind;
fd = xopen_nonblocking(tty_name);
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 8f4b7b7a6..bad2b76e4 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -47,8 +47,7 @@ int setconsole_main(int argc UNUSED_PARAM, char **argv)
int reset;
/* at most one non-option argument */
- opt_complementary = "?1";
- reset = getopt32(argv, "r");
+ reset = getopt32(argv, "^" "r" "\0" "?1");
argv += 1 + reset;
if (*argv) {