From nobody Fri Dec 15 18:57:24 2023 X-Original-To: dev-commits-src-branches@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 4SsJPJ6qcbz53wPl; Fri, 15 Dec 2023 18:57:24 +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 4SsJPJ6JYGz3Lfp; Fri, 15 Dec 2023 18:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702666644; 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=i2njDVBY9JDsZPU03VLlWSHWD0urJRrnWuXvwsxZ3iw=; b=KGzdU8mvK9+o0JqWxwd6cUINx57KCVx4bcIEEZ6zVzBFGIikzqVPkKr6JDyF5wro299BT1 dHU4++X+l/iZKErsP1bSsbpUwZVkkla/KdZvGgYZvMWolpj7u47EsKUk94tHZSSi2wM8Kc GOIeRs/IxhS5x8pErsBRMMvnzWHhaYwm/bvapjDFPMz/NAVe0+JNln1wT5ws85qIiAmKf0 KyW83mxc3j/n0bjK4ijDxDlw+l8Zi9yn2s7X4qlEYVI912vqvkIWNrXc82DihVHpmyFPnJ ivgRTTLB2KVr4hZ8saFJMklwPYyXqAR9LtY9zBTsa2xz0bg9ZXggar0ccq2mmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702666644; a=rsa-sha256; cv=none; b=MxRI11RC9duwffUyh/wBOouTNWBkued9o84o/Yu10GFAtk03ocJ8iOkwNsgyRzBd5n7Puc alQ7afn80L0n9PEvMUPxQjMcmyN6tMg870zQSKFG6bAODRBuSlw2XwRqWhhwKZcmn8pwSN GkpiZzRPOee9JFYcHC940VIHnBvDZ3TIr1irjshFf893RvQu467S9RTk8kisIiyln1tB8N oNWYcHgezHdZCkZee4tjp/MSJf9eEQtsqRIWXc0Ng9aEBs6ye9QHTPFMXLdx8KIocyiBeG yiaFeG/m5S1VH9ltF/Sgk6CXKCp0tmyGEX1Q2gSJ7unuHiAWeccdnvTV1Do4HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702666644; 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=i2njDVBY9JDsZPU03VLlWSHWD0urJRrnWuXvwsxZ3iw=; b=H8MXyzBzxJqcXY3zYhFJKOX04Z82w4zSipKqoXry/7pVlWFGO7SnXz4yTqyjGgl0zApV1x 61OvuVqCMN81nDoEMZYNWk3cC+iQxD/UB6cjcDDK1+enVmqRJ+yL6JCPk+jEQqqdXs+uCr QswB3IQaLYVna33UPeagy4FHSR1bErT4/OX2JaxIvg5IOPjtJ3nGbR5Su/4vc7dDG+l//9 LRT8DyMBHputXeA0NM+AFWIkOq4e1OajsbWKcSZKvKCpQQN2fIO9on80qOr2ubtSyQ1Dc+ 2utavG7KiWAiXcVvbtp8zs58VI8JKXoAruZWVA/9yAonwh1B3s5ZOfgP9LHl8Q== 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 4SsJPJ5Npbz6rW; Fri, 15 Dec 2023 18:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BFIvOh1018058; Fri, 15 Dec 2023 18:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFIvOtf018055; Fri, 15 Dec 2023 18:57:24 GMT (envelope-from git) Date: Fri, 15 Dec 2023 18:57:24 GMT Message-Id: <202312151857.3BFIvOtf018055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 03fe51fb88df - stable/13 - localedef: expand the default charmap List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 03fe51fb88df70d54cfb597888a75d05e578782b Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=03fe51fb88df70d54cfb597888a75d05e578782b commit 03fe51fb88df70d54cfb597888a75d05e578782b Author: Kyle Evans AuthorDate: 2023-09-02 06:13:02 +0000 Commit: Kyle Evans CommitDate: 2023-12-15 00:59:01 +0000 localedef: expand the default charmap POSIX defines a number of other control characters as well as alternative aliases for some that should be provided in the default set, so let's go ahead and add those. Reviewed by: bapt, yuripv Sponsored by: Klara, Inc. (cherry picked from commit 3a7ffe206ce7e4741fae26432f6d6e5159207f45) --- usr.bin/localedef/charmap.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c index 44b7e3292eae..1da4d8921ecb 100644 --- a/usr.bin/localedef/charmap.c +++ b/usr.bin/localedef/charmap.c @@ -70,13 +70,49 @@ static const struct { int ch; } portable_chars[] = { { "NUL", '\0' }, + { "SOH", '\x01' }, + { "STX", '\x02' }, + { "ETX", '\x03' }, + { "EOT", '\x04' }, + { "ENQ", '\x05' }, + { "ACK", '\x06' }, + { "BEL", '\a' }, { "alert", '\a' }, + { "BS", '\b' }, { "backspace", '\b' }, + { "HT", '\t' }, { "tab", '\t' }, - { "carriage-return", '\r' }, + { "LF", '\n' }, { "newline", '\n' }, + { "VT", '\v' }, { "vertical-tab", '\v' }, + { "FF", '\f' }, { "form-feed", '\f' }, + { "CR", '\r' }, + { "carriage-return", '\r' }, + { "SO", '\x0e' }, + { "SI", '\x0f' }, + { "DLE", '\x10' }, + { "DC1", '\x11' }, + { "DC2", '\x12' }, + { "DC3", '\x13' }, + { "DC4", '\x14' }, + { "NAK", '\x15' }, + { "SYN", '\x16' }, + { "ETB", '\x17' }, + { "CAN", '\x18' }, + { "EM", '\x19' }, + { "SUB", '\x1a' }, + { "ESC", '\x1b' }, + { "FS", '\x1c' }, + { "IS4", '\x1c' }, + { "GS", '\x1d' }, + { "IS3", '\x1d' }, + { "RS", '\x1e' }, + { "IS2", '\x1e' }, + { "US", '\x1f' }, + { "IS1", '\x1f' }, + { "DEL", '\x7f' }, { "space", ' ' }, { "exclamation-mark", '!' }, { "quotation-mark", '"' },