|
|
|
@@ -22,7 +22,7 @@
|
|
|
|
|
20 files changed, 248 insertions(+), 81 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- aclocal.m4
|
|
|
|
|
+++ aclocal.m4 2018-09-03 11:10:47.463968995 +0000
|
|
|
|
|
+++ aclocal.m4 2018-10-22 11:24:00.496347203 +0000
|
|
|
|
|
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
|
|
|
|
|
AC_CACHE_VAL(cf_cv_type_of_bool,[
|
|
|
|
|
rm -f cf_test.out
|
|
|
|
@@ -32,7 +32,7 @@
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
|
|
#if defined(__cplusplus)
|
|
|
|
|
@@ -4940,12 +4940,15 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -4945,12 +4945,15 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
echo '? missing rename for '\$cf_source
|
|
|
|
|
cf_target="\$cf_source"
|
|
|
|
|
fi
|
|
|
|
@@ -50,7 +50,7 @@
|
|
|
|
|
sed -f $cf_man_alias \\
|
|
|
|
|
CF_EOF
|
|
|
|
|
|
|
|
|
|
@@ -4955,7 +4958,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -4960,7 +4963,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
CF_EOF
|
|
|
|
|
else
|
|
|
|
|
cat >>$cf_edit_man <<CF_EOF
|
|
|
|
@@ -59,7 +59,7 @@
|
|
|
|
|
CF_EOF
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -4995,7 +4998,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5000,7 +5003,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
mv \$TMP.$cf_so_strip \$TMP
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
@@ -68,7 +68,7 @@
|
|
|
|
|
CF_EOF
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -5004,23 +5007,23 @@ case "$MANPAGE_FORMAT" in
|
|
|
|
|
@@ -5009,23 +5012,23 @@ case "$MANPAGE_FORMAT" in
|
|
|
|
|
cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
if test \$form = format ; then
|
|
|
|
|
# BSDI installs only .0 suffixes in the cat directories
|
|
|
|
@@ -98,7 +98,7 @@
|
|
|
|
|
for cf_alias in \$aliases
|
|
|
|
|
do
|
|
|
|
|
if test \$section = 1 ; then
|
|
|
|
|
@@ -5029,7 +5032,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5034,7 +5037,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
|
|
|
|
|
if test "$MANPAGE_SYMLINKS" = yes ; then
|
|
|
|
|
if test -f \$cf_alias\${suffix} ; then
|
|
|
|
@@ -107,7 +107,7 @@
|
|
|
|
|
then
|
|
|
|
|
continue
|
|
|
|
|
fi
|
|
|
|
|
@@ -5039,18 +5042,18 @@ CF_EOF
|
|
|
|
|
@@ -5044,18 +5047,18 @@ CF_EOF
|
|
|
|
|
case "x$LN_S" in
|
|
|
|
|
(*-f)
|
|
|
|
|
cat >>$cf_edit_man <<CF_EOF
|
|
|
|
@@ -129,7 +129,7 @@
|
|
|
|
|
echo ".so \$cf_source" >\$TMP
|
|
|
|
|
CF_EOF
|
|
|
|
|
if test -n "$cf_compress" ; then
|
|
|
|
|
@@ -5070,9 +5073,9 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5075,9 +5078,9 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
elif test \$verb = removing ; then
|
|
|
|
@@ -142,7 +142,7 @@
|
|
|
|
|
)
|
|
|
|
|
test -d \$cf_subdir\${section} &&
|
|
|
|
|
test -n "\$aliases" && (
|
|
|
|
|
@@ -5092,6 +5095,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -5097,6 +5100,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
# echo ".hy 0"
|
|
|
|
|
cat \$TMP
|
|
|
|
|
fi
|
|
|
|
@@ -151,8 +151,8 @@
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
--- configure
|
|
|
|
|
+++ configure 2018-09-03 11:10:47.467968924 +0000
|
|
|
|
|
@@ -5474,7 +5474,7 @@ echo $ECHO_N "checking for an rpath opti
|
|
|
|
|
+++ configure 2018-10-22 11:24:00.500347127 +0000
|
|
|
|
|
@@ -5484,7 +5484,7 @@ echo $ECHO_N "checking for an rpath opti
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
(linux*|gnu*|k*bsd*-gnu|freebsd*)
|
|
|
|
@@ -161,7 +161,7 @@
|
|
|
|
|
;;
|
|
|
|
|
(openbsd[2-9].*|mirbsd*)
|
|
|
|
|
LD_RPATH_OPT="-Wl,-rpath,"
|
|
|
|
|
@@ -13529,12 +13529,15 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -13561,12 +13561,15 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
echo '? missing rename for '\$cf_source
|
|
|
|
|
cf_target="\$cf_source"
|
|
|
|
|
fi
|
|
|
|
@@ -179,7 +179,7 @@
|
|
|
|
|
sed -f $cf_man_alias \\
|
|
|
|
|
CF_EOF
|
|
|
|
|
|
|
|
|
|
@@ -13544,7 +13547,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -13576,7 +13579,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
CF_EOF
|
|
|
|
|
else
|
|
|
|
|
cat >>$cf_edit_man <<CF_EOF
|
|
|
|
@@ -188,7 +188,7 @@
|
|
|
|
|
CF_EOF
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -13584,7 +13587,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -13616,7 +13619,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
mv \$TMP.$cf_so_strip \$TMP
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
@@ -197,7 +197,7 @@
|
|
|
|
|
CF_EOF
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -13593,23 +13596,23 @@ case "$MANPAGE_FORMAT" in
|
|
|
|
|
@@ -13625,23 +13628,23 @@ case "$MANPAGE_FORMAT" in
|
|
|
|
|
cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
if test \$form = format ; then
|
|
|
|
|
# BSDI installs only .0 suffixes in the cat directories
|
|
|
|
@@ -227,7 +227,7 @@
|
|
|
|
|
for cf_alias in \$aliases
|
|
|
|
|
do
|
|
|
|
|
if test \$section = 1 ; then
|
|
|
|
|
@@ -13618,7 +13621,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -13650,7 +13653,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
|
|
|
|
|
if test "$MANPAGE_SYMLINKS" = yes ; then
|
|
|
|
|
if test -f \$cf_alias\${suffix} ; then
|
|
|
|
@@ -236,7 +236,7 @@
|
|
|
|
|
then
|
|
|
|
|
continue
|
|
|
|
|
fi
|
|
|
|
|
@@ -13628,18 +13631,18 @@ CF_EOF
|
|
|
|
|
@@ -13660,18 +13663,18 @@ CF_EOF
|
|
|
|
|
case "x$LN_S" in
|
|
|
|
|
(*-f)
|
|
|
|
|
cat >>$cf_edit_man <<CF_EOF
|
|
|
|
@@ -258,7 +258,7 @@
|
|
|
|
|
echo ".so \$cf_source" >\$TMP
|
|
|
|
|
CF_EOF
|
|
|
|
|
if test -n "$cf_compress" ; then
|
|
|
|
|
@@ -13659,9 +13662,9 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -13691,9 +13694,9 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
elif test \$verb = removing ; then
|
|
|
|
@@ -271,7 +271,7 @@
|
|
|
|
|
)
|
|
|
|
|
test -d \$cf_subdir\${section} &&
|
|
|
|
|
test -n "\$aliases" && (
|
|
|
|
|
@@ -13681,6 +13684,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
@@ -13713,6 +13716,7 @@ cat >>$cf_edit_man <<CF_EOF
|
|
|
|
|
# echo ".hy 0"
|
|
|
|
|
cat \$TMP
|
|
|
|
|
fi
|
|
|
|
@@ -279,7 +279,7 @@
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
|
|
|
|
@@ -24143,6 +24147,7 @@ if test "$with_termlib" != no ; then
|
|
|
|
|
@@ -24175,6 +24179,7 @@ if test "$with_termlib" != no ; then
|
|
|
|
|
TINFO_LDFLAGS="-L${LIB_DIR}"
|
|
|
|
|
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
|
|
|
|
|
fi
|
|
|
|
@@ -288,7 +288,7 @@
|
|
|
|
|
# the next lines are needed for linking libtic over libncurses
|
|
|
|
|
TINFO_NAME=${LIB_NAME}
|
|
|
|
|
--- include/curses.h.in
|
|
|
|
|
+++ include/curses.h.in 2018-09-03 11:10:47.467968924 +0000
|
|
|
|
|
+++ include/curses.h.in 2018-10-22 11:24:00.500347127 +0000
|
|
|
|
|
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
|
|
|
|
|
typedef @cf_cv_typeof_mmask_t@ mmask_t;
|
|
|
|
|
#endif
|
|
|
|
@@ -300,7 +300,7 @@
|
|
|
|
|
* We need FILE, etc. Include this before checking any feature symbols.
|
|
|
|
|
*/
|
|
|
|
|
--- include/termcap.h.in
|
|
|
|
|
+++ include/termcap.h.in 2018-09-03 11:10:47.467968924 +0000
|
|
|
|
|
+++ include/termcap.h.in 2018-10-22 11:24:00.500347127 +0000
|
|
|
|
|
@@ -46,6 +46,8 @@ extern "C"
|
|
|
|
|
{
|
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
@@ -311,7 +311,7 @@
|
|
|
|
|
|
|
|
|
|
#undef NCURSES_OSPEED
|
|
|
|
|
--- include/tic.h
|
|
|
|
|
+++ include/tic.h 2018-09-03 11:10:47.467968924 +0000
|
|
|
|
|
+++ include/tic.h 2018-10-22 11:24:00.500347127 +0000
|
|
|
|
|
@@ -221,12 +221,12 @@ struct alias
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
@@ -328,7 +328,7 @@
|
|
|
|
|
#define CANCELLED_STRING (char *)(-1)
|
|
|
|
|
|
|
|
|
|
--- man/man_db.renames
|
|
|
|
|
+++ man/man_db.renames 2018-09-03 11:10:47.467968924 +0000
|
|
|
|
|
+++ man/man_db.renames 2018-10-22 11:24:00.500347127 +0000
|
|
|
|
|
@@ -163,6 +163,7 @@ term.7 term.7
|
|
|
|
|
term_variables.3x terminfo_variables.3ncurses
|
|
|
|
|
terminfo.5 terminfo.5
|
|
|
|
@@ -346,7 +346,7 @@
|
|
|
|
|
#
|
|
|
|
|
getty.1 getty.8
|
|
|
|
|
--- man/ncurses.3x
|
|
|
|
|
+++ man/ncurses.3x 2018-09-03 11:10:47.467968924 +0000
|
|
|
|
|
+++ man/ncurses.3x 2018-10-22 11:24:00.500347127 +0000
|
|
|
|
|
@@ -139,6 +139,10 @@ after the shell environment variable \fB
|
|
|
|
|
[See \fBterminfo\fR(\*n) for further details.]
|
|
|
|
|
.SS Datatypes
|
|
|
|
@@ -359,7 +359,7 @@
|
|
|
|
|
called \fIwindows\fR, which can be thought of as two-dimensional
|
|
|
|
|
arrays of characters representing all or part of a CRT screen.
|
|
|
|
|
--- misc/gen-pkgconfig.in
|
|
|
|
|
+++ misc/gen-pkgconfig.in 2018-09-03 11:10:47.467968924 +0000
|
|
|
|
|
+++ misc/gen-pkgconfig.in 2018-10-22 11:24:00.500347127 +0000
|
|
|
|
|
@@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
@@ -399,7 +399,7 @@
|
|
|
|
|
|
|
|
|
|
if test $name = $MAIN_LIBRARY
|
|
|
|
|
--- misc/ncurses-config.in
|
|
|
|
|
+++ misc/ncurses-config.in 2018-09-03 11:10:47.467968924 +0000
|
|
|
|
|
+++ misc/ncurses-config.in 2018-10-22 11:24:00.500347127 +0000
|
|
|
|
|
@@ -100,7 +100,7 @@ while test $# -gt 0; do
|
|
|
|
|
# compile/link
|
|
|
|
|
--cflags)
|
|
|
|
@@ -410,7 +410,7 @@
|
|
|
|
|
fi
|
|
|
|
|
if test "${includedir}" != /usr/include ; then
|
|
|
|
|
--- misc/terminfo.src
|
|
|
|
|
+++ misc/terminfo.src 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ misc/terminfo.src 2018-10-22 11:24:00.508346978 +0000
|
|
|
|
|
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
|
|
|
|
|
am,
|
|
|
|
|
cols#80,
|
|
|
|
@@ -795,7 +795,7 @@
|
|
|
|
|
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
|
|
|
|
|
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
|
|
|
|
|
--- ncurses/Makefile.in
|
|
|
|
|
+++ ncurses/Makefile.in 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ ncurses/Makefile.in 2018-10-22 11:24:00.508346978 +0000
|
|
|
|
|
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
|
|
|
|
|
../lib : ; mkdir $@
|
|
|
|
|
|
|
|
|
@@ -806,7 +806,7 @@
|
|
|
|
|
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
|
|
|
|
|
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
|
|
|
|
|
--- ncurses/curses.priv.h
|
|
|
|
|
+++ ncurses/curses.priv.h 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ ncurses/curses.priv.h 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -2184,6 +2184,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
|
|
|
|
|
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
|
|
|
|
|
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
|
|
|
|
@@ -817,7 +817,7 @@
|
|
|
|
|
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
|
|
|
|
|
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
|
|
|
|
|
--- ncurses/run_cmd.sh
|
|
|
|
|
+++ ncurses/run_cmd.sh 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ ncurses/run_cmd.sh 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -0,0 +1,11 @@
|
|
|
|
|
+#!/bin/sh
|
|
|
|
|
+
|
|
|
|
@@ -831,7 +831,7 @@
|
|
|
|
|
+
|
|
|
|
|
+exec ${1+"$@"}
|
|
|
|
|
--- ncurses/tinfo/MKfallback.sh
|
|
|
|
|
+++ ncurses/tinfo/MKfallback.sh 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ ncurses/tinfo/MKfallback.sh 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -68,6 +68,12 @@ else
|
|
|
|
|
tmp_info=
|
|
|
|
|
fi
|
|
|
|
@@ -864,7 +864,7 @@
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
--- ncurses/tinfo/access.c
|
|
|
|
|
+++ ncurses/tinfo/access.c 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ ncurses/tinfo/access.c 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -35,6 +35,9 @@
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
|
|
@@ -907,7 +907,7 @@
|
|
|
|
|
_nc_access(const char *path, int mode)
|
|
|
|
|
{
|
|
|
|
|
--- ncurses/tinfo/lib_setup.c
|
|
|
|
|
+++ ncurses/tinfo/lib_setup.c 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ ncurses/tinfo/lib_setup.c 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
|
|
|
|
|
} else if ((value = tigetnum("U8")) >= 0) {
|
|
|
|
|
result = value; /* use extension feature */
|
|
|
|
@@ -919,7 +919,7 @@
|
|
|
|
|
result = 1; /* always broken */
|
|
|
|
|
} else if (strstr(env, "screen") != 0
|
|
|
|
|
--- ncurses/tinfo/read_entry.c
|
|
|
|
|
+++ ncurses/tinfo/read_entry.c 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ ncurses/tinfo/read_entry.c 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
|
|
|
|
|
FILE *fp = 0;
|
|
|
|
|
int code;
|
|
|
|
@@ -937,7 +937,7 @@
|
|
|
|
|
return (code);
|
|
|
|
|
}
|
|
|
|
|
--- ncurses/tinfo/read_termcap.c
|
|
|
|
|
+++ ncurses/tinfo/read_termcap.c 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ ncurses/tinfo/read_termcap.c 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -322,14 +322,18 @@ _nc_getent(
|
|
|
|
|
*/
|
|
|
|
|
if (fd >= 0) {
|
|
|
|
@@ -984,7 +984,7 @@
|
|
|
|
|
}
|
|
|
|
|
if (copied != 0)
|
|
|
|
|
--- progs/Makefile.in
|
|
|
|
|
+++ progs/Makefile.in 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ progs/Makefile.in 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
|
|
|
|
|
CFLAGS_NORMAL = $(CCFLAGS)
|
|
|
|
|
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
|
|
|
|
@@ -1004,7 +1004,7 @@
|
|
|
|
|
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
|
|
|
|
|
|
|
|
|
|
--- test/test.priv.h
|
|
|
|
|
+++ test/test.priv.h 2018-09-03 11:10:47.479968708 +0000
|
|
|
|
|
+++ test/test.priv.h 2018-10-22 11:24:00.512346905 +0000
|
|
|
|
|
@@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|