Bug 264299 - tcsh dirs builtin-command and more can't input/show tilda/reverse_solidus character in LANG=ja_JP.SJIS environment.
Summary: tcsh dirs builtin-command and more can't input/show tilda/reverse_solidus cha...
Status: New
Alias: None
Product: Base System
Classification: Unclassified
Component: misc (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Many People
Assignee: Yuri Pankov
URL: https://reviews.freebsd.org/D42848
Keywords:
Depends on:
Blocks:
 
Reported: 2022-05-27 21:21 UTC by Yoshiji Emoto
Modified: 2023-12-27 12:31 UTC (History)
2 users (show)

See Also:
linimon: mfc-stable14?
linimon: mfc-stable13?


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Yoshiji Emoto 2022-05-27 21:21:12 UTC
/usr/src/tools/tools/locale/etc/final-maps/map.SJIS
fix mapping character.

/usr/src/contrib/tcsh/sh.print.c
fix core-dumped in show home directory in dirs builtin-command in LANG=ja_JP.SJIS environment.

--- tools/tools/locale/etc/final-maps/map.SJIS.orig     2018-08-15 20:55:35.0543
59000 +0900
+++ tools/tools/locale/etc/final-maps/map.SJIS  2018-08-15 21:02:32.780522000 +0
900
@@ -163,7 +163,7 @@
 <LATIN_CAPITAL_LETTER_Z> \x5a
 <Z> \x5a
 <LEFT_SQUARE_BRACKET> \x5b
-<YEN_SIGN> \x5c
+<REVERSE_SOLIDUS> \x5c
 <RIGHT_SQUARE_BRACKET> \x5d
 <CIRCUMFLEX_ACCENT> \x5e
 <LOW_LINE> \x5f
@@ -223,7 +223,7 @@
 <LEFT_CURLY_BRACKET> \x7b
 <VERTICAL_LINE> \x7c
 <RIGHT_CURLY_BRACKET> \x7d
-<OVERLINE> \x7e
+<TILDE> \x7e
 <CONTROL-007F> \x7f
 <DELETE> \x7f
 <IDEOGRAPHIC_SPACE> \x81\x40
--- contrib/tcsh/sh.print.c.orig        2018-06-22 08:03:38.000000000 +0900
+++ contrib/tcsh/sh.print.c     2018-08-15 20:01:12.462458000 +0900
@@ -169,9 +169,9 @@
            }
        }
        else if (!isprint(c) && (ASC(c) < 0x80 || MB_CUR_MAX == 1)) {
-           xputchar('\\' | atr);
-           xputchar((((c >> 6) & 7) + '0') | atr);
-           xputchar((((c >> 3) & 7) + '0') | atr);
+           putraw('\\' | atr);
+           putraw((((c >> 6) & 7) + '0') | atr);
+           putraw((((c >> 3) & 7) + '0') | atr);
            c = (c & 7) + '0';
        }
        (void) putraw(c | atr);
Comment 1 Yoshiji Emoto 2022-05-28 01:42:25 UTC
SJIS.TXT: this file created from iconv data.
I don't know fix iconv table report URLs.

--- tools/tools/locale/etc/charmaps/SJIS.TXT.orig       2021-04-09 09:24:12.0000
00000 +0900
+++ tools/tools/locale/etc/charmaps/SJIS.TXT    2021-04-19 16:42:12.000000000 +0
900
@@ -95,7 +95,7 @@
 0x59   0x0059
 0x5A   0x005A
 0x5B   0x005B
-0x5C   0x00A5
+0x5C   0x005C
 0x5D   0x005D
 0x5E   0x005E
 0x5F   0x005F
@@ -129,7 +129,7 @@
 0x7B   0x007B
 0x7C   0x007C
 0x7D   0x007D
-0x7E   0x203E
+0x7E   0x007E
 0x7F   0x007F
 0x8140 0x3000
 0x8141 0x3001
Comment 2 uratan 2023-11-30 05:13:24 UTC
I have reported same problem by my style, see bug #275444 to confirm.
Comment 3 commit-hook freebsd_committer freebsd_triage 2023-12-20 06:28:48 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=a4a9d2a64a4ded0adf27cbc1af82669112c41887

commit a4a9d2a64a4ded0adf27cbc1af82669112c41887
Author:     Yuri Pankov <yuripv@FreeBSD.org>
AuthorDate: 2023-11-30 09:04:55 +0000
Commit:     Yuri Pankov <yuripv@FreeBSD.org>
CommitDate: 2023-12-20 06:24:22 +0000

    locale: regenerate SJIS charmap from CLDR

    There are some noticable differences affecting the '\' and '~'
    characters between our current charmap and latest CLDR version.

    PR:             264299, 275444
    Reviewed by:    bapt
    Tested by:      uratan@miomio.jp
    Differential Revision:  https://reviews.freebsd.org/D42848

 tools/tools/locale/etc/final-maps/map.SJIS | 18682 ++++++++++-----------------
 1 file changed, 7185 insertions(+), 11497 deletions(-)
Comment 4 Mark Linimon freebsd_committer freebsd_triage 2023-12-27 12:30:17 UTC
^Triage: assign to committer that resolved; set possible MFC flags.
Comment 5 Mark Linimon freebsd_committer freebsd_triage 2023-12-27 12:31:07 UTC
^Triage: correct assignment.  Sorry.