diff options
| author | tjr <tjr@FreeBSD.org> | 2002-07-24 02:06:07 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2002-07-24 02:06:07 +0000 |
| commit | 9c6ea7014edab1af5e2d1d262e39b740fd40312e (patch) | |
| tree | 944ac64c9147450388579c5d5667cd68f728aeff /bin/sh/trap.c | |
| parent | 9ece963548fc032edefe665b4c0831dae7414292 (diff) | |
| download | FreeBSD-src-9c6ea7014edab1af5e2d1d262e39b740fd40312e.zip FreeBSD-src-9c6ea7014edab1af5e2d1d262e39b740fd40312e.tar.gz | |
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
Diffstat (limited to 'bin/sh/trap.c')
| -rw-r--r-- | bin/sh/trap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/sh/trap.c b/bin/sh/trap.c index 2ea182c..f848ee1 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -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 } |
