From nobody Mon Feb 6 23:01:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9hbW1vkcz3nY0w; Mon, 6 Feb 2023 23:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9hbW0qjRz4MRJ; Mon, 6 Feb 2023 23:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675724519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=svmfUp0o+gGN6thWHrbYREmMkhAANP07OTWFm4PTljE=; b=YWV/GPqqCHelWG+GopvUuPYfBhAaBvbClZmWp99t0aD4upxwbL9s6Y5Qh3eH7n9FfUzSmn ZhQihdv3LDjevAaye+mb3HIxwQHqMwugHkD/qNyr51Uaicgf9MheP6BX3p6f7d/Zua48Mv uDEkHGtNNsAPiYM7D4h4siTOmy6+V5bUNwj7G1n4u60a+gTZui6x7s+lAtvBuWAhd4LQon RtfdwMSj0eUtXMVZiletes+Puk7SiTXUGRDd1sfWlmTcIH12IkHoID6GXBz8wHtqnV95ZV q9BSUbaN77wJe5oBkxj0w05z189jQXtmmtKRa33bwNCYQxzcPHPGOy5V8TdR1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675724519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=svmfUp0o+gGN6thWHrbYREmMkhAANP07OTWFm4PTljE=; b=SRJ0Q1ZMKHlrzkZS6k/cYfFlzuRMRyVYVmPCf/uRMxEcVxOzTaR9UoWYAVc2nXBBvWeIh0 B7p2osLQx6x5E43X16vZURG18SJ1CM8W91ma7Hx1lsnimQ4SpY962qkE+iDAVW3EXMKCqz GTm7E68lQngwoFiwADECk2j7HA7BvjoaUGdvq/rrm+SvmARkI/b7wFtO2qHUdsxgnXF+q3 kLrlEaEIp9zrWXrIVxsILGCZTswaR9+YGfq9+QumW6LhwzfkZX8LcEkTr/pzZCbdQ5ZTBB Xq3XJSjvoxOyUOLzxmFLeTgysCJutjCQDEE47+P6tlpIEGcFLrbg9ljTXy/dxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675724519; a=rsa-sha256; cv=none; b=lbdGgaeAXsFWVJC6GnJSzP+XIh8+S/x3KTyQvZqTc1BiZ1OtE2QLgxgdpZI3JTQ9S74R/K D1cBAlEedP5nONmF1CcRFYJK5iC2lCG3u7C2Je0phBiwYPbxOwDjPAb3AWbnbQ25X4XdbM Of5VO86ma+D3lREkcnDx4xgKiYVhawO0cWnI5n0WoG+COOM473NyJeUOdIT9B3SQF3jbbP xtgITe9DLxC7BbvL+MTWcZySNZxhsuIxiqTY++s1qiDL1rzc7295HUxX/o8up2ahnjd2FO lVfKU/ECEHUhkxX3zlnliXJ2QRLrVODeLlRjD6gnqwxiDFyeBUCYVdwRGv3e7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9hbV7390ztVH; Mon, 6 Feb 2023 23:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316N1wB2021459; Mon, 6 Feb 2023 23:01:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316N1w7w021458; Mon, 6 Feb 2023 23:01:58 GMT (envelope-from git) Date: Mon, 6 Feb 2023 23:01:58 GMT Message-Id: <202302062301.316N1w7w021458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: b92f8e5c0dcc - main - usr.sbin/kbdcontrol.c: Add backwards compatibility functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b92f8e5c0dccd52ea194cabe835b7af0b5e91f09 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=b92f8e5c0dccd52ea194cabe835b7af0b5e91f09 commit b92f8e5c0dccd52ea194cabe835b7af0b5e91f09 Author: Stefan Eßer AuthorDate: 2023-02-06 22:56:44 +0000 Commit: Stefan Eßer CommitDate: 2023-02-06 22:56:44 +0000 usr.sbin/kbdcontrol.c: Add backwards compatibility functions This commit allows a kbdcontrol binary built with a version of kbio.h that supports Unicode characters in dead key maps to load and display keymaps including the dead key tables on a kernel built with a previous version of kbio.h (that only supported 8 bit characters in the dead key map). This commit is meant as a temporary compatibility shim that will be reverted when it can be assumed that all relevant systems have been upgraded to a kernel that uses the updated kbio.h. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D38388 --- sys/sys/kbio.h | 8 +++---- usr.sbin/kbdcontrol/kbdcontrol.c | 49 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h index daef8e474816..a129556d1ada 100644 --- a/sys/sys/kbio.h +++ b/sys/sys/kbio.h @@ -209,7 +209,7 @@ struct accentmap { }; typedef struct accentmap accentmap_t; -#ifdef _KERNEL +//#ifdef _KERNEL struct oacc_t { u_char accchar; u_char map[NUM_ACCENTCHARS][2]; @@ -220,7 +220,7 @@ struct oaccentmap { struct oacc_t acc[NUM_DEADKEYS]; }; typedef struct oaccentmap oaccentmap_t; -#endif /* _KERNEL */ +//#endif /* _KERNEL */ struct keyarg { u_short keynum; @@ -257,10 +257,10 @@ typedef struct fkeyarg fkeyarg_t; /* XXX: Should have accentmap_t as an argument, but that's too big for ioctl()! */ #define GIO_DEADKEYMAP _IO('k', 8) #define PIO_DEADKEYMAP _IO('k', 9) -#ifdef _KERNEL +//#ifdef _KERNEL #define OGIO_DEADKEYMAP _IOR('k', 8, oaccentmap_t) #define OPIO_DEADKEYMAP _IOW('k', 9, oaccentmap_t) -#endif /* _KERNEL */ +//#endif /* _KERNEL */ #define GIO_KEYMAPENT _IOWR('k', 10, keyarg_t) #define PIO_KEYMAPENT _IOW('k', 11, keyarg_t) diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index f4651acea840..725d62a7bfe6 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -818,11 +818,27 @@ add_keymap_path(const char *path) STAILQ_INSERT_TAIL(&pathlist, pe, next); } +static void +to_old_accentmap(accentmap_t *from, oaccentmap_t *to) +{ + int i, j; + + to->n_accs = from->n_accs; + for (i = 0; i < NUM_DEADKEYS; i++) { + for (j = 0; j < NUM_ACCENTCHARS; j++) { + to->acc[i].map[j][0] = from->acc[i].map[j][0]; + to->acc[i].map[j][1] = from->acc[i].map[j][1]; + to->acc[i].accchar = from->acc[i].accchar; + } + } +} + static void load_keymap(char *opt, int dumponly) { keymap_t keymap; accentmap_t accentmap; + oaccentmap_t oaccentmap; struct pathent *pe; FILE *file; int j; @@ -882,9 +898,27 @@ load_keymap(char *opt, int dumponly) } if ((accentmap.n_accs > 0) && (ioctl(0, PIO_DEADKEYMAP, &accentmap) < 0)) { - warn("setting accentmap"); - fclose(file); - return; + to_old_accentmap(&accentmap, &oaccentmap); + if (ioctl(0, OPIO_DEADKEYMAP, &oaccentmap) < 0) { + warn("setting accentmap"); + fclose(file); + return; + } + } +} + +static void +to_new_accentmap(oaccentmap_t *from, accentmap_t *to) +{ + int i, j; + + to->n_accs = from->n_accs; + for (i = 0; i < NUM_DEADKEYS; i++) { + for (j = 0; j < NUM_ACCENTCHARS; j++) { + to->acc[i].map[j][0] = from->acc[i].map[j][0]; + to->acc[i].map[j][1] = from->acc[i].map[j][1]; + to->acc[i].accchar = from->acc[i].accchar; + } } } @@ -893,12 +927,17 @@ print_keymap(void) { keymap_t keymap; accentmap_t accentmap; + oaccentmap_t oaccentmap; int i; if (ioctl(0, GIO_KEYMAP, &keymap) < 0) err(1, "getting keymap"); - if (ioctl(0, GIO_DEADKEYMAP, &accentmap) < 0) - memset(&accentmap, 0, sizeof(accentmap)); + if (ioctl(0, GIO_DEADKEYMAP, &accentmap) < 0) { + if (ioctl(0, OGIO_DEADKEYMAP, &oaccentmap) == 0) + to_new_accentmap(&oaccentmap, &accentmap); + else + memset(&accentmap, 0, sizeof(accentmap)); + } printf( "# alt\n" "# scan cntrl alt alt cntrl lock\n"