Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xterm for openSUSE:Factory checked
in at 2022-11-20 19:46:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xterm (Old)
and /work/SRC/openSUSE:Factory/.xterm.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm"
Sun Nov 20 19:46:55 2022 rev:133 rq:1036787 version:376
Changes:
--------
--- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2022-11-14
14:28:59.542971746 +0100
+++ /work/SRC/openSUSE:Factory/.xterm.new.1597/xterm.changes 2022-11-20
19:46:56.805214499 +0100
@@ -1,0 +2,12 @@
+Fri Nov 18 21:21:02 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- update to 376:
+ * modify configure script to always check for gcc attributes,
+ * update install-sh.
+ * fix parsing of result -u in vttests/halves.pl.
+ * add a note in ctlseqs.ms about compatibility of TBC.
+ * fix a copy/paste error in manual (patch by Grady Martin).
+ * add null-pointer checks in x_strcasecmp and x_strncasecmp, to help
+ with error-recovery for a missing font (Debian #1022942).
+
+-------------------------------------------------------------------
Old:
----
xterm-375.tgz
xterm-375.tgz.asc
New:
----
xterm-376.tgz
xterm-376.tgz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.SAaagE/_old 2022-11-20 19:46:57.505218546 +0100
+++ /var/tmp/diff_new_pack.SAaagE/_new 2022-11-20 19:46:57.509218568 +0100
@@ -19,7 +19,7 @@
%define splitbin 0%{?suse_version} >= 1300
Name: xterm
-Version: 375
+Version: 376
Release: 0
Summary: The basic X terminal program
License: MIT
++++++ xterm-375.tgz -> xterm-376.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/MANIFEST new/xterm-376/MANIFEST
--- old/xterm-375/MANIFEST 2022-10-21 02:45:30.000000000 +0200
+++ new/xterm-376/MANIFEST 2022-10-30 11:48:25.000000000 +0100
@@ -1,4 +1,4 @@
-MANIFEST for xterm, version xterm-375
+MANIFEST for xterm, version xterm-376
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/NEWS new/xterm-376/NEWS
--- old/xterm-375/NEWS 2022-10-24 02:25:20.000000000 +0200
+++ new/xterm-376/NEWS 2022-11-17 02:18:26.000000000 +0100
@@ -1,13 +1,13 @@
The NEWS file was generated from xterm.log.html, which serves as the changelog
for xterm.
--------------------------------------------------------------------------------
- Patch #375 - 2022/10/23
+ Patch #376 - 2022/11/16
- * improve error-recovery when setting a bitmap font for the VT100
- window, e.g., in case OSC 50 failed, restoring the most recent
- valid font so that a subsequent OSC 50 reports this correctly
- (report by David Leadbeater).
- * exclude MC_XDG_OPEN from environment variables trimmed on startup
- (report by Gabor Hauzer).
- * check for null pointer in isSelect() (report by Column Paget).
+ * modify configure script to always check for gcc attributes,
+ * update install-sh.
+ * fix parsing of result -u in vttests/halves.pl.
+ * add a note in ctlseqs.ms about compatibility of TBC.
+ * fix a copy/paste error in manual (patch by Grady Martin).
+ * add null-pointer checks in x_strcasecmp and x_strncasecmp, to help
+ with error-recovery for a missing font (Debian #1022942).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/THANKS new/xterm-376/THANKS
--- old/xterm-375/THANKS 2022-09-12 23:10:13.000000000 +0200
+++ new/xterm-376/THANKS 2022-11-17 01:49:53.000000000 +0100
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.35 2022/09/12 21:10:13 tom Exp $
+-- $XTermId: THANKS,v 1.36 2022/11/17 00:49:53 tom Exp $
-- vile:txtmode fk=utf-8
There's no AUTHORS file in this distribution; it would be redundant since
I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -95,6 +95,7 @@
George Nachman
George Peter Staplin
Gertjan Halkes
+Grady Martin
Greg Badros
Greg Klanderman
Greg Smith
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/configure new/xterm-376/configure
--- old/xterm-375/configure 2022-10-10 18:35:26.000000000 +0200
+++ new/xterm-376/configure 2022-11-17 02:11:14.000000000 +0100
@@ -24187,140 +24187,6 @@
if test "$enable_warnings" = "yes"
then
-if test "$GCC" = yes || test "$GXX" = yes
-then
-cat > conftest.i <<EOF
-#ifndef GCC_PRINTF
-#define GCC_PRINTF 0
-#endif
-#ifndef GCC_SCANF
-#define GCC_SCANF 0
-#endif
-#ifndef GCC_NORETURN
-#define GCC_NORETURN /* nothing */
-#endif
-#ifndef GCC_UNUSED
-#define GCC_UNUSED /* nothing */
-#endif
-EOF
-if test "$GCC" = yes
-then
- { echo "$as_me:24208: checking for $CC __attribute__ directives..." >&5
-echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
-cat > "conftest.$ac_ext" <<EOF
-#line 24211 "${as_me:-configure}"
-#include "confdefs.h"
-#include "conftest.h"
-#include "conftest.i"
-#if GCC_PRINTF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-#else
-#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
-#endif
-#if GCC_SCANF
-#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
-#else
-#define GCC_SCANFLIKE(fmt,var) /*nothing*/
-#endif
-extern void wow(char *,...) GCC_SCANFLIKE(1,2);
-extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2);
-extern GCC_NORETURN void foo(void);
-int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { (void)argc;
(void)argv; return 0; }
-EOF
- cf_printf_attribute=no
- cf_scanf_attribute=no
- for cf_attribute in scanf printf unused noreturn
- do
-
-cf_ATTRIBUTE=`echo "$cf_attribute" | sed
y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-
- cf_directive="__attribute__(($cf_attribute))"
- echo "checking for $CC $cf_directive" 1>&5
-
- case "$cf_attribute" in
- (printf)
- cf_printf_attribute=yes
- cat >conftest.h <<EOF
-#define GCC_$cf_ATTRIBUTE 1
-EOF
- ;;
- (scanf)
- cf_scanf_attribute=yes
- cat >conftest.h <<EOF
-#define GCC_$cf_ATTRIBUTE 1
-EOF
- ;;
- (*)
- cat >conftest.h <<EOF
-#define GCC_$cf_ATTRIBUTE $cf_directive
-EOF
- ;;
- esac
-
- if { (eval echo "$as_me:24260: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:24263: \$? = $ac_status" >&5
- (exit "$ac_status"); }; then
- test -n "$verbose" && echo "$as_me:24265: result: ...
$cf_attribute" >&5
-echo "${ECHO_T}... $cf_attribute" >&6
- cat conftest.h >>confdefs.h
- case "$cf_attribute" in
- (noreturn)
-
-cat >>confdefs.h <<EOF
-#define GCC_NORETURN $cf_directive
-EOF
-
- ;;
- (printf)
- cf_value='/* nothing */'
- if test "$cf_printf_attribute" != no ; then
-
cf_value='__attribute__((format(printf,fmt,var)))'
-
-cat >>confdefs.h <<\EOF
-#define GCC_PRINTF 1
-EOF
-
- fi
-
-cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) $cf_value
-EOF
-
- ;;
- (scanf)
- cf_value='/* nothing */'
- if test "$cf_scanf_attribute" != no ; then
-
cf_value='__attribute__((format(scanf,fmt,var)))'
-
-cat >>confdefs.h <<\EOF
-#define GCC_SCANF 1
-EOF
-
- fi
-
-cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) $cf_value
-EOF
-
- ;;
- (unused)
-
-cat >>confdefs.h <<EOF
-#define GCC_UNUSED $cf_directive
-EOF
-
- ;;
- esac
- fi
- done
-else
- ${FGREP-fgrep} define conftest.i >>confdefs.h
-fi
-rm -rf ./conftest*
-fi
-
if test "x$have_x" = xyes; then
cf_save_LIBS_CF_CONST_X_STRING="$LIBS"
@@ -24340,7 +24206,7 @@
done
cat >"conftest.$ac_ext" <<_ACEOF
-#line 24343 "configure"
+#line 24209 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -24355,26 +24221,26 @@
}
_ACEOF
rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24358: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24224: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:24361: \$? = $ac_status" >&5
+ echo "$as_me:24227: \$? = $ac_status" >&5
(exit "$ac_status"); } &&
{ ac_try='test -s "conftest.$ac_objext"'
- { (eval echo "$as_me:24364: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24230: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24367: \$? = $ac_status" >&5
+ echo "$as_me:24233: \$? = $ac_status" >&5
(exit "$ac_status"); }; }; then
-echo "$as_me:24370: checking for X11/Xt const-feature" >&5
+echo "$as_me:24236: checking for X11/Xt const-feature" >&5
echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
if test "${cf_cv_const_x_string+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >"conftest.$ac_ext" <<_ACEOF
-#line 24377 "configure"
+#line 24243 "configure"
#include "confdefs.h"
#define _CONST_X_STRING /* X11R7.8 (perhaps) */
@@ -24391,16 +24257,16 @@
}
_ACEOF
rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24260: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:24397: \$? = $ac_status" >&5
+ echo "$as_me:24263: \$? = $ac_status" >&5
(exit "$ac_status"); } &&
{ ac_try='test -s "conftest.$ac_objext"'
- { (eval echo "$as_me:24400: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24266: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24403: \$? = $ac_status" >&5
+ echo "$as_me:24269: \$? = $ac_status" >&5
(exit "$ac_status"); }; }; then
cf_cv_const_x_string=no
@@ -24415,7 +24281,7 @@
rm -f "conftest.$ac_objext" "conftest.$ac_ext"
fi
-echo "$as_me:24418: result: $cf_cv_const_x_string" >&5
+echo "$as_me:24284: result: $cf_cv_const_x_string" >&5
echo "${ECHO_T}$cf_cv_const_x_string" >&6
LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -24444,7 +24310,7 @@
rm -f "conftest.$ac_objext" "conftest.$ac_ext"
fi
cat > "conftest.$ac_ext" <<EOF
-#line 24447 "${as_me:-configure}"
+#line 24313 "${as_me:-configure}"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
if test "$INTEL_COMPILER" = yes
@@ -24460,7 +24326,7 @@
# remark #981: operands are evaluated in unspecified order
# warning #279: controlling expression is constant
- { echo "$as_me:24463: checking for $CC warning options..." >&5
+ { echo "$as_me:24329: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -24476,12 +24342,12 @@
wd981
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:24479: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:24345: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:24482: \$? = $ac_status" >&5
+ echo "$as_me:24348: \$? = $ac_status" >&5
(exit "$ac_status"); }; then
- test -n "$verbose" && echo "$as_me:24484: result: ...
-$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:24350: result: ...
-$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -24489,7 +24355,7 @@
CFLAGS="$cf_save_CFLAGS"
elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
then
- { echo "$as_me:24492: checking for $CC warning options..." >&5
+ { echo "$as_me:24358: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
cf_warn_CONST=""
@@ -24512,12 +24378,12 @@
Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST
Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
Wno-cast-qual
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:24515: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:24381: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:24518: \$? = $ac_status" >&5
+ echo "$as_me:24384: \$? = $ac_status" >&5
(exit "$ac_status"); }; then
- test -n "$verbose" && echo "$as_me:24520: result: ...
-$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:24386: result: ...
-$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
case "$cf_opt" in
(Winline)
@@ -24525,7 +24391,7 @@
([34].*)
test -n "$verbose" && echo " feature
is broken in gcc $GCC_VERSION" 1>&6
-echo "${as_me:-configure}:24528: testing feature is broken in gcc $GCC_VERSION
..." 1>&5
+echo "${as_me:-configure}:24394: testing feature is broken in gcc $GCC_VERSION
..." 1>&5
continue;;
esac
@@ -24535,7 +24401,7 @@
([12].*)
test -n "$verbose" && echo " feature
is broken in gcc $GCC_VERSION" 1>&6
-echo "${as_me:-configure}:24538: testing feature is broken in gcc $GCC_VERSION
..." 1>&5
+echo "${as_me:-configure}:24404: testing feature is broken in gcc $GCC_VERSION
..." 1>&5
continue;;
esac
@@ -24550,6 +24416,140 @@
fi
+if test "$GCC" = yes || test "$GXX" = yes
+then
+cat > conftest.i <<EOF
+#ifndef GCC_PRINTF
+#define GCC_PRINTF 0
+#endif
+#ifndef GCC_SCANF
+#define GCC_SCANF 0
+#endif
+#ifndef GCC_NORETURN
+#define GCC_NORETURN /* nothing */
+#endif
+#ifndef GCC_UNUSED
+#define GCC_UNUSED /* nothing */
+#endif
+EOF
+if test "$GCC" = yes
+then
+ { echo "$as_me:24437: checking for $CC __attribute__ directives..." >&5
+echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+cat > "conftest.$ac_ext" <<EOF
+#line 24440 "${as_me:-configure}"
+#include "confdefs.h"
+#include "conftest.h"
+#include "conftest.i"
+#if GCC_PRINTF
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+#else
+#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
+#endif
+#if GCC_SCANF
+#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
+#else
+#define GCC_SCANFLIKE(fmt,var) /*nothing*/
+#endif
+extern void wow(char *,...) GCC_SCANFLIKE(1,2);
+extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2);
+extern GCC_NORETURN void foo(void);
+int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { (void)argc;
(void)argv; return 0; }
+EOF
+ cf_printf_attribute=no
+ cf_scanf_attribute=no
+ for cf_attribute in scanf printf unused noreturn
+ do
+
+cf_ATTRIBUTE=`echo "$cf_attribute" | sed
y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+ cf_directive="__attribute__(($cf_attribute))"
+ echo "checking for $CC $cf_directive" 1>&5
+
+ case "$cf_attribute" in
+ (printf)
+ cf_printf_attribute=yes
+ cat >conftest.h <<EOF
+#define GCC_$cf_ATTRIBUTE 1
+EOF
+ ;;
+ (scanf)
+ cf_scanf_attribute=yes
+ cat >conftest.h <<EOF
+#define GCC_$cf_ATTRIBUTE 1
+EOF
+ ;;
+ (*)
+ cat >conftest.h <<EOF
+#define GCC_$cf_ATTRIBUTE $cf_directive
+EOF
+ ;;
+ esac
+
+ if { (eval echo "$as_me:24489: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:24492: \$? = $ac_status" >&5
+ (exit "$ac_status"); }; then
+ test -n "$verbose" && echo "$as_me:24494: result: ...
$cf_attribute" >&5
+echo "${ECHO_T}... $cf_attribute" >&6
+ cat conftest.h >>confdefs.h
+ case "$cf_attribute" in
+ (noreturn)
+
+cat >>confdefs.h <<EOF
+#define GCC_NORETURN $cf_directive
+EOF
+
+ ;;
+ (printf)
+ cf_value='/* nothing */'
+ if test "$cf_printf_attribute" != no ; then
+
cf_value='__attribute__((format(printf,fmt,var)))'
+
+cat >>confdefs.h <<\EOF
+#define GCC_PRINTF 1
+EOF
+
+ fi
+
+cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) $cf_value
+EOF
+
+ ;;
+ (scanf)
+ cf_value='/* nothing */'
+ if test "$cf_scanf_attribute" != no ; then
+
cf_value='__attribute__((format(scanf,fmt,var)))'
+
+cat >>confdefs.h <<\EOF
+#define GCC_SCANF 1
+EOF
+
+ fi
+
+cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var) $cf_value
+EOF
+
+ ;;
+ (unused)
+
+cat >>confdefs.h <<EOF
+#define GCC_UNUSED $cf_directive
+EOF
+
+ ;;
+ esac
+ fi
+ done
+else
+ ${FGREP-fgrep} define conftest.i >>confdefs.h
+fi
+rm -rf ./conftest*
+fi
+
fi
test "$disable_setuid" = yes &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/configure.in new/xterm-376/configure.in
--- old/xterm-375/configure.in 2022-10-10 18:33:01.000000000 +0200
+++ new/xterm-376/configure.in 2022-11-17 02:03:32.000000000 +0100
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.390 2022/10/10 16:33:01 tom Exp $
+dnl $XTermId: configure.in,v 1.391 2022/11/17 01:03:32 tom Exp $
dnl
dnl
-----------------------------------------------------------------------------
dnl this file is part of xterm
@@ -1152,7 +1152,7 @@
AC_CHECK_FUNCS(use_extended_names)
fi
-CF_ENABLE_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas
Wswitch-enum Wno-cast-qual)
+CF_ENABLE_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas
Wswitch-enum Wno-cast-qual,yes)
AC_SUBST(EXTRA_CFLAGS)
AC_SUBST(CHARPROC_DEPS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/ctlseqs.ms new/xterm-376/ctlseqs.ms
--- old/xterm-375/ctlseqs.ms 2022-10-10 16:18:26.000000000 +0200
+++ new/xterm-376/ctlseqs.ms 2022-11-17 01:28:04.000000000 +0100
@@ -1,6 +1,6 @@
.\"#! troff -ms $1 -*- Nroff -*-
.\" "Xterm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.641 2022/10/10 14:18:26 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.642 2022/11/17 00:28:04 tom Exp $
.\"
.\"
.\" Copyright 1996-2021,2022 by Thomas E. Dickey
@@ -69,8 +69,8 @@
.\"
.ds XT XTerm
.ds xt xterm
-.ds LF Patch #374
-.ds RF 2022/10/10
+.ds LF Patch #376
+.ds RF 2022/11/16
.\"
.if n .pl 9999v \" no page breaks in nroff
.ND
@@ -1287,6 +1287,10 @@
.iP
.IP \\*(Cs\\*(Ps\\*s\\*g
Tab Clear (TBC).
+ECMA-48 defines additional codes,
+but the VT100 user manual notes that it
+ignores other codes.
+DEC's later terminals (and \fI\*(xt\fP) do the same, for compatibility.
\*(Ps = \*0 \(-> Clear Current Column (default).
\*(Ps = \*3 \(-> Clear All.
.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/ctlseqs.txt new/xterm-376/ctlseqs.txt
--- old/xterm-375/ctlseqs.txt 2022-10-10 16:18:48.000000000 +0200
+++ new/xterm-376/ctlseqs.txt 2022-11-17 01:31:08.000000000 +0100
@@ -21,7 +21,7 @@
Thomas Dickey
XFree86 Project (1996-2006)
invisible-island.net (2006-2022)
- updated for XTerm Patch #374 (2022/10/10)
+ updated for XTerm Patch #376 (2022/11/16)
@@ -738,7 +738,9 @@
Horizontal and Vertical Position [row;column] (default =
[1,1]) (HVP).
-CSI Ps g Tab Clear (TBC).
+CSI Ps g Tab Clear (TBC). ECMA-48 defines additional codes, but the
+ VT100 user manual notes that it ignores other codes. DEC's
+ later terminals (and xterm) do the same, for compatibility.
Ps = 0 -> Clear Current Column (default).
Ps = 3 -> Clear All.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/install-sh new/xterm-376/install-sh
--- old/xterm-375/install-sh 2003-11-29 22:30:21.000000000 +0100
+++ new/xterm-376/install-sh 2020-11-30 17:41:23.000000000 +0100
@@ -1,7 +1,8 @@
-#! /bin/sh
-#
+#!/bin/sh
# install - install a program, script, or datafile
-#
+
+scriptversion=2020-11-14.01; # UTC
+
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
@@ -34,261 +35,507 @@
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+tab=' '
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
-# set DOITPROG to echo to test this script
+src=
+dst=
+dir_arg=
+dst_arg=
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+copy_on_change=false
+is_target_a_directory=possibly
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd=$cpprog
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
-if [ x"$src" = x ]
-then
- echo "$0: no input file specified" >&2
- exit 1
-else
- :
-fi
+Options:
+ --help display this help and exit.
+ --version display version info and exit.
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d "$dst" ]; then
- instcmd=:
- chmodcmd=""
- else
- instcmd=$mkdirprog
- fi
-else
+ -c (ignored)
+ -C install only if different (preserve data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -p pass -p to $cpprog.
+ -s $stripprog installed files.
+ -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
- if [ -f "$src" ] || [ -d "$src" ]
- then
- :
- else
- echo "$0: $src does not exist" >&2
- exit 1
- fi
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
- if [ x"$dst" = x ]
- then
- echo "$0: no destination specified" >&2
- exit 1
- else
- :
- fi
+If -S is not specified, no backups are attempted.
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
+Email bug reports to bug-autom...@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
+"
- if [ -d "$dst" ]
- then
- dst=$dst/`basename "$src"`
- else
- :
- fi
-fi
+while test $# -ne 0; do
+ case $1 in
+ -c) ;;
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+ -C) copy_on_change=true;;
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
+ -d) dir_arg=true;;
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
- '
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
- pathcomp=$pathcomp$1
- shift
-
- if [ ! -d "$pathcomp" ] ;
- then
- $mkdirprog "$pathcomp"
- else
- :
- fi
+ -g) chgrpcmd="$chgrpprog $2"
+ shift;;
- pathcomp=$pathcomp/
-done
-fi
+ --help) echo "$usage"; exit $?;;
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd "$dst" &&
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
+ -m) mode=$2
+ case $mode in
+ *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-# If we're going to rename the final executable, determine the name now.
+ -o) chowncmd="$chownprog $2"
+ shift;;
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename "$dst"`
- else
- dstfile=`basename "$dst" $transformbasename |
- sed $transformarg`$transformbasename
- fi
+ -p) cpprog="$cpprog -p";;
-# don't allow the sed command to completely eliminate the filename
+ -s) stripcmd=$stripprog;;
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename "$dst"`
- else
- :
- fi
+ -S) backupsuffix="$2"
+ shift;;
+
+ -t)
+ is_target_a_directory=always
+ dst_arg=$2
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
+ shift;;
+
+ -T) is_target_a_directory=never;;
-# Make a couple of temp file names in the proper directory.
+ --version) echo "$0 $scriptversion"; exit $?;;
- dsttmp=$dstdir/#inst.$$#
- rmtmp=$dstdir/#rm.$$#
+ --) shift
+ break;;
-# Trap to clean up temp files at exit.
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
- trap '(exit $?); exit' 1 2 13 15
+ *) break;;
+ esac
+ shift
+done
-# Move or copy the file name to the temp name
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
- $doit $instcmd "$src" "$dsttmp" &&
+if test -n "$dir_arg"; then
+ if test -n "$dst_arg"; then
+ echo "$0: target directory not allowed when installing a directory." >&2
+ exit 1
+ fi
+fi
-# and set any options; do chmod last to preserve setuid bits
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+ dst_arg=$arg
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
+ done
+fi
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
+if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+ fi
+ # It's OK to call 'install-sh -d' without argument.
+ # This can happen when creating conditional directories.
+ exit 0
+fi
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+if test -z "$dir_arg"; then
+ if test $# -gt 1 || test "$is_target_a_directory" = always; then
+ if test ! -d "$dst_arg"; then
+ echo "$0: $dst_arg: Is not a directory." >&2
+ exit 1
+ fi
+ fi
+fi
-# Now remove or move aside any old file at destination location. We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons. In this case, the final cleanup
-# might fail but the new file should still install successfully.
+if test -z "$dir_arg"; then
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
-{
- if [ -f "$dstdir/$dstfile" ]
+for src
+do
+ # Protect names problematic for 'test' and other utilities.
+ case $src in
+ -* | [=\(\)!]) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+ dst=$src
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ # Don't chown directories that already exist.
+ if test $dstdir_status = 0; then
+ chowncmd=""
+ fi
+ else
+
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+ echo "$0: $src does not exist." >&2
+ exit 1
+ fi
+
+ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+ dst=$dst_arg
+
+ # If destination is a directory, append the input filename.
+ if test -d "$dst"; then
+ if test "$is_target_a_directory" = never; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
+ dstdir_status=0
+ else
+ dstdir=`dirname "$dst"`
+ test -d "$dstdir"
+ dstdir_status=$?
+ fi
+ fi
+
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ # The $RANDOM variable is not portable (e.g., dash). Use it
+ # here however when possible just to lower collision chance.
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+ trap '
+ ret=$?
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+ exit $ret
+ ' 0
+
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p'.
+ if (umask $mkdir_umask &&
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
- {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
- }
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
- :
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
-} &&
-
-# Now rename the file to the real destination.
-
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ trap '' 0;;
+ esac
-fi &&
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
+
+ # mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix='/';;
+ [-=\(\)!]*) prefix='./';;
+ *) prefix='';;
+ esac
+
+ oIFS=$IFS
+ IFS=/
+ set -f
+ set fnord $dstdir
+ shift
+ set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test X"$d" = X && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
+
+ if test -n "$dir_arg"; then
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
+
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+ # Copy the file name to the temp name.
+ (umask $cp_umask &&
+ { test -z "$stripcmd" || {
+ # Create $dsttmp read-write so that cp doesn't create it read-only,
+ # which would cause strip to fail.
+ if test -z "$doit"; then
+ : >"$dsttmp" # No need to fork-exec 'touch'.
+ else
+ $doit touch "$dsttmp"
+ fi
+ }
+ } &&
+ $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+ # If any of these fail, we abort the whole thing. If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+ set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ set +f &&
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # If $backupsuffix is set, and the file being installed
+ # already exists, attempt a backup. Don't worry if it fails,
+ # e.g., if mv doesn't support -f.
+ if test -n "$backupsuffix" && test -f "$dst"; then
+ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+ fi
+
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
-# The final little trick to "correctly" pass the exit status to the exit trap.
+ trap '' 0
+ fi
+done
-{
- (exit 0); exit
-}
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/package/debian/changelog
new/xterm-376/package/debian/changelog
--- old/xterm-375/package/debian/changelog 2022-10-21 02:45:30.000000000
+0200
+++ new/xterm-376/package/debian/changelog 2022-10-30 11:48:25.000000000
+0100
@@ -1,3 +1,9 @@
+xterm-dev (376) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Sun, 30 Oct 2022 06:48:25
-0400
+
xterm-dev (375) unstable; urgency=low
* maintenance updates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/package/freebsd/Makefile
new/xterm-376/package/freebsd/Makefile
--- old/xterm-375/package/freebsd/Makefile 2022-10-21 02:45:30.000000000
+0200
+++ new/xterm-376/package/freebsd/Makefile 2022-10-30 11:48:25.000000000
+0100
@@ -1,4 +1,4 @@
-# $XTermId: Makefile,v 1.96 2022/10/21 00:45:30 tom Exp $
+# $XTermId: Makefile,v 1.97 2022/10/30 10:48:25 tom Exp $
# $FreeBSD: head/x11/xterm/Makefile 492827 2019-02-13 06:43:36Z ehaupt $
# This is adapted from the FreeBSD port, installing as "xterm-dev" with
@@ -7,7 +7,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 375
+PORTVERSION= 376
CATEGORIES= x11
MASTER_SITES= ftp://ftp.invisible-island.net/xterm/:src1 \
https://invisible-mirror.net/archives/xterm/:src1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/package/pkgsrc/Makefile
new/xterm-376/package/pkgsrc/Makefile
--- old/xterm-375/package/pkgsrc/Makefile 2022-10-21 02:45:30.000000000
+0200
+++ new/xterm-376/package/pkgsrc/Makefile 2022-10-30 11:48:25.000000000
+0100
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.117 2018/03/12 11:18:00 wiz Exp $
-DISTNAME= xterm-375
+DISTNAME= xterm-376
PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.invisible-island.net/xterm/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/package/xterm.spec
new/xterm-376/package/xterm.spec
--- old/xterm-375/package/xterm.spec 2022-10-21 02:45:30.000000000 +0200
+++ new/xterm-376/package/xterm.spec 2022-10-30 11:48:25.000000000 +0100
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.152 2022/10/21 00:45:30 tom Exp $
+# $XTermId: xterm.spec,v 1.153 2022/10/30 10:48:25 tom Exp $
Summary: X terminal emulator (development version)
%global my_middle xterm
%global my_suffix -dev
%global fullname %{my_middle}%{my_suffix}
%global my_class XTermDev
Name: %{fullname}
-Version: 375
+Version: 376
Release: 1
License: X11
Group: User Interface/X
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/version.h new/xterm-376/version.h
--- old/xterm-375/version.h 2022-10-24 02:25:39.000000000 +0200
+++ new/xterm-376/version.h 2022-11-17 02:18:10.000000000 +0100
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.529 2022/10/24 00:25:39 tom Exp $ */
+/* $XTermId: version.h,v 1.532 2022/11/17 01:18:10 tom Exp $ */
/*
* Copyright 1998-2021,2022 by Thomas E. Dickey
@@ -38,8 +38,8 @@
* version of X to which this version of xterm has been built. The resulting
* number in parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 375
-#define XTERM_DATE 2022-10-23
+#define XTERM_PATCH 376
+#define XTERM_DATE 2022-11-16
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/vttests/halves.pl
new/xterm-376/vttests/halves.pl
--- old/xterm-375/vttests/halves.pl 2022-10-11 01:59:05.000000000 +0200
+++ new/xterm-376/vttests/halves.pl 2022-11-17 01:45:00.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $XTermId: halves.pl,v 1.10 2022/10/10 23:59:05 tom Exp $
+# $XTermId: halves.pl,v 1.11 2022/11/17 00:45:00 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -53,6 +53,7 @@
if ( $input[$n] =~ /^COLUMNS=/ ) {
$result = $input[$n];
$result =~ s/^[^=]*=//;
+ $result =~ s/;.*//;
last;
}
}
@@ -84,8 +85,8 @@
pack(
"U*",
map {
- ( $_ <= 32 || $_ > 127 ) # if non-ASCII character...
- ? 32 # ...just show a blank
+ ( $_ <= 32 || $_ > 127 ) # if non-ASCII character...
+ ? 32 # ...just show a blank
: ( 0xff00 + ( $_ - 32 ) ) # map to "Fullwidth Form"
} unpack( "C*", $value )
); # unpack unsigned-char characters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/xstrings.c new/xterm-376/xstrings.c
--- old/xterm-375/xstrings.c 2020-10-12 20:50:28.000000000 +0200
+++ new/xterm-376/xstrings.c 2022-11-17 00:54:32.000000000 +0100
@@ -1,7 +1,7 @@
-/* $XTermId: xstrings.c,v 1.78 2020/10/12 18:50:28 tom Exp $ */
+/* $XTermId: xstrings.c,v 1.79 2022/11/16 23:54:32 tom Exp $ */
/*
- * Copyright 2000-2019,2020 by Thomas E. Dickey
+ * Copyright 2000-2020,2022 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -395,29 +395,39 @@
int
x_strcasecmp(const char *s1, const char *s2)
{
- size_t len = strlen(s1);
+ size_t len1 = (s1 != NULL) ? strlen(s1) : 0;
+ size_t len2 = (s2 != NULL) ? strlen(s2) : 0;
- if (len != strlen(s2))
- return 1;
-
- return x_strncasecmp(s1, s2, (unsigned) len);
+ return ((len1 != len2)
+ ? 1
+ : x_strncasecmp(s1, s2, (unsigned) len1));
}
int
x_strncasecmp(const char *s1, const char *s2, unsigned n)
{
- while (n-- != 0) {
- char c1 = x_toupper(*s1);
- char c2 = x_toupper(*s2);
- if (c1 != c2)
- return 1;
- if (c1 == 0)
- break;
- s1++;
- s2++;
+ int result = 0;
+
+ if (s1 != NULL && s2 != NULL) {
+ while (n-- != 0) {
+ char c1 = x_toupper(*s1);
+ char c2 = x_toupper(*s2);
+ if (c1 != c2) {
+ result = 1;
+ break;
+ } else if (c1 == 0) {
+ break;
+ }
+ s1++;
+ s2++;
+ }
+ } else if (s1 == NULL && s2 != NULL) {
+ result = 1;
+ } else if (s1 != NULL && s2 == NULL) {
+ result = 1;
}
- return 0;
+ return result;
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/xterm.appdata.xml
new/xterm-376/xterm.appdata.xml
--- old/xterm-375/xterm.appdata.xml 2022-10-24 02:25:59.000000000 +0200
+++ new/xterm-376/xterm.appdata.xml 2022-11-17 02:18:16.000000000 +0100
@@ -35,7 +35,7 @@
<keyword>terminal</keyword>
</keywords>
<releases>
- <release version="375" date="2022-10-23"/>
+ <release version="376" date="2022-11-16"/>
</releases>
<url type="homepage">https://invisible-island.net/xterm/</url>
<update_contact>dic...@invisible-island.net</update_contact>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/xterm.log.html new/xterm-376/xterm.log.html
--- old/xterm-375/xterm.log.html 2022-10-24 02:25:20.000000000 +0200
+++ new/xterm-376/xterm.log.html 2022-11-17 02:18:26.000000000 +0100
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.2453 2022/10/24 00:25:20 tom Exp $
+ $XTermId: xterm.log.html,v 1.2461 2022/11/17 01:18:26 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
@@ -70,6 +70,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_376">Patch #376 - 2022/11/16</a></li>
+
<li><a href="#xterm_375">Patch #375 - 2022/10/23</a></li>
<li><a href="#xterm_374">Patch #374 - 2022/10/10</a></li>
@@ -1028,6 +1030,29 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_376" id="xterm_376">Patch #376 -
+ 2022/11/16</a></h1>
+
+ <ul>
+ <li>modify configure script to always check for gcc
+ attributes,</li>
+
+ <li>update <code>install-sh</code>.</li>
+
+ <li>fix parsing of <code>result -u</code> in
+ <code>vttests/halves.pl</code>.</li>
+
+ <li>add a note in <code>ctlseqs.ms</code> about compatibility
+ of <code>TBC</code>.</li>
+
+ <li>fix a copy/paste error in manual (patch by Grady
+ Martin).</li>
+
+ <li>add null-pointer checks in <code>x_strcasecmp</code> and
+ <code>x_strncasecmp</code>, to help with error-recovery for a
+ missing font (Debian #1022942).</li>
+ </ul>
+
<h1><a name="xterm_375" id="xterm_375">Patch #375 -
2022/10/23</a></h1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xterm-375/xterm.man new/xterm-376/xterm.man
--- old/xterm-375/xterm.man 2022-10-08 02:17:27.000000000 +0200
+++ new/xterm-376/xterm.man 2022-11-17 01:33:56.000000000 +0100
@@ -1,5 +1,5 @@
'\" t
-.\" $XTermId: xterm.man,v 1.864 2022/10/08 00:17:27 tom Exp $
+.\" $XTermId: xterm.man,v 1.866 2022/11/17 00:33:56 tom Exp $
.\"
.\" Copyright 1996-2021,2022 by Thomas E. Dickey
.\"
@@ -3976,7 +3976,8 @@
The default is \*(``B\*('', which corresponds to US ASCII.
.TP 8
.B "limitFontsets\fP (class\fB LimitFontsets\fP)"
-Limits the number of TrueType fallback fonts (i.e., fontset) which can be
tested.
+Limits the number of TrueType fallback fonts (i.e., fontset)
+which can be tested.
The default is \*(``50\*(''.
No more than \*(``255\*('' will be scanned.
.IP
@@ -4363,7 +4364,7 @@
bell should be rung, when enabled by the \fBmarginBell\fP resource.
The default is \*(``10\*(''.
.TP 8
-.B "\fIname\fP\fBKeymap\fP (class\fB \fIName\fP\fBKeymap\fP)"
+.B "\fIname\fBKeymap\fR (class\fB \fIName\fBKeymap\fR)"
See the discussion of the \fBkeymap()\fP action.
.TP 8
.B "nextEventDelay\fP (class\fB NextEventDelay\fP)"
@@ -6924,7 +6925,7 @@
These are disabled if the SendEvents feature is enabled:
.RS
.TP
-.B Allow Color Ops\fP (resource \fBallow\-font\-ops\fP)
+.B Allow Color Ops\fP (resource \fBallow\-color\-ops\fP)
This corresponds to the \fBallowColorOps\fP resource.
Enable or disable control sequences that set/query the colors.
.TP
