Avoid calling el_resize() from a signal handler, even though libedit
itself does that if you set EL_SIGNAL. Instead, set a flag and check it before calling el_gets(). This is safer, but slower to respond to changes. Pointed out by: mp
This commit is contained in:
parent
11e3f06011
commit
be58cc483e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=100588
@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include "alias.h"
|
||||
#include "parser.h"
|
||||
#include "myhistedit.h"
|
||||
#include "trap.h"
|
||||
|
||||
#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
|
||||
|
||||
@ -178,6 +179,12 @@ preadfd(void)
|
||||
int nr;
|
||||
parsenextc = parsefile->buf;
|
||||
|
||||
#ifndef NO_HISTORY
|
||||
if (el != NULL && gotwinch) {
|
||||
gotwinch = 0;
|
||||
el_resize(el);
|
||||
}
|
||||
#endif
|
||||
retry:
|
||||
#ifndef NO_HISTORY
|
||||
if (parsefile->fd == 0 && el) {
|
||||
|
@ -82,6 +82,7 @@ static char *volatile trap[NSIG]; /* trap handler commands */
|
||||
static volatile sig_atomic_t gotsig[NSIG];
|
||||
/* indicates specified signal received */
|
||||
static int ignore_sigchld; /* Used while handling SIGCHLD traps. */
|
||||
volatile sig_atomic_t gotwinch;
|
||||
|
||||
static int getsigaction(int, sig_t *);
|
||||
|
||||
@ -249,7 +250,7 @@ setsignal(int signo)
|
||||
#endif
|
||||
#ifndef NO_HISTORY
|
||||
case SIGWINCH:
|
||||
if (rootshell && iflag && el != NULL)
|
||||
if (rootshell && iflag)
|
||||
action = S_CATCH;
|
||||
break;
|
||||
#endif
|
||||
@ -369,7 +370,7 @@ onsig(int signo)
|
||||
|
||||
#ifndef NO_HISTORY
|
||||
if (signo == SIGWINCH)
|
||||
el_resize(el);
|
||||
gotwinch = 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -39,6 +39,7 @@
|
||||
|
||||
extern int pendingsigs;
|
||||
extern int in_dotrap;
|
||||
extern volatile sig_atomic_t gotwinch;
|
||||
|
||||
int trapcmd(int, char **);
|
||||
void clear_traps(void);
|
||||
|
Loading…
Reference in New Issue
Block a user