[src/trunk]: src/bin/ksh We don't need all this magic to build the signals li...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f80c4c2a7295
branches:  trunk
changeset: 344206:f80c4c2a7295
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 16 23:01:33 2016 +0000

description:
We don't need all this magic to build the signals lists. Do the work at
compile time.

diffstat:

 bin/ksh/Makefile   |   3 +--
 bin/ksh/siglist.sh |  40 +++++-----------------------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diffs (70 lines):

diff -r 68ea28ae3508 -r f80c4c2a7295 bin/ksh/Makefile
--- a/bin/ksh/Makefile  Wed Mar 16 22:36:40 2016 +0000
+++ b/bin/ksh/Makefile  Wed Mar 16 23:01:33 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.31 2015/01/29 20:46:31 joerg Exp $
+#      $NetBSD: Makefile,v 1.32 2016/03/16 23:01:33 christos Exp $
 
 WARNS=3
 CWARNFLAGS.clang+=     -Wno-error=cast-qual
@@ -22,7 +22,6 @@
 
 # Environment for scripts executed during build.
 SCRIPT_ENV= \
-       AWK=${TOOL_AWK:Q} \
        SED=${TOOL_SED:Q}
 
 CLEANFILES+=   siglist.out siglist.out.tmp
diff -r 68ea28ae3508 -r f80c4c2a7295 bin/ksh/siglist.sh
--- a/bin/ksh/siglist.sh        Wed Mar 16 22:36:40 2016 +0000
+++ b/bin/ksh/siglist.sh        Wed Mar 16 23:01:33 2016 +0000
@@ -1,44 +1,14 @@
 #!/bin/sh
-#      $NetBSD: siglist.sh,v 1.9 2011/01/23 17:11:55 hauke Exp $
+#      $NetBSD: siglist.sh,v 1.10 2016/03/16 23:01:33 christos Exp $
 #
 # Script to generate a sorted, complete list of signals, suitable
 # for inclusion in trap.c as array initializer.
 #
 
-set -e
-
-: ${AWK:=awk}
 : ${SED:=sed}
 
-in=tmpi$$.c
-out=tmpo$$.c
-ecode=1
-trapsigs='0 1 2 13 15'
-trap 'rm -f $in $out; trap 0; exit $ecode' $trapsigs
-
-CPP="${1-cc -E}"
-
 # The trap here to make up for a bug in bash (1.14.3(1)) that calls the trap
-(trap $trapsigs;
- echo '#include "sh.h"';
- echo '        { QwErTy SIGNALS , "DUMMY" , "hook for number of signals" },';
- ${SED} -e '/^[         ]*#/d' -e 's/^[         ]*\([^         ][^     ]*\)[    ][      ]*\(.*[^       ]\)[    ]*$/#ifdef SIG\1\
-       { QwErTy .signal = SIG\1 , .name = "\1", .mess = "\2" },\
-#endif/') > $in
-$CPP $in  > $out
-${SED} -n 's/{ QwErTy/{/p' < $out | ${AWK} '{print NR, $0}' | sort -k 5n -k 1n |
-    ${SED} 's/^[0-9]* //' |
-    ${AWK} 'BEGIN { last=0; nsigs=0; }
-       {
-           if ($4 ~ /^[0-9][0-9]*$/ && $5 == ",") {
-               n = $4;
-               if (n > 0 && n != last) {
-                   while (++last < n) {
-                       printf "\t{ .signal = %d , .name = NULL, .mess = `Signal %d` } ,\n", last, last;
-                   }
-                   print;
-               }
-           }
-       }' |
-    tr '`' '"' | grep -v '"DUMMY"'
-ecode=0
+
+${SED} -e '/^[  ]*#/d' -e 's/^[         ]*\([^         ][^     ]*\)[    ][      ]*\(.*[^       ]\)[    ]*$/#ifdef SIG\1\
+       { .signal = SIG\1 , .name = "\1", .mess = "\2" },\
+#endif/'