diff options
-rw-r--r-- | bin/sh/Makefile | 2 | ||||
-rw-r--r-- | bin/sh/trap.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/sh/Makefile b/bin/sh/Makefile index d6231e0..9baa955 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -13,7 +13,7 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} y.tab.h # MLINKS for Shell built in commands for which there are no userland # utilities of the same name are handled with the associated manpage, -# builtin.1 in share/man/man1/. +# builtin.1 in share/man/man1/. DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP} LDADD= -ll -ledit -ltermcap diff --git a/bin/sh/trap.c b/bin/sh/trap.c index 71a14ba..16ef0aa 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -75,7 +75,7 @@ MKINIT char sigmode[NSIG]; /* current value of signal */ int pendingsigs; /* indicates some signal received */ int in_dotrap; /* do we execute in a trap handler? */ static char *volatile trap[NSIG]; /* trap handler commands */ -static volatile sig_atomic_t gotsig[NSIG]; +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; @@ -375,12 +375,12 @@ onsig(int signo) /* If we are currently in a wait builtin, prepare to break it */ if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) breakwaitcmd = 1; - /* - * If a trap is set, not ignored and not the null command, we need + /* + * If a trap is set, not ignored and not the null command, we need * to make sure traps are executed even when a child blocks signals. */ if (Tflag && - trap[signo] != NULL && + trap[signo] != NULL && ! (trap[signo][0] == '\0') && ! (trap[signo][0] == ':' && trap[signo][1] == '\0')) breakwaitcmd = 1; |