sync with OpenBSD -current

This commit is contained in:
purplerain 2024-02-19 00:02:43 +00:00
parent c8d0379fc6
commit 2b1f2f8516
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
9 changed files with 71 additions and 42 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: wskbd.c,v 1.117 2023/11/23 15:02:57 deraadt Exp $ */
/* $OpenBSD: wskbd.c,v 1.118 2024/02/18 20:17:48 anton Exp $ */
/* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
/*
@ -1229,8 +1229,11 @@ getkeyrepeat:
case WSKBDIO_GETENCODINGS:
uedp = (struct wskbd_encoding_data *)data;
for (count = 0; sc->id->t_keymap.keydesc[count].name; count++)
;
count = 0;
if (sc->id->t_keymap.keydesc != NULL) {
while (sc->id->t_keymap.keydesc[count].name)
count++;
}
if (uedp->nencodings > count)
uedp->nencodings = count;
for (i = 0; i < uedp->nencodings; i++) {