ncurses 6.1 - patch 20190413

[ncurses.git] / include / MKparametrized.sh

diff --git a/include/MKparametrized.sh b/include/MKparametrized.sh
index c6908b958649089698e3d01af5fbeeb22b25fa24..4c99d00fa3956bd955d857e0f18c6f221d3ddb28 100755 (executable)
--- a/include/MKparametrized.sh
+++ b/include/MKparametrized.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998-2014,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -26,14 +26,15 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKparametrized.sh,v 1.8 2017/07/22 16:32:27 tom Exp $
+# $Id: MKparametrized.sh,v 1.9 2019/04/13 20:36:24 tom Exp $
 #
 # MKparametrized.sh -- generate indirection vectors for various sort methods
 #
 # The output of this script is C source for an array specifying whether
 # termcap strings should undergo parameter and padding translation.
 #
-CAPS="${1-Caps}"
+[ $# = 0 ] && set - Caps
+
 cat <<EOF
 #ifndef PARAMETRIZED_H
 #define PARAMETRIZED_H 1
@@ -54,7 +55,14 @@ EOF
 # XENIX acs_* capabilities.  Maybe someday we'll dedicate a flag field for
 # this, that would be cleaner....
 
-${AWK-awk} <$CAPS '
+cat "$@" | ${AWK-awk} '
+
+/^#/ { next ; }
+/^capalias/ { next ; }
+/^infoalias/ { next ; }
+/^used_by/ { next ; }
+/^userdef/ { next ; }
+
 $3 != "str"            {next;}
 $1 ~ /^acs_/           {print "-1,\t/* ", $2, " */"; count++; next;}
 $1 ~ /^label_format/   {print "-1,\t/* ", $2, " */"; count++; next;}