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

edit: do not enable multiline mode with no editor active

Browse source 
If neither gmacs/emacs nor vi are active, the multiline mode should
not be enabled even if the multiline option is on. Doing so can
cause inconsistent behaviour, particularly in multibyte locales
where, if the shell is compiled with SHOPT_RAWONLY (as is default),
the no-editor mode is actually handled by vi.c.

Also, the new --histreedit and --histverify options only work in
the emacs or vi editors, or in no-editor mode when handled by vi.
Which means they cannot ever work if neither emacs or vi were
compiled in (i.e. SHOPT_ESH and SHOPT_VSH were both disabled).
In that case, there's no point in compiling in those options.
Come to think of it, the same applies to the multiline option.

All changed files:
- Update SHOPT_ESH/SHOPT_VSH preprocessor directives as per above.

src/cmd/ksh93/include/defs.h,
src/cmd/ksh93/include/shell.h:
- Move definitions of history expansion-related options to shell.h,
  which is where all the other shell options are defined.
This commit is contained in:
Martijn Dekker 2022-01-12 19:19:42 +00:00
parent a5700d3937
commit b509e92241
9 changed files with 52 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -587,7 +587,13 @@ void ed_setup(register Edit_t *ep, int fd, int reedit)
register int qlen = 1, qwid;
char inquote = 0;
ep->e_fd = fd;
ep->e_multiline = sh_isoption(SH_MULTILINE)!=0;
#if SHOPT_ESH && SHOPT_VSH
ep->e_multiline = sh_isoption(SH_MULTILINE) && (sh_isoption(SH_EMACS) || sh_isoption(SH_GMACS) || sh_isoption(SH_VI));
#elif SHOPT_ESH
ep->e_multiline = sh_isoption(SH_MULTILINE) && (sh_isoption(SH_EMACS) || sh_isoption(SH_GMACS));
#else
ep->e_multiline = sh_isoption(SH_MULTILINE) && sh_isoption(SH_VI);
#endif
#ifdef SIGWINCH
if(!(sh.sigflag[SIGWINCH]&SH_SIGFAULT))
{
@ -761,6 +767,7 @@ void ed_setup(register Edit_t *ep, int fd, int reedit)
if(pp-ep->e_prompt > qlen)
ep->e_plen = pp - ep->e_prompt - qlen;
*pp = 0;
#if SHOPT_ESH || SHOPT_VSH
if(!ep->e_multiline && (ep->e_wsize -= ep->e_plen) < 7)
{
register int shift = 7-ep->e_wsize;
@ -770,6 +777,7 @@ void ed_setup(register Edit_t *ep, int fd, int reedit)
ep->e_plen -= shift;
last[-ep->e_plen-2] = '\r';
}
#endif /* SHOPT_ESH || SHOPT_VSH */
sfsync(sfstderr);
if(fd == sffileno(sfstderr))
{
@ -789,6 +797,7 @@ void ed_setup(register Edit_t *ep, int fd, int reedit)
sfset(sfstderr,SF_READ,1);
sfwrite(sfstderr,ep->e_outptr,0);
ep->e_eol = reedit;
#if SHOPT_ESH || SHOPT_VSH
if(ep->e_multiline)
{
#if defined(_pth_tput) && (_tput_terminfo || _tput_termcap)
@ -822,6 +831,7 @@ void ed_setup(register Edit_t *ep, int fd, int reedit)
#endif
ep->e_wsize = MAXLINE - (ep->e_plen+1);
}
#endif /* SHOPT_ESH || SHOPT_VSH */
if(ep->e_default && (pp = nv_getval(ep->e_default)))
{
n = strlen(pp);
@ -887,14 +897,13 @@ int ed_read(void *context, int fd, char *buff, int size, int reedit)
{
if(sh.trapnote&(SH_SIGSET|SH_SIGTRAP))
goto done;
#if SHOPT_ESH || SHOPT_VSH
#if SHOPT_ESH && SHOPT_VSH
if(sh.winch && sh_isstate(SH_INTERACTIVE) && (sh_isoption(SH_VI) || sh_isoption(SH_EMACS) || sh_isoption(SH_GMACS)))
#elif SHOPT_ESH
if(sh.winch && sh_isstate(SH_INTERACTIVE) && (sh_isoption(SH_EMACS) || sh_isoption(SH_GMACS)))
#elif SHOPT_VSH
if(sh.winch && sh_isstate(SH_INTERACTIVE) && sh_isoption(SH_VI))
#else
if(0)
if(sh.winch && sh_isstate(SH_INTERACTIVE) && sh_isoption(SH_VI))
#endif
{
/* redraw the prompt after receiving SIGWINCH */
@ -939,6 +948,7 @@ int ed_read(void *context, int fd, char *buff, int size, int reedit)
emacs_redraw(ep->e_emacs);
#endif
}
#endif /* SHOPT_ESH || SHOPT_VSH */
sh.winch = 0;
/* an interrupt that should be ignored */
errno = 0;