CVS commit: src/lib/libterminfo
Module Name:src Committed By: uwe Date: Wed Oct 10 21:09:58 UTC 2018 Modified Files: src/lib/libterminfo: terminfo.5.in Log Message: Fix pasto. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/lib/libterminfo/terminfo.5.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libterminfo/terminfo.5.in diff -u src/lib/libterminfo/terminfo.5.in:1.22 src/lib/libterminfo/terminfo.5.in:1.23 --- src/lib/libterminfo/terminfo.5.in:1.22 Sun Jan 29 16:52:38 2017 +++ src/lib/libterminfo/terminfo.5.in Wed Oct 10 21:09:58 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: terminfo.5.in,v 1.22 2017/01/29 16:52:38 abhinav Exp $ +.\" $NetBSD: terminfo.5.in,v 1.23 2018/10/10 21:09:58 uwe Exp $ .\" .\" Copyright (c) 2009, 2010, 2011, 2013 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -131,7 +131,7 @@ push the dynamic variable [a-z]. .It Sy %P[A-Z] pop a parameter and push it to static variable [a-z]. .It Sy %g[A-Z] -push the dynamic variable [A-Z]. +push the static variable [a-z]. .Pp Static variables persist over .Fn tparm
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: skrll
Date: Wed Oct 10 19:13:51 UTC 2018
Modified Files:
src/sys/arch/arm/include: types.h
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/types.h
diff -u src/sys/arch/arm/include/types.h:1.35 src/sys/arch/arm/include/types.h:1.36
--- src/sys/arch/arm/include/types.h:1.35 Thu Jul 12 10:46:42 2018
+++ src/sys/arch/arm/include/types.h Wed Oct 10 19:13:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.35 2018/07/12 10:46:42 maxv Exp $ */
+/* $NetBSD: types.h,v 1.36 2018/10/10 19:13:51 skrll Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -43,7 +43,7 @@ typedef struct label_t { /* Used by setj
int val[11];
} label_t;
#endif
-
+
#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
typedef unsigned long paddr_t;
typedef unsigned long psize_t;
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src
Committed By: christos
Date: Wed Oct 10 14:57:31 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: crypto.map
Log Message:
Add the EC_GFp_nistp*_method's
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map:1.4 Sun Sep 23 09:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map Wed Oct 10 10:57:31 2018
@@ -1078,6 +1078,10 @@ OPENSSL_1_1_0 {
ECPKParameters_print_fp;
ECParameters_print;
ECParameters_print_fp;
+EC_GFp_nistp224_method;
+EC_GFp_nistp256_method;
+EC_GFp_nistp521_method;
+EC_GFp_nistz256_method;
EC_GF2m_simple_method;
EC_GFp_mont_method;
EC_GFp_nist_method;
CVS commit: src/sys/kern
Module Name:src
Committed By: msaitoh
Date: Wed Oct 10 10:54:30 UTC 2018
Modified Files:
src/sys/kern: uipc_mbufdebug.c
Log Message:
Fix m_examine_tcp() to print TCP header length (th_off) correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/uipc_mbufdebug.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_mbufdebug.c
diff -u src/sys/kern/uipc_mbufdebug.c:1.3 src/sys/kern/uipc_mbufdebug.c:1.4
--- src/sys/kern/uipc_mbufdebug.c:1.3 Mon Sep 3 16:29:35 2018
+++ src/sys/kern/uipc_mbufdebug.c Wed Oct 10 10:54:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbufdebug.c,v 1.3 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: uipc_mbufdebug.c,v 1.4 2018/10/10 10:54:30 msaitoh Exp $ */
/*
* Copyright (C) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbufdebug.c,v 1.3 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbufdebug.c,v 1.4 2018/10/10 10:54:30 msaitoh Exp $");
#include
#include
@@ -833,7 +833,7 @@ m_examine_tcp(const struct mbuf *m, int
(*pr)("TCP: Dst = %u\n", ntohs(tcp.th_dport));
(*pr)("TCP: Seq. = %u\n", ntohl(tcp.th_seq));
(*pr)("TCP: Ack. = %u\n", ntohl(tcp.th_ack));
- (*pr)("TCP: Header Length = %u\n", ntohl(tcp.th_off) << 2);
+ (*pr)("TCP: Header Length = %u\n", tcp.th_off << 2);
if (tcp.th_flags) {
(*pr)("TCP: Flags 0x%02x : ", tcp.th_flags);
if (tcp.th_flags & TH_FIN)
CVS commit: src/lib/libcurses
Module Name:src
Committed By: roy
Date: Wed Oct 10 09:40:11 UTC 2018
Modified Files:
src/lib/libcurses: newwin.c refresh.c
Log Message:
curses: test terminal capabilities for drawing in the bottom right corner
If auto margins are present, we need to turn them off or enter
an insert mode to "push" the character we want into the corner.
If pushing a wide character of greater than one cell, we need something
more than ich1, othewise the bottom right corner will remain blank.
Follow on fix for PR# 30978.
OK jdc@
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/lib/libcurses/newwin.c
cvs rdiff -u -r1.89 -r1.90 src/lib/libcurses/refresh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/newwin.c
diff -u src/lib/libcurses/newwin.c:1.53 src/lib/libcurses/newwin.c:1.54
--- src/lib/libcurses/newwin.c:1.53 Fri Oct 5 11:59:05 2018
+++ src/lib/libcurses/newwin.c Wed Oct 10 09:40:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: newwin.c,v 1.53 2018/10/05 11:59:05 roy Exp $ */
+/* $NetBSD: newwin.c,v 1.54 2018/10/10 09:40:11 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)newwin.c 8.3 (Berkeley) 7/27/94";
#else
-__RCSID("$NetBSD: newwin.c,v 1.53 2018/10/05 11:59:05 roy Exp $");
+__RCSID("$NetBSD: newwin.c,v 1.54 2018/10/10 09:40:11 roy Exp $");
#endif
#endif/* not lint */
@@ -416,20 +416,24 @@ __makenew(SCREEN *screen, int nlines, in
void
__swflags(WINDOW *win)
{
+ TERMINAL *term = win->screen->term;
win->flags &= ~(__ENDLINE | __FULLWIN | __SCROLLWIN | __LEAVEOK);
- if (win->begx + win->maxx == COLS && !(win->flags & __ISPAD)) {
+ if (win->begx + win->maxx == win->screen->COLS &&
+ !(win->flags & __ISPAD))
+ {
win->flags |= __ENDLINE;
- if (win->begx == 0 && win->maxy == LINES && win->begy == 0)
+ if (win->begx == 0 &&
+ win->maxy == win->screen->LINES &&
+ win->begy == 0)
win->flags |= __FULLWIN;
- /*
- * Enable this if we have a terminfo setting which claims
- * terminal will scroll. Currently there is none.
- */
-#if 0
- if (win->begy + win->maxy == LINES)
+ if (win->begy + win->maxy == win->screen->LINES &&
+ t_auto_right_margin(term) &&
+ !(t_insert_character(term) != NULL ||
+ t_parm_ich(term) != NULL ||
+ (t_enter_insert_mode(term) != NULL &&
+ t_exit_insert_mode(term) != NULL)))
win->flags |= __SCROLLWIN;
-#endif
}
}
Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.89 src/lib/libcurses/refresh.c:1.90
--- src/lib/libcurses/refresh.c:1.89 Fri Oct 5 11:59:05 2018
+++ src/lib/libcurses/refresh.c Wed Oct 10 09:40:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.89 2018/10/05 11:59:05 roy Exp $ */
+/* $NetBSD: refresh.c,v 1.90 2018/10/10 09:40:11 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94";
#else
-__RCSID("$NetBSD: refresh.c,v 1.89 2018/10/05 11:59:05 roy Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.90 2018/10/10 09:40:11 roy Exp $");
#endif
#endif/* not lint */
@@ -772,6 +772,102 @@ cleanup:
return fflush(_cursesi_screen->outfd) == EOF ? ERR : OK;
}
+static int
+putch(__LDATA *nsp, __LDATA *csp, int wy, int wx)
+{
+
+ if (!_cursesi_screen->curwin && csp) {
+ csp->attr = nsp->attr;
+ csp->ch = nsp->ch;
+#ifdef HAVE_WCHAR
+ if (_cursesi_copy_nsp(nsp->nsp, csp) == ERR)
+ return ERR;
+#endif /* HAVE_WCHAR */
+ }
+
+#ifndef HAVE_WCHAR
+ __cputchar((int)nsp->ch);
+#else
+ if (WCOL(*nsp) <= 0)
+ return OK;
+ __cputwchar((int)nsp->ch);
+#ifdef DEBUG
+ __CTRACE(__CTRACE_REFRESH,
+ "makech: (%d,%d)putwchar(0x%x)\n", wy, wx - 1, nsp->ch);
+#endif /* DEBUG */
+
+ /* Output non-spacing characters for the cell. */
+ __cursesi_putnsp(nsp->nsp, wy, wx);
+#endif /* HAVE_WCHAR */
+
+ return OK;
+}
+
+static int
+putchbr(__LDATA *nsp, __LDATA *csp, __LDATA *psp, int wy, int wx)
+{
+ int error, cw, pcw;
+
+ /* Can safely print to bottom right corner. */
+ if (!auto_right_margin)
+ return putch(nsp, csp, wy, wx);
+
+ /* Disable auto margins temporarily. */
+ if (enter_am_mode && exit_am_mode) {
+ tputs(enter_am_mode, 0, __cputchar);
+ error = putch(nsp, csp, wy, wx);
+ tputs(exit_am_mode, 0, __cputchar);
+ return error;
+ }
+
+ /* We need to insert characters.
+ * To do this, work out their widths. */
+#ifdef HAVE_WCHAR
+ cw = wcwidth(nsp->ch);
+ pcw = psp == NULL ? 0 : wcwidth(psp->ch);
+ if (pcw < 1)
+ return ERR; /* Nothing to insert */
+
+ /* When wide characters we need something other than
+ * insert_character. */
+ if (pcw > 1 &&
+ !(parm_ich != NULL ||
+ (enter_insert_mode != NULL && exit_insert_mode != NULL)))
+ return ERR;
+#else
+ cw = pcw = 1;
+#endif /* HAVE_WCHAR */
+
+ /* Write the corner character at wx - pcw. */
+ __mvcur(wy, wx, wy, wx - pcw, 1);
+ if (putch(nsp, csp, wy, wx)
CVS commit: src/crypto/external/bsd/openssl/include/openssl
Module Name:src
Committed By: martin
Date: Wed Oct 10 06:16:55 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/include/openssl: opensslconf.h
Log Message:
On 32bit platforms set OPENSSL_NO_EC_NISTP_64_GCC_128 again, the non
standard __uint128_t is required for the code, but only provided by gcc
on 64bit archs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/include/openssl/opensslconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/include/openssl/opensslconf.h
diff -u src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.3 src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.4
--- src/crypto/external/bsd/openssl/include/openssl/opensslconf.h:1.3 Wed Oct 10 01:29:25 2018
+++ src/crypto/external/bsd/openssl/include/openssl/opensslconf.h Wed Oct 10 06:16:55 2018
@@ -48,6 +48,11 @@ extern "C" {
#ifndef OPENSSL_NO_DEVCRYPTOENG
# define OPENSSL_NO_DEVCRYPTOENG
#endif
+#ifndef _LP64
+# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+# endif
+#endif
#ifndef OPENSSL_NO_EGD
# define OPENSSL_NO_EGD
#endif
