diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-03-08 18:13:40 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-03-08 18:13:40 +0000 |
| commit | aea829930d5ee26256123b21ff1b1d00246e3eb9 (patch) | |
| tree | 47e16e508f643590d6491a64170781998d840368 | |
| parent | 22fe62c8609678a23939000f1e3eb99af080220e (diff) | |
| download | src-test2-aea829930d5ee26256123b21ff1b1d00246e3eb9.tar.gz src-test2-aea829930d5ee26256123b21ff1b1d00246e3eb9.zip | |
Notes
| -rw-r--r-- | usr.sbin/kbdmap/kbdmap.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index e1dbdbe9b41d..f2a55abffdf7 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -57,6 +57,7 @@ static const char *sysconfig = DEFAULT_SYSCONFIG; static const char *font_current; static const char *dir; static const char *menu = ""; +static const char *title = "Keyboard Menu"; static int x11; static int using_vt; @@ -361,8 +362,8 @@ show_dialog(struct keymap **km_sorted, int num_keymaps) tmp_name); exit(1); } - asprintf(&dialog, "/usr/bin/dialog --clear --title \"Keyboard Menu\" " - "--menu \"%s\" 0 0 0", menu); + asprintf(&dialog, "/usr/bin/dialog --clear --title \"%s\" " + "--menu \"%s\" 0 0 0", title, menu); /* start right font, assume that current font is equal * to default font in /etc/rc.conf @@ -628,8 +629,9 @@ menu_read(void) matches = sscanf(p, "%64[^:]:%64[^:]:%256[^:\n]", keym, lng, desc); if (matches == 3) { - if (strcmp(keym, "FONT") - && strcmp(keym, "MENU")) { + if (strcmp(keym, "FONT") != 0 && + strcmp(keym, "MENU") != 0 && + strcmp(keym, "TITLE") != 0) { /* Check file exists & is readable */ if (check_file(keym) == -1) continue; @@ -706,6 +708,10 @@ menu_read(void) exit(0); } + km = get_keymap("TITLE"); + if (km) + /* Take note of dialog title */ + title = strdup(km->desc); km = get_keymap("MENU"); if (km) /* Take note of menu title */ @@ -716,8 +722,9 @@ menu_read(void) font = strdup(km->desc); /* Remove unwanted items from list */ - remove_keymap("MENU"); remove_keymap("FONT"); + remove_keymap("MENU"); + remove_keymap("TITLE"); /* Look for keymaps not in database */ dirp = opendir(dir); |