ncurses 6.2 - patch 20210424

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

diff --git a/ncurses/tinfo/MKfallback.sh b/ncurses/tinfo/MKfallback.sh
index 4c4f39844d315faeb5bc680d453a1e0ee19b4359..64c65f197e0da11dcaf101e5adae9252c004f3e6 100755 (executable)
--- a/ncurses/tinfo/MKfallback.sh
+++ b/ncurses/tinfo/MKfallback.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 ##############################################################################
 #!/bin/sh
 ##############################################################################

-# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 1998-2019,2020 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"), #
 #                                                                            #
 # 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.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: MKfallback.sh,v 1.21 2017/04/12 00:50:50 tom Exp $
+# $Id: MKfallback.sh,v 1.25 2020/08/16 15:58:44 tom Exp $

 #
 # MKfallback.sh -- create fallback table for entry reads
 #
 #
 # MKfallback.sh -- create fallback table for entry reads
 #


@@ -43,9 +44,14 @@ terminfo_src=$1
 shift
 
 tic_path=$1
 shift
 
 tic_path=$1

+test -z "$tic_path" && tic_path=tic

 shift
 
 shift
 

-case $tic_path in #(vi
+infocmp_path=$1
+test -z "$infocmp_path" && infocmp_path=infocmp
+shift
+
+case "$tic_path" in #(vi

 /*)
        tic_head=`echo "$tic_path" | sed -e 's,/[^/]*$,,'`
        PATH=$tic_head:$PATH
 /*)
        tic_head=`echo "$tic_path" | sed -e 's,/[^/]*$,,'`
        PATH=$tic_head:$PATH


@@ -63,7 +69,7 @@ if test $# != 0 ; then
        TERMINFO_DIRS=$TERMINFO:$terminfo_dir
        export TERMINFO_DIRS
 
        TERMINFO_DIRS=$TERMINFO:$terminfo_dir
        export TERMINFO_DIRS
 

-       $tic_path -x $terminfo_src >&2
+       "$tic_path" -x "$terminfo_src" >&2

 else
        tmp_info=
 fi
 else
        tmp_info=
 fi


@@ -86,10 +92,10 @@ then
 
 /* fallback entries for: $* */
 EOF
 
 /* fallback entries for: $* */
 EOF

-       for x in $*
+       for x in "$@"

        do
                echo "/* $x */"
        do
                echo "/* $x */"

-               infocmp -E $x | sed -e 's/\<short\>/NCURSES_INT2/g'
+               "$infocmp_path" -E "$x" | sed -e 's/\<short\>/NCURSES_INT2/g'

        done
 
        cat <<EOF
        done
 
        cat <<EOF


@@ -97,10 +103,10 @@ static const TERMTYPE2 fallbacks[$#] =
 {
 EOF
        comma=""
 {
 EOF
        comma=""

-       for x in $*
+       for x in "$@"

        do
                echo "$comma /* $x */"
        do
                echo "$comma /* $x */"

-               infocmp -e $x
+               "$infocmp_path" -e "$x"

                comma=","
        done
 
                comma=","
        done
 


@@ -141,7 +147,7 @@ cat <<EOF
 #undef _nc_fallback
 
 /*
 #undef _nc_fallback
 
 /*

- * This entrypoint is used by tack.
+ * This entrypoint is used by tack 1.07

  */
 NCURSES_EXPORT(const TERMTYPE *)
 _nc_fallback (const char *name)
  */
 NCURSES_EXPORT(const TERMTYPE *)
 _nc_fallback (const char *name)