external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Disable broken KEYBD trap for multibyte characters

Browse source 
In UTF-8 locales, ksh breaks when a KEYBD trap is active, even a
dummy no-op one like 'trap : KEYBD'. Entering multi-byte characters
fails (the input is interrupted and a new prompt is displayed) and
pasting content with multi-byte characters produces corrupted
results.

The cause is that the KEYBD trap code is not multibyte-ready.
Unfortunately nobody yet understands the edit.c code well enough
to implement a proper fix. Pending that, this commit implements
a workaround that at least avoids breaking the shell.

src/cmd/ksh93/edit/edit.c: ed_getchar():
- When a multi-byte locale is active, do not trigger the the KEYBD
  trap except for ASCII characters (1-127).

Resolves: https://github.com/ksh93/ksh/issues/307
This commit is contained in:
Martijn Dekker 2022-02-12 21:27:36 +00:00
parent fc5bd8e8c3
commit 4886463bb6
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cmd/ksh93/edit/edit.c
View file

@ -1122,7 +1122,10 @@ int ed_getchar(register Edit_t *ep,int mode)
killpg(getpgrp(),SIGINT);
siglongjmp(ep->e_env, UINTR);
}
if(mode<=0 && sh.st.trap[SH_KEYTRAP])
if(mode<=0 && sh.st.trap[SH_KEYTRAP]
/* workaround for <https://github.com/ksh93/ksh/issues/307>:
* do not trigger KEYBD for non-ASCII in multibyte locale */
&& (CC_NATIVE!=CC_ASCII || !mbwide() || c > -128))
{
ep->e_keytrap = 1;
n=1;