ncurses 6.2 - patch 20200627

[ncurses.git] / ncurses / tinfo / MKkeys_list.sh

diff --git a/ncurses/tinfo/MKkeys_list.sh b/ncurses/tinfo/MKkeys_list.sh
index 98d5b1379a1c6f5b160abba616d7848fc5af14c6..3b8beaee56f3aacf157ae0f41def67b3a255cc9e 100755 (executable)
--- a/ncurses/tinfo/MKkeys_list.sh
+++ b/ncurses/tinfo/MKkeys_list.sh
@@ -1,7 +1,8 @@
 #! /bin/sh
-# $Id: MKkeys_list.sh,v 1.2 2001/06/16 16:50:35 tom Exp $
+# $Id: MKkeys_list.sh,v 1.7 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2001 Free Software Foundation, Inc.                          #
+# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2001-2003,2017 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"), #
@@ -30,16 +31,21 @@
 #
 # MKkey_defs.sh -- generate list of function-keys for terminfo database
 #
-# Author: Thomas E. Dickey <dickey@herndon4.his.com> 2001
+# Author: Thomas E. Dickey 2001
 #
 # Extract function-key names from the Caps file
 #
 : ${AWK-awk}
-DATA=${1-../../include/Caps}
+if test $# != 0
+then
+       DATA="$*"
+else
+       DATA=../../include/Caps
+fi
 
 data=data$$
-trap 'rm -f $data' 0 1 2 5 15
-sed -e 's/[    ]\+/    /g' < $DATA >$data
+trap 'rm -f $data' EXIT INT QUIT TERM HUP
+cat $DATA | sed -e 's/[        ][      ]*/     /g' >$data
 
 cat <<EOF
 # These definitions were generated by $0 $DATA
@@ -53,6 +59,7 @@ ${AWK-awk} <$data '
 /^#/           {next;}
 /^capalias/    {next;}
 /^infoalias/   {next;}
+/^userdef/     {next;}
 
 $5 != "-" {
                if (substr($5, 1, 4) == "KEY_" ) {