ncurses 6.3 - patch 20220402

[ncurses.git] / progs / capconvert

diff --git a/progs/capconvert b/progs/capconvert
index a3535bd4a570ecea7759727c0855c4887681eee8..ea76f312497cc09b1064f09fa235bcc6fbaba939 100755 (executable)
--- a/progs/capconvert
+++ b/progs/capconvert
@@ -1,6 +1,7 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.                #
+# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
+# Copyright 1998-2011,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"), #
@@ -26,7 +27,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: capconvert,v 1.8 2020/01/18 17:02:38 tom Exp $
+# $Id: capconvert,v 1.11 2022/02/05 20:39:49 tom Exp $
 #
 # capconvert -- automated conversion from termcap to terminfo
 #
@@ -94,7 +95,7 @@ else
 fi
 echo "";
 
-# Check if test -x works (it's not portable, but useful)
+# Check if test -x works (it is not portable, but useful)
 OPT="-x"
 TMP=test$$; touch $TMP && chmod 755 $TMP
 if test $OPT $TMP ; then
@@ -205,7 +206,8 @@ echo "OK, now I will make your private terminfo tree.  This may take a bit..."
 #
 # Kluge alert: we compile terminfo.src in two pieces because a lot of machines
 # with < 16MB RAM choke on tic's core-hog habits.
-trap "rm -f tsplit$$.*" EXIT INT QUIT TERM HUP
+trap "rm -f tsplit$$.*; exit 1" 1 2 3 15
+trap "rm -f tsplit$$.*" 0
 sed -n $master \
        -e '1,/SPLIT HERE/w 'tsplit$$.01 \
        -e '/SPLIT HERE/,$w 'tsplit$$.02 \
@@ -226,7 +228,7 @@ fi
 
 # OK, here comes the nasty case...user has a TERMCAP.  Instead of
 # trying to follow all the convolutions of the relationship between
-# TERM and TERMCAP (partly because it's too painful, and partly because
+# TERM and TERMCAP (partly because it is too painful, and partly because
 # we don't actually know what TERM will be nor even if it always has
 # the same value for this user) we do the following three steps...