diff options
| author | Jilles Tjoelker <jilles@FreeBSD.org> | 2017-05-07 19:49:46 +0000 |
|---|---|---|
| committer | Jilles Tjoelker <jilles@FreeBSD.org> | 2017-05-07 19:49:46 +0000 |
| commit | 3f2da875f7d1a7f4bc2fc9b85c20d3067e8f4f1e (patch) | |
| tree | 3657d98c02196e6e2e9e1dace387cb6361a0fd9e /bin | |
| parent | 853e9ff25c30acd8177c03f2129e5fcd1c3d7de1 (diff) | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sh/tests/builtins/Makefile | 1 | ||||
| -rw-r--r-- | bin/sh/tests/builtins/locale2.0 | 5 | ||||
| -rw-r--r-- | bin/sh/var.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile index b3e325507dd5..864c8767d034 100644 --- a/bin/sh/tests/builtins/Makefile +++ b/bin/sh/tests/builtins/Makefile @@ -120,6 +120,7 @@ ${PACKAGE}FILES+= local7.0 .if ${MK_NLS} != "no" ${PACKAGE}FILES+= locale1.0 .endif +${PACKAGE}FILES+= locale2.0 ${PACKAGE}FILES+= printf1.0 ${PACKAGE}FILES+= printf2.0 ${PACKAGE}FILES+= printf3.0 diff --git a/bin/sh/tests/builtins/locale2.0 b/bin/sh/tests/builtins/locale2.0 new file mode 100644 index 000000000000..86dd237ff54a --- /dev/null +++ b/bin/sh/tests/builtins/locale2.0 @@ -0,0 +1,5 @@ +# $FreeBSD$ + +$SH -c 'LC_ALL=C true; kill -INT $$; echo continued' +r=$? +[ "$r" -gt 128 ] && [ "$(kill -l "$r")" = INT ] diff --git a/bin/sh/var.c b/bin/sh/var.c index 491ebe952e6a..f533969a9b0a 100644 --- a/bin/sh/var.c +++ b/bin/sh/var.c @@ -513,7 +513,7 @@ bltinunsetlocale(void) if (localevar(cmdenviron->args[i])) { setlocale(LC_ALL, ""); updatecharset(); - return; + break; } } INTON; |