libncurses: Import https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.5.tar.gz changes
Change-Id: I3433d30ca01359fd2e3623ede96b531f0b39cbfa
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/misc/run_tic.in b/misc/run_tic.in
index 784f9f4..bd11c4c 100644
--- a/misc/run_tic.in
+++ b/misc/run_tic.in
@@ -1,7 +1,8 @@
#!@SHELL@
-# $Id: run_tic.in,v 1.34 2012/10/06 19:00:51 tom Exp $
+# $Id: run_tic.in,v 1.40 2022/07/16 19:37:03 tom Exp $
##############################################################################
-# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. #
+# Copyright 2019-2020,2022 Thomas E. Dickey #
+# Copyright 2000-2012,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"), #
@@ -36,26 +37,25 @@
# Assumes:
# The leaf directory names (lib, tabset, terminfo)
#
-echo '** Building terminfo database, please wait...'
+echo "** Building terminfo database, please wait..."
#
# The script is designed to be run from the misc/Makefile as
# make install.data
-: ${suffix:=@EXEEXT@}
-: ${DESTDIR:=@DESTDIR@}
-: ${prefix:=@prefix@}
-: ${exec_prefix:=@exec_prefix@}
-: ${bindir:=@bindir@}
-: ${top_srcdir:=@top_srcdir@}
-: ${srcdir:=@srcdir@}
-: ${datarootdir:=@datarootdir@}
-: ${datadir:=@datadir@}
-: ${TIC_PATH:=@TIC_PATH@}
-: ${ticdir:=@TERMINFO@}
-: ${source:=@TERMINFO_SRC@}
-: ${LN_S:="@LN_S@"}
-: ${cross_compiling:=no}
-: ${ext_funcs:=@NCURSES_EXT_FUNCS@}
+: "${suffix:=@EXEEXT@}"
+: "${DESTDIR:=@DESTDIR@}"
+: "${prefix:=@prefix@}"
+: "${exec_prefix:=@exec_prefix@}"
+: "${bindir:=@bindir@}"
+: "${top_srcdir:=@top_srcdir@}"
+: "${srcdir:=@srcdir@}"
+: "${datarootdir:=@datarootdir@}"
+: "${datadir:=@datadir@}"
+: "${TIC_PATH:=@TIC@}"
+: "${ticdir:=@TERMINFO@}"
+: "${source:=@TERMINFO_SRC@}"
+: "${cross_compiling:=no}"
+: "${ext_funcs:=@NCURSES_EXT_FUNCS@}"
test -z "${DESTDIR}" && DESTDIR=
@@ -84,7 +84,7 @@
fi
elif test "$TIC_PATH" = unknown
then
- echo '? no tic program found'
+ echo "? no tic program found"
exit 1
fi
else
@@ -105,25 +105,32 @@
export SHLIB_HOST
# don't use user's TERMINFO variable
-TERMINFO=${DESTDIR}$ticdir ; export TERMINFO
+unset TERMINFO_DIRS
+TERMINFO="${DESTDIR}$ticdir" ; export TERMINFO
umask 022
# Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo.
-TICDIR=`echo $TERMINFO | sed -e 's%/share/\([^/]*\)$%/lib/\1%'`
+TICDIR=`echo "$TERMINFO" | sed -e 's%/share/\([^/]*\)$%/lib/\1%'`
# Parent directory may not exist, which would confuse the install for hashed
# database. Fix.
PARENT=`echo "$TERMINFO" | sed -e 's%/[^/]*$%%'`
if test -n "$PARENT"
then
- test -d $PARENT || mkdir -p $PARENT
+ mkdir -p "$PARENT"
fi
# Remove the old terminfo stuff; we don't care if it existed before, and it
# would generate a lot of confusing error messages if we tried to overwrite it.
# We explicitly remove its contents rather than the directory itself, in case
# the directory is actually a symbolic link.
-( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
+if test -d "$TERMINFO"
+then
+ ( cd "$TERMINFO" && rm -fr ./? 2>/dev/null )
+elif test -f "$TERMINFO.db"
+then
+ ( rm -f "$TERMINFO.db" 2>/dev/null )
+fi
if test "$ext_funcs" = 1 ; then
cat <<EOF
@@ -137,11 +144,12 @@
document, and install the terminfo without the -x option.
EOF
-if ( $TIC_PATH -x -s -o $TERMINFO $source )
+$TIC_PATH -V
+if ( $TIC_PATH -x -s -o "$TERMINFO" $source )
then
- echo '** built new '$TERMINFO
+ echo "** built new $TERMINFO"
else
- echo '? tic could not build '$TERMINFO
+ echo "? tic could not build $TERMINFO"
exit 1
fi
else
@@ -156,11 +164,12 @@
document, and install the terminfo without the -x option.
EOF
-if ( $TIC_PATH -s -o $TERMINFO $source )
+$TIC_PATH -V
+if ( $TIC_PATH -s -o "$TERMINFO" $source )
then
- echo '** built new '$TERMINFO
+ echo "** built new $TERMINFO"
else
- echo '? tic could not build '$TERMINFO
+ echo "? tic could not build $TERMINFO"
exit 1
fi
fi
@@ -170,12 +179,12 @@
# all systems support symbolic links, and those that do provide a variety
# of options for 'test'.
if test "$TICDIR" != "$TERMINFO" ; then
- ( rm -f $TICDIR 2>/dev/null )
- if ( cd $TICDIR 2>/dev/null )
+ ( rm -f "$TICDIR" 2>/dev/null )
+ if ( cd "$TICDIR" 2>/dev/null )
then
- cd $TICDIR
+ cd "$TICDIR" || exit
TICDIR=`pwd`
- if test $TICDIR != $TERMINFO ; then
+ if test "$TICDIR " != "$TERMINFO "; then
# Well, we tried. Some systems lie to us, so the
# installer will have to double-check.
echo "Verify if $TICDIR and $TERMINFO are the same."
@@ -183,18 +192,18 @@
echo "Otherwise, remove $TICDIR and link it to $TERMINFO."
fi
else
- cd ${DESTDIR}$prefix
+ cd ${DESTDIR}$prefix || exit
# Construct a symbolic link that only assumes $ticdir has the
# same $prefix as the other installed directories.
RELATIVE=`echo $ticdir|sed -e 's%^'$prefix'/%%'`
if test "$RELATIVE" != "$ticdir" ; then
RELATIVE=../`echo $ticdir|sed -e 's%^'$prefix'/%%' -e 's%^/%%'`
fi
- if ( @LN_S@ $RELATIVE $TICDIR )
+ if ( @LN_S@ "$RELATIVE" "$TICDIR" )
then
- echo '** sym-linked '$TICDIR' for compatibility'
+ echo "** sym-linked $TICDIR for compatibility"
else
- echo '** could not sym-link '$TICDIR' for compatibility'
+ echo "** could not sym-link $TICDIR for compatibility"
fi
fi
fi