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

Fix emacs backslash escaping behavior (#179)

Browse source 
This commit fixes the following:

1. Emacs mode ignores --nobackslashctrl (re: 24598fed) when in
   reverse search.

2. When entering more than one backslash, emacs reverse search mode
   deletes multiple backslashes after pressing backspace once.
   Reproducer:
   $ set --emacs --nobackslashctrl
   $ <Ctrl+R> \\\\<Backspace>

3. Except when in reverse search, the backslash fails to escape a
   subsequent interrupt character (^C). Reproducer:
   $ set --emacs --backslashctrl
   $ teststring \<Ctrl+C>

src/cmd/ksh93/edit/emacs.c:
- Disable escaping backslashes in emacs reverse search if
  'nobackslashctrl' is enabled.
- Fix the buggy behavior of backslashes in emacs reverse
  search by processing backslashes in a loop.

src/cmd/ksh93/tests/pty.sh:
- Add regression tests.

src/cmd/ksh93/sh.1:
- Fix a minor documentation error (^C is the usual interrupt
  character, not ^?).

Co-authored-by: Martijn Dekker <martijn@inlv.org>
This commit is contained in:
Johnothan King 2021-02-17 06:29:12 -08:00 • committed by GitHub
parent fe74702766
commit a282ebc8fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 65 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1068,7 +1068,7 @@ int ed_getchar(register Edit_t *ep,int mode)
{
ed_flush(ep);
ep->e_inmacro = 0;
/* The while is necessary for reads of partial multbyte chars */
/* The while is necessary for reads of partial multibyte chars */
*ep->e_vi_insert = (mode==-2);
if((n=ed_read(ep,ep->e_fd,readin,-LOOKAHEAD,0)) > 0)
n = putstack(ep,readin,n,1);

34
src/cmd/ksh93/edit/emacs.c
View file

@ -281,11 +281,12 @@ int ed_emacsread(void *context, int fd,char *buff,int scend, int reedit)
#endif /* ESH_NFIRST */
}
ep->CntrlO = 0;
while ((c = ed_getchar(ep->ed,0)) != (-1))
while ((c = ed_getchar(ep->ed,backslash)) != (-1))
{
if (backslash)
{
backslash = 0;
if(c!='\\')
backslash = 0;
if (c==usrerase||c==usrkill||(!print(c) &&
(c!='\r'&&c!='\n')))
{
@ -1298,20 +1299,35 @@ static void search(Emacs_t* ep,genchar *out,int direction)
beep();
goto restore;
}
if (i == '\\')
if (!sh_isoption(SH_NOBACKSLCTRL))
{
string[sl++] = '\\';
string[sl] = '\0';
cur = sl;
draw(ep,APPEND);
i = ed_getchar(ep->ed,1);
string[--sl] = '\0';
while (i == '\\')
{
/*
* Append the backslash to the command line, then escape
* the next control character. Repeat the loop if the
* next input is another backslash (otherwise every
* second backslash is skipped).
*/
string[sl++] = '\\';
string[sl] = '\0';
cur = sl;
draw(ep,APPEND);
i = ed_getchar(ep->ed,1);
/* Backslashes don't affect newlines */
if (i == '\n' || i == '\r')
goto skip;
else if (i == usrerase || !print(i))
string[--sl] = '\0';
}
}
string[sl++] = i;
string[sl] = '\0';
cur = sl;
draw(ep,APPEND);
}
skip:
i = genlen(string);
if(ep->prevdirection == -2 && i!=2 || direction!=1)