XFree86 3.9Pl - xterm patch #100 - 1999/5/3 - T.Dickey <dickey@clark.net>
# ------------------------------------------------------------------------------
# Makefile.in | 2 +-
# Tekproc.c | 2 +-
# aclocal.m4 | 2 +-
# charproc.c | 4 ++--
# configure | 4 ++--
# configure.in | 3 ++-
# main.c | 2 +-
# util.c | 2 +-
# version.h | 2 +-
# xterm.log.html | 22 ++++++++++++++++++----
# 10 files changed, 30 insertions, 15 deletions
# ------------------------------------------------------------------------------
Index: Makefile.in
--- xterm-99+/Makefile.in Mon May 3 16:47:48 1999
+++ xterm-100/Makefile.in Mon May 3 21:18:34 1999
@@ -102,7 +102,7 @@
@echo 'Use "make install-ti" to install terminfo description.'
install-ti:
- TERMINFO=@private_TERMINFO@ tic $(srcdir)/terminfo
+ @private_TERMINFO@ tic $(srcdir)/terminfo
installdirs: $(INSTALL_DIRS)
Index: Tekproc.c
--- xterm-99+/Tekproc.c Mon May 3 16:47:48 1999
+++ xterm-100/Tekproc.c Mon May 3 21:28:04 1999
@@ -675,7 +675,7 @@
screen->TnormalGC,
x,
y,
- &ch,
+ (char *)&ch,
1);
TCursorForward();
break;
Index: aclocal.m4
--- xterm-99+/aclocal.m4 Sun Apr 11 16:38:14 1999
+++ xterm-100/aclocal.m4 Mon May 3 06:47:18 1999
@@ -651,7 +651,7 @@
XTERM_MODE=755
AC_MSG_CHECKING(for presumed installation-mode)
if test -f "$XTERM_PATH" ; then
- ls -l $XTERM_PATH >conftest.out
+ ls -Ll $XTERM_PATH >conftest.out
read cf_mode cf_rest <conftest.out
case ".$cf_mode" in #(vi
.???s*)
Index: charproc.c
--- xterm-99+/charproc.c Mon May 3 16:47:48 1999
+++ xterm-100/charproc.c Mon May 3 21:27:36 1999
@@ -2622,8 +2622,8 @@
if (n >= limit) {
limit = (n + 1) * 2;
- lobyte = (Char *)XtRealloc(lobyte, limit);
- hibyte = (Char *)XtRealloc(hibyte, limit);
+ lobyte = (Char *)XtRealloc((char *)lobyte, limit);
+ hibyte = (Char *)XtRealloc((char *)hibyte, limit);
}
for (j = offset; j < offset+n; j++) {
k = j-offset;
Index: configure
--- xterm-99+/configure Mon May 3 16:47:48 1999
+++ xterm-100/configure Mon May 3 06:56:13 1999
@@ -3874,7 +3874,7 @@
echo $ac_n "checking for presumed installation-mode""... $ac_c" 1>&6
echo "configure:3876: checking for presumed installation-mode" >&5
if test -f "$XTERM_PATH" ; then
- ls -l $XTERM_PATH >conftest.out
+ ls -Ll $XTERM_PATH >conftest.out
read cf_mode cf_rest <conftest.out
case ".$cf_mode" in #(vi
.???s*)
@@ -4174,7 +4174,7 @@
else
private_TERMINFO=
fi
-
+test -n "$private_TERMINFO" && private_TERMINFO="TERMINFO=$private_TERMINFO"
### checks for optional features
echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
Index: configure.in
--- xterm-99+/configure.in Mon May 3 16:47:48 1999
+++ xterm-100/configure.in Mon May 3 21:18:34 1999
@@ -160,7 +160,8 @@
else
private_TERMINFO=
fi
-AC_SUBST(private_TERMINFO)
+test -n "$private_TERMINFO" && private_TERMINFO="TERMINFO=$private_TERMINFO"
+AC_SUBST(private_TERMINFO)dnl
### checks for optional features
AC_MSG_CHECKING(if you want active-icons)
Index: main.c
--- xterm-99+/main.c Mon May 3 16:47:48 1999
+++ xterm-100/main.c Mon May 3 21:18:34 1999
@@ -808,7 +808,7 @@
{"ptyInitialErase", "PtyInitialErase", XtRBoolean, sizeof (Boolean),
offset(ptyInitialErase), XtRString, "false"},
{"backarrowKeyIsErase", "BackarrowKeyIsErase", XtRBoolean, sizeof(Boolean),
- offset(backarrow_is_erase), XtRBoolean, "false"},
+ offset(backarrow_is_erase), XtRString, "false"},
#endif
{"waitForMap", "WaitForMap", XtRBoolean, sizeof (Boolean),
offset(wait_for_map), XtRString, "false"},
Index: util.c
--- xterm-99+/util.c Mon May 3 16:47:48 1999
+++ xterm-100/util.c Mon May 3 21:27:50 1999
@@ -1362,7 +1362,7 @@
static unsigned dlen;
if (dlen <= len) {
dlen = (len + 1) * 2;
- dbuf = (Char *)XtRealloc(dbuf, dlen);
+ dbuf = (Char *)XtRealloc((char *)dbuf, dlen);
memset(dbuf, 0, dlen);
}
text2 = dbuf;
Index: version.h
--- xterm-99+/version.h Mon May 3 16:47:48 1999
+++ xterm-100/version.h Mon May 3 21:18:34 1999
@@ -6,5 +6,5 @@
* XFree86 to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 99
+#define XTERM_PATCH 100
#define XFREE86_VERSION "XFree86 3.9Pk"
Index: xterm.log.html
--- xterm-99+/xterm.log.html Mon May 3 16:47:48 1999
+++ xterm-100/xterm.log.html Mon May 3 21:21:03 1999
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_100">Patch #100 - 1999/5/3 - XFree86 3.9Pl</A>
<LI><A HREF="#xterm_99">Patch #99 - 1999/5/2 - XFree86 3.9Pk</A>
<LI><A HREF="#xterm_98">Patch #98 - 1999/4/26 - XFree86 3.9Pk</A>
<LI><A HREF="#xterm_97">Patch #97 - 1999/4/25 - XFree86 3.9Pk</A>
@@ -143,6 +144,19 @@
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_100">Patch #100 - 1999/5/3 - XFree86 3.9Pl</A></H1>
+<ul>
+ <li>Correct a typo in the default resource value for
+ backarrowKeyIsErase: it was always true (reported by Bram
+ Moolenaar).
+
+ <li>improve configure script's test if the installed xterm is setuid,
+ in case that is a symbolic link.
+
+ <li>correct "install-ti" rule in Makefile.in, by not setting a blank
+ $TERMINFO value. That is interpreted as "." by ncurses' tic.
+</ul>
+
<H1><A NAME="xterm_99">Patch #99 - 1999/5/2 - XFree86 3.9Pk</A></H1>
<ul>
<li>correct logic that computes num_ptrs count of the number of indices
@@ -165,7 +179,7 @@
helpful for developers of code that output UTF-8 strings for
debugging. See the file utf-8-test.txt in
http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz for a
- demonstration text that contains numerous illegal UTF-8 values.
+ demonstration text that contains numerous illegal UTF-8 values.
(patch by Markus Kuhn).
<li>correct a place in ScrnRefresh where I was filling the high byte of
@@ -369,7 +383,7 @@
be suppressed properly (reported by Clint Olsen).
<li>integrated patch from Pavel Roskin
- <pavel_roskin@geocities.com>
+ <pavel_roskin@geocities.com>
for Linux-2.2.x with GLibc-2.1 and
/dev/ptmx support:
<ul>
@@ -385,8 +399,8 @@
<li>/dev/tty does exist in Linux, but it doesn't mean, it
should be used. Therefore EACCES is now an acceptable
- result.
-
+ result.
+
<li>ifdef'd several calls such as <code>ioctl (ptyfd, I_PUSH,
"ptem")</code> to build on Linux (I_PUSH is not defined when
sys/stropts.h is not included).