<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/794acd505c2b2bf3822154ac618e492f4f23d7e0">https://github.com/macports/macports-ports/commit/794acd505c2b2bf3822154ac618e492f4f23d7e0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 794acd5 screen: update to 4.8.0 (#6337)
</span>794acd5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 794acd505c2b2bf3822154ac618e492f4f23d7e0
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Sat Feb 8 06:42:04 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> screen: update to 4.8.0 (#6337)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove patch-limit-termcap-size.diff as it was included upstream
</span>---
sysutils/screen/Portfile | 11 +-
sysutils/screen/files/patch-apple.diff | 28 ++--
sysutils/screen/files/patch-config.h.in.diff | 7 +-
.../screen/files/patch-limit-termcap-size.diff | 154 ---------------------
4 files changed, 23 insertions(+), 177 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/Portfile b/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f3d214..513fa72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name screen
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.8.0
</span> revision 0
homepage https://www.gnu.org/software/screen/
description Screen manager with VT100/ANSI terminal emulation
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ master_sites gnu:${name} \
</span> distfiles-append 18:encoding
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 58c4c6f3c817cdce98776eed70d7d7503ba939b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 854192 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 43888fa00f708a8a9aa226e0df39abd7181b15ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 854854 \
</span> 18 \
rmd160 bd143058417e1d4c040a2589fdfbf8f9203f0b4c \
sha256 4d4b674a61dab6bac9b4207307c5f020fa670fc3948c39e7ea93c7fb9dfb5174 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,7 @@ checksums ${distname}${extract.suffix} \
</span> size 4883
patchfiles patch-apple.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-config.h.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-limit-termcap-size.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-config.h.in.diff
</span> depends_lib port:ncurses
extract.only ${distname}${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/files/patch-apple.diff b/sysutils/screen/files/patch-apple.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 70ddb71..394ff49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/screen/files/patch-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/screen/files/patch-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,9 +12,9 @@ GNU Screen, which was version 4.6.2 and no longer required
</span> many of Apple's changes. This was done by David Gilman
for MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -rU 3 screen-4.6.2-orig/screen.c screen-4.6.2/screen.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- screen.c 2018-08-22 14:34:15.477730848 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ screen.c 2018-08-22 14:53:19.778162637 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -rU 3 screen.c screen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- screen.c 2020-02-05 15:09:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ screen.c 2020-02-07 21:17:51.105940911 -0500
</span> @@ -118,6 +118,14 @@
#include "logfile.h" /* islogfile, logfflush, logfopen/logfclose */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ diff -rU 3 screen-4.6.2-orig/screen.c screen-4.6.2/screen.c
</span> #ifdef DEBUG
FILE *dfp;
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1049,6 +1057,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1051,6 +1059,15 @@
</span> Panic(0, "No $SCREENDIR with multi screens, please.");
#endif
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ diff -rU 3 screen-4.6.2-orig/screen.c screen-4.6.2/screen.c
</span>
#ifdef MULTIUSER
if (multiattach) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1312,6 +1329,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1314,6 +1331,11 @@
</span> freopen("/dev/null", "w", stderr);
debug("-- screen.back debug started\n");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,10 +58,11 @@ diff -rU 3 screen-4.6.2-orig/screen.c screen-4.6.2/screen.c
</span> /* This guarantees that the session owner is listed, even when we
* start detached. From now on we should not refer to 'LoginName'
* any more, use users->u_name instead.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -rU 3 screen-4.6.2-orig/socket.c screen-4.6.2/socket.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- socket.c 2018-08-22 14:34:15.476989022 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ socket.c 2018-08-22 14:39:24.526567573 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1410,7 +1410,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -rU 3 gsocket.c gsocket.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- socket.c 2020-02-05 15:09:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ socket.c 2020-02-07 21:17:51.107393457 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1419,7 +1419,10 @@
</span> char *p;
int pid;
int noshowwin;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,9 +73,10 @@ diff -rU 3 screen-4.6.2-orig/socket.c screen-4.6.2/socket.c
</span>
ASSERT(display);
pid = D_userpid;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -rU 3 screen-4.6.2-orig/window.c screen-4.6.2/window.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- window.c 2018-08-22 14:34:15.475905157 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ window.c 2018-08-22 14:56:04.836374114 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -rU 3 gwindow.c gwindow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- window.c 2020-02-05 15:09:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ window.c 2020-02-07 21:17:51.108845249 -0500
</span> @@ -33,6 +33,9 @@
#include <sys/stat.h>
#include <signal.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +87,7 @@ diff -rU 3 screen-4.6.2-orig/window.c screen-4.6.2/window.c
</span> #ifndef sun
# include <sys/ioctl.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1482,6 +1485,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1484,6 +1487,40 @@
</span> }
#ifndef HAVE_EXECVPE
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/files/patch-config.h.in.diff b/sysutils/screen/files/patch-config.h.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0225ba4..ae8dbb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/screen/files/patch-config.h.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/screen/files/patch-config.h.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,9 @@ screen's utmp editing.
</span> This also fixes the "/var/run/utmp: No such file or directory"
errors as a consequence of the above.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.in 2014-04-26 12:58:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in 2014-05-01 21:36:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -rU 3 config.h.in config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.h.in 2020-02-05 15:26:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.h.in 2020-02-07 21:17:08.307798880 -0500
</span> @@ -192,14 +192,14 @@
* If screen is installed with permissions to update /etc/utmp (such
* as if it is installed set-uid root), define UTMPOK.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,5 +33,3 @@ errors as a consequence of the above.
</span> -#define LOGOUTOK 1
+#undef LOGOUTOK
#undef CAREFULUTMP
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/files/patch-limit-termcap-size.diff b/sysutils/screen/files/patch-limit-termcap-size.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 57f6611..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/screen/files/patch-limit-termcap-size.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,154 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Create TERMCAP entries limited to 1023 bytes by default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TERMCAP_BUF defaults to 1023 to create TERMCAP entries that work on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-most systems. To save space, TERMCAP is unwrapped, and vt220 extra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-keys are skipped (unless TERMCAP_BUF > 1023); navigation keys are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-still included. Entries larger than TERMCAP_BUF are now truncated,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and no longer Panic screen.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Termcap entries are still wrapped when saved to a file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes screen bug: https://savannah.gnu.org/bugs/?55482
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Scott Shambarger <devel@shambarger.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- extern.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ extern.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,6 +235,7 @@ extern int StuffKey __P((int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* termcap.c */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int InitTermcap __P((int, int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern char *MakeTermcap __P((int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern void DumpTermcap __P((int, FILE *));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern char *gettermcapstring __P((char *));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef MAPKEYS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int remap __P((int, int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fileio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fileio.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -479,10 +479,7 @@ void WriteFile(struct acluser *user, char *fn, int dump) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case DUMP_TERMCAP:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((p = index(MakeTermcap(fore->w_aflag), '=')) != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fputs(++p, f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- putc('\n', f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DumpTermcap(fore->w_aflag, f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef COPY_PASTE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- os.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ os.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -507,7 +507,7 @@ typedef struct fd_set { int fds_bits[1]; } fd_set;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef TERMCAP_BUFSIZE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define TERMCAP_BUFSIZE 2048
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define TERMCAP_BUFSIZE 1023
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef MAXPATHLEN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- term.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ term.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,6 +197,7 @@ struct term term[T_N] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "F1", T_STR }, KMAPDEF("\033[23~")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "F2", T_STR }, KMAPDEF("\033[24~")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* extra keys for vt220 (David.Leonard@it.uq.edu.au) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* define T_FEXTRA */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "F3", T_STR },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "F4", T_STR },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "F5", T_STR },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- termcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ termcap.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,11 +75,10 @@ char screenterm[MAXTERMLEN + 1]; /* new $TERM, usually "screen" */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *extra_incap, *extra_outcap;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const char TermcapConst[] = "\\\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--\t:DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:UP=\\E[%dA:bs:bt=\\E[Z:\\\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--\t:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:ct=\\E[3g:\\\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--\t:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\\\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const char TermcapConst[] = "DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+UP=\\E[%dA:bs:bt=\\E[Z:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ct=\\E[3g:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gettermcapstring(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -824,21 +823,13 @@ AddCap(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- register int n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (tcLineLen + (n = strlen(s)) > 55 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcpy(Termcap + Termcaplen, "\\\n\t:");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Termcaplen += 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tcLineLen = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n=strlen(s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Termcaplen + n < TERMCAP_BUFSIZE - 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcpy(Termcap + Termcaplen, s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Termcaplen += n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tcLineLen += n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Panic(0, "TERMCAP overflow - sorry.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1074,6 +1065,12 @@ int aflag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (i >= T_KEYPAD) /* don't put keypad codes in TERMCAP */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue; /* - makes it too big */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (TERMCAP_BUF < 1024)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (i >= T_FEXTRA && i < T_BACKTAB) /* also skip extra vt220 keys */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (i > T_BACKTAB && i < T_NAVIGATE) /* more vt220 keys */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (i >= T_CURSOR && i < T_OCAPS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- act = &umtab[i - (T_CURSOR - T_OCAPS + T_CAPS)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1128,6 +1125,37 @@ int aflag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Termcap;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define TERMCAP_MAX_WIDTH 63
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DumpTermcap(aflag, f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int aflag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FILE *f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ register const char *p, *pe;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int n, col=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((p = index(MakeTermcap(aflag), '=')) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ debug1("DumpTermcap: '%s'\n", p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* write termcap entry with wrapping */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while((pe = index(p, ':')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n = pe - p + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if((col > 8) && ((col + n) > TERMCAP_MAX_WIDTH))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fwrite("\\\n\t:", 1, 4, f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ col = 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fwrite(p, 1, n, f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ col += n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p = ++pe;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(*p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fwrite(p, 1, strlen(p), f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fputc('\n', f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MakeString(cap, buf, buflen, s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *cap, *buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.17.2 (Apple Git-113)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>