diff options
| -rw-r--r-- | bin/sh/trap.c | 25 | ||||
| -rw-r--r-- | tools/regression/bin/sh/builtins/trap5.0 | 19 |
2 files changed, 33 insertions, 11 deletions
diff --git a/bin/sh/trap.c b/bin/sh/trap.c index 2b3a4d3..d2e5308 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -153,8 +153,18 @@ trapcmd(int argc, char **argv) char *action; int signo; int errors = 0; + int i; + + while ((i = nextopt("l")) != '\0') { + switch (i) { + case 'l': + printsignals(); + return (0); + } + } + argv = argptr; - if (argc <= 1) { + if (*argv == NULL) { for (signo = 0 ; signo < sys_nsig ; signo++) { if (signo < NSIG && trap[signo] != NULL) { out1str("trap -- "); @@ -171,19 +181,12 @@ trapcmd(int argc, char **argv) return 0; } action = NULL; - if (*++argv && strcmp(*argv, "--") == 0) - argv++; if (*argv && sigstring_to_signum(*argv) == -1) { - if ((*argv)[0] != '-') { - action = *argv; + if (strcmp(*argv, "-") == 0) argv++; - } else if ((*argv)[1] == '\0') { + else { + action = *argv; argv++; - } else if ((*argv)[1] == 'l' && (*argv)[2] == '\0') { - printsignals(); - return 0; - } else { - error("bad option %s", *argv); } } while (*argv) { diff --git a/tools/regression/bin/sh/builtins/trap5.0 b/tools/regression/bin/sh/builtins/trap5.0 new file mode 100644 index 0000000..56e0fb1 --- /dev/null +++ b/tools/regression/bin/sh/builtins/trap5.0 @@ -0,0 +1,19 @@ +# $FreeBSD$ + +set -e +trap - USR1 +initial=$(trap) +trap -- -l USR1 +added=$(trap) +[ -n "$added" ] +trap - USR1 +second=$(trap) +[ "$initial" = "$second" ] +eval "$added" +added2=$(trap) +added3=$(trap --) +[ "$added" = "$added2" ] +[ "$added2" = "$added3" ] +trap -- - USR1 +third=$(trap) +[ "$initial" = "$third" ] |
