ncurses 6.2 - patch 20200816

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

diff --git a/ncurses/tinfo/MKfallback.sh b/ncurses/tinfo/MKfallback.sh
index 319ab066c8855d58f85f1b3113cb79f55b709183..64c65f197e0da11dcaf101e5adae9252c004f3e6 100755 (executable)
--- a/ncurses/tinfo/MKfallback.sh
+++ b/ncurses/tinfo/MKfallback.sh
@@ -27,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.24 2020/02/08 21:52:37 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
 #


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

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

 shift
 
 infocmp_path=$1
 shift
 
 infocmp_path=$1

+test -z "$infocmp_path" && infocmp_path=infocmp

 shift
 
 shift
 

-case $tic_path in #(vi
+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


@@ -67,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


@@ -90,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_path -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


@@ -101,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_path -e $x
+               "$infocmp_path" -e "$x"

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