From 835b3ea801782fcf72ef1f9397bb112cac0e2f50 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 26 Nov 2022 15:25:44 +0100 Subject: In 'trap' commands, prefer symbolic to numeric signal names. Reported by Mike Fulton in . * gnulib-tool: Use symbolic signal names. * posix-modules: Likewise. * MODULES.html.sh: Likewise. * build-aux/bootstrap (prepare_GNULIB_SRCDIR): Likewise. * build-aux/csharpcomp.sh.in: Likewise. * build-aux/gnu-web-doc-update: Likewise. * top/autogen.sh: Likewise. * top/bootstrap-funclib.sh: Likewise. * top/gitsub.sh: Likewise. * lib/t-idcache: Likewise. * tests/havelib/rpath-1: Likewise. * tests/havelib/rpath-2_a: Likewise. * tests/havelib/rpath-2_b: Likewise. * tests/havelib/rpath-3_a: Likewise. * tests/havelib/rpath-3_b: Likewise. * tests/init.sh: Likewise. * tests/test-binary-io.sh: Likewise. * tests/test-c-stack.sh: Likewise. * tests/test-c-stack2.sh: Likewise. * tests/test-dprintf-posix.sh: Likewise. * tests/test-fpending.sh: Likewise. * tests/test-fprintf-posix.sh: Likewise. * tests/test-lseek.sh: Likewise. * tests/test-printf-posix.sh: Likewise. * tests/test-select-in.sh: Likewise. * tests/test-select-out.sh: Likewise. * tests/test-sigpipe.sh: Likewise. * tests/test-tsearch.sh: Likewise. * tests/test-update-copyright.sh: Likewise. * tests/test-vdprintf-posix.sh: Likewise. * tests/test-vfprintf-posix.sh: Likewise. * tests/test-vprintf-posix.sh: Likewise. * tests/test-xprintf-posix.sh: Likewise. * tests/uniwidth/test-uc_width2.sh: Likewise. --- MODULES.html.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'MODULES.html.sh') diff --git a/MODULES.html.sh b/MODULES.html.sh index d48912b13e..02cfe32f06 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -3627,15 +3627,15 @@ func_all_modules () func_tmpdir trap 'exit_status=$? - if test "$signal" != 0; then - echo "caught signal $signal" >&2 + if test "$signal" != EXIT; then + echo "caught signal SIG$signal" >&2 fi rm -rf "$tmp" - exit $exit_status' 0 -for signal in 1 2 3 13 15; do + exit $exit_status' EXIT +for signal in HUP INT QUIT PIPE TERM; do trap '{ signal='$signal'; func_exit 1; }' $signal done -signal=0 +signal=EXIT echo '' func_begin HTML @@ -3736,8 +3736,8 @@ func_end HTML rm -rf "$tmp" # Undo the effect of the previous 'trap' command. -trap '' 0 -trap 'func_exit $?' 1 2 3 13 15 +trap '' EXIT +trap 'func_exit $?' HUP INT QUIT PIPE TERM exit 0 -- cgit v1.2.1