CVS commit: src/tests/net/route

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 21 04:03:17 UTC 2017

Modified Files:
src/tests/net/route: t_route.sh

Log Message:
Add a test case for PR kern/52083


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/net/route/t_route.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/net/route/t_route.sh
diff -u src/tests/net/route/t_route.sh:1.10 src/tests/net/route/t_route.sh:1.11
--- src/tests/net/route/t_route.sh:1.10	Wed Dec 21 02:46:08 2016
+++ src/tests/net/route/t_route.sh	Tue Mar 21 04:03:17 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: t_route.sh,v 1.10 2016/12/21 02:46:08 ozaki-r Exp $
+#	$NetBSD: t_route.sh,v 1.11 2017/03/21 04:03:17 ozaki-r Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -397,10 +397,51 @@ route_command_get6_cleanup()
 	cleanup
 }
 
+atf_test_case route_default_reject cleanup
+route_default_reject_head()
+{
+
+	atf_set "descr" "tests for making a default route reject"
+	atf_set "require.progs" "rump_server"
+}
+
+route_default_reject_body()
+{
+
+	rump_server_start $SOCKSRC netinet6
+	rump_server_add_iface $SOCKSRC shmif0 $BUS_SRCGW
+
+	export RUMP_SERVER=$SOCKSRC
+
+	# From /etc/rc.d/network
+	atf_check -s exit:0 -o match:'add net ::0.0.0.0: gateway ::1' \
+	rump.route add -inet6 ::0.0.0.0 -prefixlen 104 ::1 -reject
+
+	atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6SRC/64 up
+	$DEBUG && rump.netstat -nr -f inet6
+	atf_check -s exit:0 -o match:"add net default: gateway $IP6SRCGW" \
+	rump.route add -inet6 default $IP6SRCGW
+	$DEBUG && rump.netstat -nr -f inet6
+	$DEBUG && rump.route -n get -inet6 default
+	atf_check -s exit:0 -o match:'change net default' \
+	rump.route change -inet6 default -reject
+	$DEBUG && rump.netstat -nr -f inet6
+
+	rump_server_destroy_ifaces
+}
+
+route_default_reject_cleanup()
+{
+
+	$DEBUG && dump
+	cleanup
+}
+
 atf_init_test_cases()
 {
 
 	atf_add_test_case route_non_subnet_gateway
 	atf_add_test_case route_command_get
 	atf_add_test_case route_command_get6
+	atf_add_test_case route_default_reject
 }

CVS commit: src/sys/uvm

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Mar 21 02:24:35 UTC 2017

Modified Files:
src/sys/uvm: uvm_bio.c

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/uvm/uvm_bio.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/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.88 src/sys/uvm/uvm_bio.c:1.89
--- src/sys/uvm/uvm_bio.c:1.88	Mon Mar 20 22:57:04 2017
+++ src/sys/uvm/uvm_bio.c	Tue Mar 21 02:24:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_bio.c,v 1.88 2017/03/20 22:57:04 kre Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.89 2017/03/21 02:24:35 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.88 2017/03/20 22:57:04 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.89 2017/03/21 02:24:35 ozaki-r Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
@@ -356,7 +356,7 @@ ubc_fault(struct uvm_faultinfo *ufi, vad
 		KASSERTMSG((slot_offset < umap->writeoff + umap->writelen),
 		"out of range write: slot=%#"PRIxVADDR
 		" off=%#"PRIxOFF" len=%#"PRIxVSIZE,
-		slot_offset, (intmax_t_umap->writeoff, umap->writelen);
+		slot_offset, (intmax_t)umap->writeoff, umap->writelen);
 	}
 
 	/* no umap locking needed since we have a ref on the umap */

CVS commit: src/usr.bin/units

[Sean Cole]

Module Name:src
Committed By:   scole
Date:   Tue Mar 21 01:21:59 UTC 2017

Modified Files:
src/usr.bin/units: units.lib

Log Message:
Add most common thai length/area measurements of wah rai ngan


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/units/units.lib

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/units/units.lib
diff -u src/usr.bin/units/units.lib:1.19 src/usr.bin/units/units.lib:1.20
--- src/usr.bin/units/units.lib:1.19	Fri Feb  5 03:38:50 2016
+++ src/usr.bin/units/units.lib	Tue Mar 21 01:21:59 2017
@@ -1,4 +1,4 @@
-/	$NetBSD: units.lib,v 1.19 2016/02/05 03:38:50 dholland Exp $
+/	$NetBSD: units.lib,v 1.20 2017/03/21 01:21:59 scole Exp $
 
 / primitive units
 
@@ -652,3 +652,9 @@ worstedyarncount	1680 ft/pound
 metricyarncount		meter/gram
 jewlerspoint		2 milligram
 
+/ thai measurements
+
+wah			2 m
+ngan			400 m2
+rai			1600 m2
+

CVS commit: src/sys/uvm

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 22:57:05 UTC 2017

Modified Files:
src/sys/uvm: uvm_bio.c

Log Message:
Ugh.   This stuff is disgusting.   We really need an arch dependent
PRIxOFF (and PRIdOFF) to print off_t's in a way that matches the
arch's definition of off_t.

In the meantime fall back on %jx and an (intmax_t) cast.   Ugly.
(And the way it is written is even uglier...)


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/uvm/uvm_bio.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/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.87 src/sys/uvm/uvm_bio.c:1.88
--- src/sys/uvm/uvm_bio.c:1.87	Mon Mar 20 10:44:24 2017
+++ src/sys/uvm/uvm_bio.c	Mon Mar 20 22:57:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_bio.c,v 1.87 2017/03/20 10:44:24 kre Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.88 2017/03/20 22:57:04 kre Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.87 2017/03/20 10:44:24 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.88 2017/03/20 22:57:04 kre Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
@@ -348,15 +348,15 @@ ubc_fault(struct uvm_faultinfo *ufi, vad
 
 	if ((access_type & VM_PROT_WRITE) != 0) {
 #ifndef PRIxOFF		/* XXX */
-#define PRIxOFF "llx"	/* XXX */
+#define PRIxOFF "jx"	/* XXX */
 #endif			/* XXX */
 		KASSERTMSG((trunc_page(umap->writeoff) <= slot_offset),
 		"out of range write: slot=%#"PRIxVSIZE" off=%#"PRIxOFF,
-		slot_offset, umap->writeoff);
+		slot_offset, (intmax_t)umap->writeoff);
 		KASSERTMSG((slot_offset < umap->writeoff + umap->writelen),
 		"out of range write: slot=%#"PRIxVADDR
 		" off=%#"PRIxOFF" len=%#"PRIxVSIZE,
-		slot_offset, umap->writeoff, umap->writelen);
+		slot_offset, (intmax_t_umap->writeoff, umap->writelen);
 	}
 
 	/* no umap locking needed since we have a ref on the umap */

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Mon Mar 20 22:42:39 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Adjust array bounds depending on type in macros for mix/saturate/recswvol.


To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/audio.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/dev/audio.c
diff -u src/sys/dev/audio.c:1.315 src/sys/dev/audio.c:1.316
--- src/sys/dev/audio.c:1.315	Thu Mar 16 00:21:30 2017
+++ src/sys/dev/audio.c	Mon Mar 20 22:42:39 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.315 2017/03/16 00:21:30 maya Exp $	*/
+/*	$NetBSD: audio.c,v 1.316 2017/03/20 22:42:39 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.315 2017/03/16 00:21:30 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.316 2017/03/20 22:42:39 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -5541,7 +5541,7 @@ mix_write(void *arg)
 			if (cc > cc2)	\
 cc = cc2;\
 	\
-			for (m = 0; m < cc / 2; m++) {			\
+			for (m = 0; m < (cc / (name / 8)); m++) {	\
 orig[m] += (type)((int32_t)(tomix[m] *	\
 (vc->sc_swvol + 1)) / (sc->sc_opens * \
 256));\
@@ -5594,7 +5594,7 @@ mix_func(struct audio_softc *sc, struct 
 	\
 		orig = (type *)(sc->sc_pr.s.inp);			\
 	\
-		for (m = 0; m < resid;m++) {\
+		for (m = 0; m < (resid / (name / 8));m++) {		\
 			i = 0;		\
 			if (&orig[m] >= (type *)sc->sc_pr.s.end) {	\
 orig = (type *)sc->sc_pr.s.start;	\
@@ -5655,7 +5655,7 @@ saturate_func(struct audio_softc *sc)
 			if (cc > cc1)	\
 cc = cc1;\
 	\
-			for (m = 0; m < cc; m++) {			\
+			for (m = 0; m < (cc / (name / 8)); m++) {	\
 orig[m] = (bigger_type)(orig[m] *	\
 (bigger_type)(vc->sc_recswvol) / 256);\
 			}		\

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 22:17:56 UTC 2017

Modified Files:
src/bin/sh: sh.1

Log Message:
At the suggestion of Matthew Sporleder (on current-users@) reword some
of the description of arithmetic expressions to make it a bit more
human friendly.

While here fix a few other minor errors, and bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/bin/sh/sh.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.126 src/bin/sh/sh.1:1.127
--- src/bin/sh/sh.1:1.126	Mon Mar 20 11:26:07 2017
+++ src/bin/sh/sh.1	Mon Mar 20 22:17:56 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.126 2017/03/20 11:26:07 kre Exp $
+.\"	$NetBSD: sh.1,v 1.127 2017/03/20 22:17:56 kre Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)sh.1	8.6 (Berkeley) 5/4/95
 .\"
-.Dd February 1, 2017
+.Dd March 20, 2017
 .Dt SH 1
 .ds flags abCEeFfhnuvxIimpqV
 .Os
@@ -1235,13 +1235,23 @@ The format for arithmetic expansion is a
 .Pp
 .Dl $((expression))
 .Pp
-The expression is treated as if it were in double quotes, except
-that a double quote inside the expression is not treated specially.
+The expression in an arithmetic expansion is treated as if it were in
+double quotes, except that a double quote character inside the expression
+is just a normal character (it quotes nothing.)
 The shell expands all tokens in the expression for parameter expansion,
-command substitution, and quote removal.
+command substitution, and quote removal (the only quoting character is
+the backslash
+.Sq \&\e ,
+and only when followed by another
+.Sq \&\e ,
+a dollar sign
+.Sq \&$ ,
+a backquote
+.Sq \&`
+or a newline.)
 .Pp
-Next, the shell treats this as an arithmetic expression and
-substitutes the value of the expression.
+Next, the shell evaluates the expanded result as an arithmetic expression
+and substitutes the calculated value of that expression.
 .Pp
 Arithmetic expressions use a syntax similar to that
 of the C language, and are evaluated using the
@@ -1250,7 +1260,7 @@ data type (this is an extension to
 .Tn POSIX ,
 which requires only
 .Ql long
-arithmetic).
+arithmetic.)
 Shell variables may be referenced by name inside an arithmetic
 expression, without needing a
 .Dq \&$
@@ -1595,7 +1605,7 @@ environment of subsequent commands.
 With
 .Fl n
 the specified names are un-exported.
-Variables can also be un-exported using the unset builtin command.
+Variables can also be un-exported using the unset built in command.
 With
 .Fl x
 (exclude) the specified names are marked not to be exported,
@@ -2216,7 +2226,7 @@ its exit status will be greater than 128
 Once waited upon, by specific process number or job-id,
 or by a
 .Ic wait
-with no argumentss,
+with no arguments,
 knowledge of the child is removed from the system,
 and it cannot be waited upon again.
 .El

CVS commit: src/games/tetris

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 20 22:05:27 UTC 2017

Modified Files:
src/games/tetris: screen.c

Log Message:
elide compiler stupidity.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/games/tetris/screen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/games/tetris/screen.c
diff -u src/games/tetris/screen.c:1.32 src/games/tetris/screen.c:1.33
--- src/games/tetris/screen.c:1.32	Thu Mar  3 16:38:55 2016
+++ src/games/tetris/screen.c	Mon Mar 20 18:05:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: screen.c,v 1.32 2016/03/03 21:38:55 nat Exp $	*/
+/*	$NetBSD: screen.c,v 1.33 2017/03/20 22:05:27 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -212,10 +212,11 @@ scr_set(void)
 	 * We made it.  We are now in screen mode, modulo TIstr
 	 * (which we will fix immediately).
 	 */
-	if (enter_ca_mode)
-		putstr(enter_ca_mode);
-	if (cursor_invisible)
-		putstr(cursor_invisible);
+	const char *tstr;
+	if ((tstr = enter_ca_mode) != NULL)
+		putstr(tstr);
+	if ((tstr = cursor_invisible) != NULL)
+		putstr(tstr);
 	if (tstp != SIG_IGN)
 		(void) signal(SIGTSTP, scr_stop);
 	if (ttou != SIG_IGN)
@@ -239,15 +240,16 @@ scr_end(void)
 	sigaddset(&nsigset, SIGTTOU);
 	(void) sigprocmask(SIG_BLOCK, &nsigset, &osigset);
 	/* move cursor to last line */
-	if (cursor_to_ll)
-		putstr(cursor_to_ll);
+	const char *tstr;
+	if ((tstr = cursor_to_ll) != NULL)
+		putstr(tstr);
 	else
 		moveto(Rows - 1, 0);
 	/* exit screen mode */
-	if (exit_ca_mode)
-		putstr(exit_ca_mode);
-	if (cursor_normal)
-		putstr(cursor_normal);
+	if ((tstr = exit_ca_mode) != NULL)
+		putstr(tstr);
+	if ((tstr = cursor_normal) != NULL)
+		putstr(tstr);
 	(void) fflush(stdout);
 	(void) tcsetattr(0, TCSADRAIN, &oldtt);
 	isset = 0;

CVS commit: src/sys/arch/evbarm/conf

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Mar 20 21:30:47 UTC 2017

Modified Files:
src/sys/arch/evbarm/conf: GENERIC.common

Log Message:
+KDTRACE_HOOKS and INSECURE


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/GENERIC.common

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/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.16 src/sys/arch/evbarm/conf/GENERIC.common:1.17
--- src/sys/arch/evbarm/conf/GENERIC.common:1.16	Mon Mar 20 21:08:55 2017
+++ src/sys/arch/evbarm/conf/GENERIC.common	Mon Mar 20 21:30:47 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.16 2017/03/20 21:08:55 skrll Exp $
+#	$NetBSD: GENERIC.common,v 1.17 2017/03/20 21:30:47 skrll Exp $
 #
 #	GENERIC evbarm kernel config (template)
 #
@@ -104,11 +104,12 @@ options 	SYSVSHM		# System V-like memory
 #options 	MEMORY_DISK_FBFLAGS=RB_SINGLE
 
 # Miscellaneous kernel options
-options 	KTRACE		# system call tracing, a la ktrace(1)
-#options 	SCSIVERBOSE	# Verbose SCSI errors
-#options 	MIIVERBOSE	# Verbose MII autoconfuration messages
-#options 	USERCONF	# userconf(4) support
-#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
+options 	INSECURE		# disable `kernel security level'
+options 	KTRACE			# system call tracing, a la ktrace(1)
+#options 	SCSIVERBOSE		# Verbose SCSI errors
+#options 	MIIVERBOSE		# Verbose MII autoconfuration messages
+#options 	USERCONF		# userconf(4) support
+#options 	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
 
 # Wedge support
 options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
@@ -124,6 +125,7 @@ options 	BUFQ_PRIOCSCAN
 #options 	PERFCTRS	# performance counters
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
+options 	KDTRACE_HOOKS	# kernel DTrace hooks
 #options 	LOCKDEBUG
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	IPKDB		# remote kernel debugging

CVS commit: src/sys/arch/evbarm/conf

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Mar 20 21:08:55 UTC 2017

Modified Files:
src/sys/arch/evbarm/conf: GENERIC.common

Log Message:
convert spaces to tab


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/GENERIC.common

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/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.15 src/sys/arch/evbarm/conf/GENERIC.common:1.16
--- src/sys/arch/evbarm/conf/GENERIC.common:1.15	Sun Feb 19 07:47:00 2017
+++ src/sys/arch/evbarm/conf/GENERIC.common	Mon Mar 20 21:08:55 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.15 2017/02/19 07:47:00 rin Exp $
+#	$NetBSD: GENERIC.common,v 1.16 2017/03/20 21:08:55 skrll Exp $
 #
 #	GENERIC evbarm kernel config (template)
 #
@@ -165,7 +165,7 @@ pseudo-device	pty			# pseudo-terminals
 pseudo-device	ksyms			# /dev/ksyms
 pseudo-device	lockstat		# lock profiling
 
-options FILEASSOC   # fileassoc(9) - required for Veriexec
+options 	FILEASSOC		# fileassoc(9) - required for Veriexec
 	# and PAX_SEGVGUARD
 
 # Veriexec

CVS commit: src/lib/libcurses

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 20 20:44:06 UTC 2017

Modified Files:
src/lib/libcurses: setterm.c

Log Message:
Make this compile again (gcc does not like strcmp(maybe-NULL, maybe-NULL);
simplify the life of the {compiler,human eyes}.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/lib/libcurses/setterm.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/setterm.c
diff -u src/lib/libcurses/setterm.c:1.64 src/lib/libcurses/setterm.c:1.65
--- src/lib/libcurses/setterm.c:1.64	Tue Jan 31 04:17:53 2017
+++ src/lib/libcurses/setterm.c	Mon Mar 20 16:44:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: setterm.c,v 1.64 2017/01/31 09:17:53 roy Exp $	*/
+/*	$NetBSD: setterm.c,v 1.65 2017/03/20 20:44:06 christos Exp $	*/
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setterm.c	8.8 (Berkeley) 10/25/94";
 #else
-__RCSID("$NetBSD: setterm.c,v 1.64 2017/01/31 09:17:53 roy Exp $");
+__RCSID("$NetBSD: setterm.c,v 1.65 2017/03/20 20:44:06 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -189,22 +189,24 @@ _cursesi_setterm(char *type, SCREEN *scr
 #else
 	screen->mask_op = WA_ATTRIBUTES & ~__COLOR;
 #endif /* HAVE_WCHAR */
-	if (t_orig_pair(screen->term) != NULL) {
-		if (does_esc_m(t_orig_pair(screen->term)))
+
+	const char *t_op = t_orig_pair(screen->term);
+	const char *t_esm = t_exit_standout_mode(screen->term);
+	const char *t_eum = t_exit_underline_mode(screen->term);
+	const char *t_eam = t_exit_attribute_mode(screen->term);
+
+	if (t_op != NULL) {
+		if (does_esc_m(t_op))
 			screen->mask_op &=
 			~(__STANDOUT | __UNDERSCORE | __TERMATTR);
 		else {
-			if (t_exit_standout_mode(screen->term) != NULL &&
-			!strcmp(t_orig_pair(screen->term),
-t_exit_standout_mode(screen->term)))
+			if (t_esm != NULL && !strcmp(t_op, t_esm))
 screen->mask_op &= ~__STANDOUT;
-			if (t_exit_underline_mode(screen->term) != NULL &&
-			!strcmp(t_orig_pair(screen->term),
-t_exit_underline_mode(screen->term)))
+
+			if (t_eum != NULL && !strcmp(t_op, t_eum))
 screen->mask_op &= ~__UNDERSCORE;
-			if (t_exit_attribute_mode(screen->term) != NULL &&
-			!strcmp(t_orig_pair(screen->term),
-t_exit_attribute_mode(screen->term)))
+
+			if (t_eam != NULL && !strcmp(t_op, t_eam))
 screen->mask_op &= ~__TERMATTR;
 		}
 	}
@@ -226,22 +228,18 @@ _cursesi_setterm(char *type, SCREEN *scr
 #else
 	screen->mask_ue = WA_ATTRIBUTES & ~__UNDERSCORE;
 #endif /* HAVE_WCHAR */
-	if (t_exit_underline_mode(screen->term) != NULL) {
-		if (does_esc_m(t_exit_underline_mode(screen->term)))
+	if (t_eum != NULL) {
+		if (does_esc_m(t_eum))
 			screen->mask_ue &=
 			~(__STANDOUT | __TERMATTR | __COLOR);
 		else {
-			if (t_exit_standout_mode(screen->term) != NULL &&
-			!strcmp(t_exit_underline_mode(screen->term),
-t_exit_standout_mode(screen->term)))
+			if (t_esm && !strcmp(t_eum, t_esm))
 screen->mask_ue &= ~__STANDOUT;
-			if (t_exit_attribute_mode(screen->term) != NULL &&
-			!strcmp(t_exit_underline_mode(screen->term),
-t_exit_attribute_mode(screen->term)))
+
+			if (t_eam != NULL && !strcmp(t_eum, t_eam))
 screen->mask_ue &= ~__TERMATTR;
-			if (t_orig_pair(screen->term) != NULL &&
-			!strcmp(t_exit_underline_mode(screen->term),
-t_orig_pair(screen->term)))
+
+			if (t_op != NULL && !strcmp(t_eum, t_op))
 screen->mask_ue &= ~__COLOR;
 		}
 	}
@@ -250,22 +248,18 @@ _cursesi_setterm(char *type, SCREEN *scr
 #else
 	screen->mask_se = WA_ATTRIBUTES & ~__STANDOUT;
 #endif /* HAVE_WCHAR */
-	if (t_exit_standout_mode(screen->term) != NULL) {
-		if (does_esc_m(t_exit_standout_mode(screen->term)))
+	if (t_esm != NULL) {
+		if (does_esc_m(t_esm))
 			screen->mask_se &=
 			~(__UNDERSCORE | __TERMATTR | __COLOR);
 		else {
-			if (t_exit_underline_mode(screen->term) != NULL &&
-			!strcmp(t_exit_standout_mode(screen->term),
-t_exit_underline_mode(screen->term)))
+			if (t_eum != NULL && !strcmp(t_esm, t_eum))
 screen->mask_se &= ~__UNDERSCORE;
-			if (t_exit_attribute_mode(screen->term) != NULL &&
-			!strcmp(t_exit_standout_mode(screen->term),
-t_exit_attribute_mode(screen->term)))
+
+			if (t_eam != NULL && !strcmp(t_esm, t_eam))
 screen->mask_se &= ~__TERMATTR;
-			if (t_orig_pair(screen->term) != NULL &&
-			!strcmp(t_exit_standout_mode(screen->term),
-t_orig_pair(screen->term)))
+
+			if (t_op != NULL && !strcmp(t_esm, t_op))
 screen->mask_se &= ~__COLOR;
 		}
 	}

CVS commit: src/lib/libcurses

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 20 20:42:39 UTC 2017

Modified Files:
src/lib/libcurses: refresh.c

Log Message:
Make this compile again: use ce instead of clr_eol which gcc thinks might
be NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 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/refresh.c
diff -u src/lib/libcurses/refresh.c:1.87 src/lib/libcurses/refresh.c:1.88
--- src/lib/libcurses/refresh.c:1.87	Wed Jan 11 05:06:32 2017
+++ src/lib/libcurses/refresh.c	Mon Mar 20 16:42:39 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: refresh.c,v 1.87 2017/01/11 10:06:32 roy Exp $	*/
+/*	$NetBSD: refresh.c,v 1.88 2017/03/20 20:42:39 christos 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.87 2017/01/11 10:06:32 roy Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.88 2017/03/20 20:42:39 christos Exp $");
 #endif
 #endif/* not lint */
 
@@ -985,7 +985,7 @@ makech(int wy)
 "makech: line = %p, cep = %p, begx = %u\n",
 curscr->alines[wy]->line, cep, win->begx);
 #endif
-if (((clsp - nlsp >= strlen(clr_eol) &&
+if (((clsp - nlsp >= strlen(ce) &&
 clsp < win->maxx * __LDATASIZE) ||
 wy == win->maxy - 1) &&
 (!(lspc & __COLOR) ||
@@ -997,7 +997,7 @@ makech(int wy)
 	(curscr->wattr & __COLOR)))
 		__set_color(curscr, lspc &
 		__COLOR);
-	tputs(clr_eol, 0, __cputchar);
+	tputs(ce, 0, __cputchar);
 	_cursesi_screen->lx = wx + win->begx;
 	while (wx++ <= clsp) {
 		csp->attr = lspc;

CVS commit: src/lib/libcurses

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 20 18:19:34 UTC 2017

Modified Files:
src/lib/libcurses: cr_put.c

Log Message:
comment out unused code.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/cr_put.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/cr_put.c
diff -u src/lib/libcurses/cr_put.c:1.32 src/lib/libcurses/cr_put.c:1.33
--- src/lib/libcurses/cr_put.c:1.32	Fri Jan  6 08:53:18 2017
+++ src/lib/libcurses/cr_put.c	Mon Mar 20 14:19:34 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cr_put.c,v 1.32 2017/01/06 13:53:18 roy Exp $	*/
+/*	$NetBSD: cr_put.c,v 1.33 2017/03/20 18:19:34 christos Exp $	*/
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)cr_put.c	8.3 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: cr_put.c,v 1.32 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: cr_put.c,v 1.33 2017/03/20 18:19:34 christos Exp $");
 #endif
 #endif/* not lint */
 
@@ -344,8 +344,10 @@ dontcr:while (outline < destline) {
 		if (__NONL || __pfast == 0)
 			outcol = 0;
 	}
+#ifdef notdef
 	if (back_tab)
 		k = (int) strlen(back_tab);
+#endif
 	while (outcol > destcol) {
 		if (plodcnt < 0)
 			goto out;

CVS commit: src/etc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 20 16:02:48 UTC 2017

Modified Files:
src/etc: rc

Log Message:
set cloexec to the rc postprocessor fd (rudolf in tech-userlevel)


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/etc/rc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc
diff -u src/etc/rc:1.172 src/etc/rc:1.173
--- src/etc/rc:1.172	Thu Feb  2 15:49:55 2017
+++ src/etc/rc	Mon Mar 20 12:02:48 2017
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rc,v 1.172 2017/02/02 20:49:55 christos Exp $
+# $NetBSD: rc,v 1.173 2017/03/20 16:02:48 christos Exp $
 #
 # rc --
 #	Run the scripts in /etc/rc.d with rcorder, and log output
@@ -87,6 +87,7 @@ rc_real_work()
 	_rc_postprocessor_fd=9 ; export _rc_postprocessor_fd
 	_rc_pid=$$ ; export _rc_pid
 	eval "exec ${_rc_postprocessor_fd}>&1"
+	fdflags -s +cloexec 9
 
 	# Print a metadata line when we exit
 	#

CVS commit: src/sys/uvm

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Mar 20 15:51:41 UTC 2017

Modified Files:
src/sys/uvm: uvm_fault.c

Log Message:
Ensure we pass the prot in flags to pmap_enter when creating a wired
mapping


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/uvm/uvm_fault.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/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.198 src/sys/uvm/uvm_fault.c:1.199
--- src/sys/uvm/uvm_fault.c:1.198	Sun Mar 19 23:44:34 2017
+++ src/sys/uvm/uvm_fault.c	Mon Mar 20 15:51:41 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_fault.c,v 1.198 2017/03/19 23:44:34 riastradh Exp $	*/
+/*	$NetBSD: uvm_fault.c,v 1.199 2017/03/20 15:51:41 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.198 2017/03/19 23:44:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.199 2017/03/20 15:51:41 skrll Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1820,11 +1820,14 @@ uvm_fault_lower_neighbor(
 	UVM_PAGE_OWN(pg, NULL);
 
 	KASSERT(mutex_owned(pg->uobject->vmobjlock));
-	(void) pmap_enter(ufi->orig_map->pmap, currva,
-	VM_PAGE_TO_PHYS(pg),
+
+	const vm_prot_t mapprot = 
 	readonly ? (flt->enter_prot & ~VM_PROT_WRITE) :
-	flt->enter_prot & MASK(ufi->entry),
-	PMAP_CANFAIL | (flt->wire_mapping ? PMAP_WIRED : 0));
+	flt->enter_prot & MASK(ufi->entry);
+	const u_int mapflags = 
+	PMAP_CANFAIL | (flt->wire_mapping ? (mapprot | PMAP_WIRED) : 0);
+	(void) pmap_enter(ufi->orig_map->pmap, currva,
+	VM_PAGE_TO_PHYS(pg), mapprot, mapflags);
 }
 
 /*

CVS commit: src/lib/libterminfo

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Mar 20 14:46:28 UTC 2017

Modified Files:
src/lib/libterminfo: term.h

Log Message:
Ensure there is a terminal to return capabilities from.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libterminfo/term.h

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/term.h
diff -u src/lib/libterminfo/term.h:1.17 src/lib/libterminfo/term.h:1.18
--- src/lib/libterminfo/term.h:1.17	Thu Jan 12 13:53:11 2017
+++ src/lib/libterminfo/term.h	Mon Mar 20 14:46:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.17 2017/01/12 13:53:11 roy Exp $ */
+/* $NetBSD: term.h,v 1.18 2017/03/20 14:46:28 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2011, 2013 The NetBSD Foundation, Inc.
@@ -35,6 +35,11 @@
 #define	OK	(0)	/* Success return */
 #endif
 
+/* Ensure we have a terminal to return capabilities from */
+#define	TIFLAG(t, c)			((t) != NULL ? (t)->flags[c] : 0)
+#define	TINUM(t, c)			((t) != NULL ? (t)->nums[c] : -1)
+#define	TISTR(t, c)			((t) != NULL ? (t)->strs[c] : NULL)
+
 /* Define available terminfo flags */
 enum TIFLAGS {
 	TICODE_bw,
@@ -77,43 +82,43 @@ enum TIFLAGS {
 };
 #define TIFLAGMAX	TICODE_xon
 
-#define t_auto_left_margin(t)		(t)->flags[TICODE_bw]
-#define t_auto_right_margin(t)		(t)->flags[TICODE_am]
-#define t_back_color_erase(t)		(t)->flags[TICODE_bce]
-#define t_can_change(t)			(t)->flags[TICODE_ccc]
-#define t_ceol_standout_glitch(t)	(t)->flags[TICODE_xhp]
-#define t_col_addr_glitch(t)		(t)->flags[TICODE_xhpa]
-#define t_cpi_changes_res(t)		(t)->flags[TICODE_cpix]
-#define t_cr_cancels_micro_mode(t)	(t)->flags[TICODE_crxm]
-#define t_dest_tabs_magic_smso(t)	(t)->flags[TICODE_xt]
-#define t_eat_newline_glitch(t)		(t)->flags[TICODE_xenl]
-#define t_erase_overstrike(t)		(t)->flags[TICODE_eo]
-#define t_generic_type(t)		(t)->flags[TICODE_gn]
-#define t_hard_copy(t)			(t)->flags[TICODE_hc]
-#define t_hard_cursor(t)		(t)->flags[TICODE_chts]
-#define t_has_meta_key(t)		(t)->flags[TICODE_km]
-#define t_has_print_wheel(t)		(t)->flags[TICODE_daisy]
-#define t_has_status_line(t)		(t)->flags[TICODE_hs]
-#define t_hue_light_saturation(t)	(t)->flags[TICODE_hls]
-#define t_insert_null_glitch(t)		(t)->flags[TICODE_in]
-#define t_lpi_changes_yes(t)		(t)->flags[TICODE_lpix]
-#define t_memory_above(t)		(t)->flags[TICODE_da]
-#define t_memory_below(t)		(t)->flags[TICODE_db]
-#define t_move_insert_mode(t)		(t)->flags[TICODE_mir]
-#define t_move_standout_mode(t)		(t)->flags[TICODE_msgr]
-#define t_needs_xon_xoff(t)		(t)->flags[TICODE_nxon]
-#define t_no_esc_ctlc(t)		(t)->flags[TICODE_xsb]
-#define t_no_pad_char(t)		(t)->flags[TICODE_npc]
-#define t_non_dest_scroll_region(t)	(t)->flags[TICODE_ndscr]
-#define t_non_rev_rmcup(t)		(t)->flags[TICODE_nrrmc]
-#define t_over_strike(t)		(t)->flags[TICODE_os]
-#define t_prtr_silent(t)		(t)->flags[TICODE_mc5i]
-#define t_row_addr_glitch(t)		(t)->flags[TICODE_xvpa]
-#define t_semi_auto_right_margin(t)	(t)->flags[TICODE_sam]
-#define t_status_line_esc_ok(t)		(t)->flags[TICODE_eslok]
-#define t_tilde_glitch(t)		(t)->flags[TICODE_hz]
-#define t_transparent_underline(t)	(t)->flags[TICODE_ul]
-#define t_xon_xoff(t)			(t)->flags[TICODE_xon]
+#define t_auto_left_margin(t)		TIFLAG((t), TICODE_bw)
+#define t_auto_right_margin(t)		TIFLAG((t), TICODE_am)
+#define t_back_color_erase(t)		TIFLAG((t), TICODE_bce)
+#define t_can_change(t)			TIFLAG((t), TICODE_ccc)
+#define t_ceol_standout_glitch(t)	TIFLAG((t), TICODE_xhp)
+#define t_col_addr_glitch(t)		TIFLAG((t), TICODE_xhpa)
+#define t_cpi_changes_res(t)		TIFLAG((t), TICODE_cpix)
+#define t_cr_cancels_micro_mode(t)	TIFLAG((t), TICODE_crxm)
+#define t_dest_tabs_magic_smso(t)	TIFLAG((t), TICODE_xt)
+#define t_eat_newline_glitch(t)		TIFLAG((t), TICODE_xenl)
+#define t_erase_overstrike(t)		TIFLAG((t), TICODE_eo)
+#define t_generic_type(t)		TIFLAG((t), TICODE_gn)
+#define t_hard_copy(t)			TIFLAG((t), TICODE_hc)
+#define t_hard_cursor(t)		TIFLAG((t), TICODE_chts)
+#define t_has_meta_key(t)		TIFLAG((t), TICODE_km)
+#define t_has_print_wheel(t)		TIFLAG((t), TICODE_daisy)
+#define t_has_status_line(t)		TIFLAG((t), TICODE_hs)
+#define t_hue_light_saturation(t)	TIFLAG((t), TICODE_hls)
+#define t_insert_null_glitch(t)		TIFLAG((t), TICODE_in)
+#define t_lpi_changes_yes(t)		TIFLAG((t), TICODE_lpix)
+#define t_memory_above(t)		TIFLAG((t), TICODE_da)
+#define t_memory_below(t)		TIFLAG((t), TICODE_db)
+#define t_move_insert_mode(t)		TIFLAG((t), TICODE_mir)
+#define t_move_standout_mode(t)		TIFLAG((t), TICODE_msgr)
+#define t_needs_xon_xoff(t)		TIFLAG((t), TICODE_nxon)
+#define t_no_esc_ctlc(t)		TIFLAG((t), TICODE_xsb)
+#define t_no_pad_char(t)		TIFLAG((t), TICODE_npc)
+#define t_non_dest_scroll_region(t)	TIFLAG((t), TICODE_ndscr)
+#define t_non_rev_rmcup(t)		TIFLAG((t), TICODE_nrrmc)
+#define t_over_strike(t)		TIFLAG((t), TICODE_os)
+#define t_prtr_silent(t)		TIFLAG((t), TICO

CVS commit: src/sys/arch/evbarm/conf

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Mar 20 14:06:43 UTC 2017

Modified Files:
src/sys/arch/evbarm/conf: BPI HUMMINGBIRD_A31 KOBO ODROID-C1 TEGRA

Log Message:
Disable DIAGNOSTIC - it is already enabled in GENERIC.common


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/BPI
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/KOBO
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/ODROID-C1
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/TEGRA

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/evbarm/conf/BPI
diff -u src/sys/arch/evbarm/conf/BPI:1.20 src/sys/arch/evbarm/conf/BPI:1.21
--- src/sys/arch/evbarm/conf/BPI:1.20	Tue Dec 13 20:42:17 2016
+++ src/sys/arch/evbarm/conf/BPI	Mon Mar 20 14:06:43 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BPI,v 1.20 2016/12/13 20:42:17 christos Exp $
+#	$NetBSD: BPI,v 1.21 2017/03/20 14:06:43 skrll Exp $
 #
 #	BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel
 #
@@ -22,7 +22,7 @@ options 	MULTIPROCESSOR
 
 # Development and Debugging options
 
-options 	DIAGNOSTIC	# internal consistency checks
+#options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1

Index: src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.27 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.28
--- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.27	Tue Dec 13 20:42:17 2016
+++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31	Mon Mar 20 14:06:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: HUMMINGBIRD_A31,v 1.27 2016/12/13 20:42:17 christos Exp $
+#	$NetBSD: HUMMINGBIRD_A31,v 1.28 2017/03/20 14:06:43 skrll Exp $
 #
 #	HUMMINGBIRD_A31 - Merrii Hummingbird A31
 #
@@ -18,7 +18,7 @@ options 	ALLWINNER_A31
 options 	AWIN_CONSOLE_EARLY
 options 	AWIN_GPIO_IGNORE_FW
 
-options 	DIAGNOSTIC	# internal consistency checks
+#options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/evbarm/conf/KOBO
diff -u src/sys/arch/evbarm/conf/KOBO:1.7 src/sys/arch/evbarm/conf/KOBO:1.8
--- src/sys/arch/evbarm/conf/KOBO:1.7	Fri Apr 10 10:58:07 2015
+++ src/sys/arch/evbarm/conf/KOBO	Mon Mar 20 14:06:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: KOBO,v 1.7 2015/04/10 10:58:07 hkenken Exp $
+#	$NetBSD: KOBO,v 1.8 2017/03/20 14:06:43 skrll Exp $
 #
 #	KOBO -- http://kobo.com
 #
@@ -24,8 +24,8 @@ options 	IMX51_IPGCLK_FREQ=5000   # 
 options 	CONSDEVNAME="\"imxuart\"",CONADDR=0x53fc
 options 	CONSPEED=115200	# Console speed
 
-options DIAGNOSTIC  # internal consistency checks
-#optionsDEBUG
+#options 	DIAGNOSTIC	# internal consistency checks
+#options 	DEBUG
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1

Index: src/sys/arch/evbarm/conf/ODROID-C1
diff -u src/sys/arch/evbarm/conf/ODROID-C1:1.21 src/sys/arch/evbarm/conf/ODROID-C1:1.22
--- src/sys/arch/evbarm/conf/ODROID-C1:1.21	Sun Nov 29 16:52:00 2015
+++ src/sys/arch/evbarm/conf/ODROID-C1	Mon Mar 20 14:06:43 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ODROID-C1,v 1.21 2015/11/29 16:52:00 jmcneill Exp $
+#	$NetBSD: ODROID-C1,v 1.22 2017/03/20 14:06:43 skrll Exp $
 #
 #	Hardkernel ODROID-C1 (Amlogic S805) based SBC (Single Board Computer)
 #
@@ -10,7 +10,7 @@ include	"arch/evbarm/conf/GENERIC.common
 options 	CPU_CORTEXA5
 options 	MULTIPROCESSOR
 
-options 	DIAGNOSTIC
+#options 	DIAGNOSTIC
 #options 	DEBUG
 #options 	LOCKDEBUG
 makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/evbarm/conf/TEGRA
diff -u src/sys/arch/evbarm/conf/TEGRA:1.10 src/sys/arch/evbarm/conf/TEGRA:1.11
--- src/sys/arch/evbarm/conf/TEGRA:1.10	Tue Dec 13 20:42:17 2016
+++ src/sys/arch/evbarm/conf/TEGRA	Mon Mar 20 14:06:43 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: TEGRA,v 1.10 2016/12/13 20:42:17 christos Exp $
+#	$NetBSD: TEGRA,v 1.11 2017/03/20 14:06:43 skrll Exp $
 #
 #	NVIDIA Tegra K1 (T124)
 #
@@ -13,7 +13,7 @@ options 	MULTIPROCESSOR
 
 pseudo-device 	openfirm	# /dev/openfirm
 
-options 	DIAGNOSTIC	# internal consistency checks
+#options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 #options 	LOCKDEBUG
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 13:12:35 UTC 2017

Modified Files:
src/bin/sh: arith_token.c

Log Message:
That will teach me to commit from the version I've actually
been testing, rather than the "other version" ...


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/bin/sh/arith_token.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/arith_token.c
diff -u src/bin/sh/arith_token.c:1.2 src/bin/sh/arith_token.c:1.3
--- src/bin/sh/arith_token.c:1.2	Mon Mar 20 11:31:00 2017
+++ src/bin/sh/arith_token.c	Mon Mar 20 13:12:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: arith_token.c,v 1.2 2017/03/20 11:31:00 kre Exp $	*/
+/*	$NetBSD: arith_token.c,v 1.3 2017/03/20 13:12:35 kre Exp $	*/
 
 /*-
  * Copyright (c) 2002
@@ -39,7 +39,7 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: arith_token.c,v 1.2 2017/03/20 11:31:00 kre Exp $");
+__RCSID("$NetBSD: arith_token.c,v 1.3 2017/03/20 13:12:35 kre Exp $");
 #endif /* not lint */
 
 #include 
@@ -89,7 +89,7 @@ arith_token(void)
 			arith_buf = end;
 			return ARITH_NUM;
 
-		} else if (is_name(token) {
+		} else if (is_name(token)) {
 			/*
 			 * Variable names all start with an alpha (or '_')
 			 * and nothing else does.  They continue for the

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Mar 20 12:16:07 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
Fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.2264 -r1.2265 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2264 src/doc/CHANGES:1.2265
--- src/doc/CHANGES:1.2264	Mon Mar 20 12:06:03 2017
+++ src/doc/CHANGES	Mon Mar 20 12:16:07 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2264 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2265 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -490,4 +490,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	mdocml: Import 1.14.1. [christos 20170318]
 	sh(1): Arithmetic parser imported from dash (via FreeBSD)
 		adding support for all required operators, as well
-		as beig smaller and faster.  [kre 20170320]
+		as being smaller and faster.  [kre 20170320]

CVS commit: src/doc

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 12:06:03 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
The sh $(()) update is signifigant enough to mention...


To generate a diff of this commit:
cvs rdiff -u -r1.2263 -r1.2264 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2263 src/doc/CHANGES:1.2264
--- src/doc/CHANGES:1.2263	Sun Mar 19 11:22:32 2017
+++ src/doc/CHANGES	Mon Mar 20 12:06:03 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2263 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2264 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -488,3 +488,6 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	sqlite3: Import 3.17.0. [christos 20170311]
 	libc: Update to tzcode2017a. [christos 20170311]
 	mdocml: Import 1.14.1. [christos 20170318]
+	sh(1): Arithmetic parser imported from dash (via FreeBSD)
+		adding support for all required operators, as well
+		as beig smaller and faster.  [kre 20170320]

CVS commit: src/tests/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 11:48:41 UTC 2017

Modified Files:
src/tests/bin/sh: t_expand.sh

Log Message:
PR bin/52090 - the $* tests are no longer expected to fail.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/bin/sh/t_expand.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/bin/sh/t_expand.sh
diff -u src/tests/bin/sh/t_expand.sh:1.10 src/tests/bin/sh/t_expand.sh:1.11
--- src/tests/bin/sh/t_expand.sh:1.10	Sun Mar 19 20:29:30 2017
+++ src/tests/bin/sh/t_expand.sh	Mon Mar 20 11:48:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.10 2017/03/19 20:29:30 kre Exp $
+# $NetBSD: t_expand.sh,v 1.11 2017/03/20 11:48:41 kre Exp $
 #
 # Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -557,7 +557,7 @@ dollar_star_with_empty_ifs_body() {
 	check 'IFS=""; set -- a "b c"; set -- "$*" ; echo $# "$*"' \
 			'1 ab c'	0  #14
 
-	results			'PR bin/52090 expect 7 of 14 subtests to fail'
+	results	  # FIXED: 'PR bin/52090 expect 7 of 14 subtests to fail'
 }
 
 atf_test_case dollar_star_in_word_empty_ifs
@@ -599,7 +599,7 @@ dollar_star_in_word_empty_ifs_body() {
 	check 'IFS="";set -- a "b c";set -- "${xXx:-$*}";echo $# "${xXx:-$*}"' \
 '1 ab c'  0  #14
 
-	results		'PR bin/52090 expect 7 of 14 subtests to fail'
+	results	  # FIXED: 'PR bin/52090 expect 7 of 14 subtests to fail'
 }
 
 atf_test_case dollar_star_in_quoted_word
@@ -659,7 +659,7 @@ dollar_star_in_quoted_word_body() {
 	check 'IFS="";set -- a "b c";set -- ${xXx:-"$*"};echo $# ${xXx:-$*}' \
 '1 ab c'  0  #26
 
-	results		 'PR bin/52090 - 2 of 26 subtests expected to fail'
+	results	  # FIXED: 'PR bin/52090 - 2 of 26 subtests expected to fail'
 }
 
 atf_init_test_cases() {

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 11:48:01 UTC 2017

Modified Files:
src/bin/sh: expand.c

Log Message:
PR bin/52090 - fix expansion of unquoted $*


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/bin/sh/expand.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.103 src/bin/sh/expand.c:1.104
--- src/bin/sh/expand.c:1.103	Mon Mar 20 11:26:07 2017
+++ src/bin/sh/expand.c	Mon Mar 20 11:48:01 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: expand.c,v 1.103 2017/03/20 11:26:07 kre Exp $	*/
+/*	$NetBSD: expand.c,v 1.104 2017/03/20 11:48:01 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #else
-__RCSID("$NetBSD: expand.c,v 1.103 2017/03/20 11:26:07 kre Exp $");
+__RCSID("$NetBSD: expand.c,v 1.104 2017/03/20 11:48:01 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -947,8 +947,13 @@ numvar:
 		sep = ifsval()[0];
 		for (ap = shellparam.p ; (p = *ap++) != NULL ; ) {
 			STRTODEST(p);
-			if (*ap && sep)
+			if (!*ap)
+break;
+			if (sep)
 STPUTC(sep, expdest);
+			else if ((flag & (EXP_FULL|EXP_IN_QUOTES)) == EXP_FULL
+			&& !quoted && **ap != '\0')
+STPUTC('\0', expdest);
 		}
 		break;
 	case '0':

CVS commit: src/tests/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 11:32:51 UTC 2017

Modified Files:
src/tests/bin/sh: t_arith.sh

Log Message:
Add tests for the $(( )) assignment operators  PR bin/50958


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/bin/sh/t_arith.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/bin/sh/t_arith.sh
diff -u src/tests/bin/sh/t_arith.sh:1.5 src/tests/bin/sh/t_arith.sh:1.6
--- src/tests/bin/sh/t_arith.sh:1.5	Thu May 12 14:25:11 2016
+++ src/tests/bin/sh/t_arith.sh	Mon Mar 20 11:32:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_arith.sh,v 1.5 2016/05/12 14:25:11 kre Exp $
+# $NetBSD: t_arith.sh,v 1.6 2017/03/20 11:32:51 kre Exp $
 #
 # Copyright (c) 2016 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -980,6 +980,63 @@ parentheses_body()
 		'echo $(( (0xfD & 0xF) == 0xF ))'
 }
 
+atf_test_case var_assign
+var_assign_head()
+{
+	atf_set "descr" "Test assignment operators in arithmetic expressions"
+}
+var_assign_body()
+{
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'unset x; echo $(( x = 3 )); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'unset x; echo $((x=3)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=5; echo $((x=3)); echo $x'
+
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'set +u;unset x; echo $((x+=3)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=2; echo $((x+=1)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=4; echo $((x-=1)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=3; echo $((x*=1)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=3; echo $((x/=1)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=28; echo $((x%=5)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=7; echo $((x&=3)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=2; echo $((x|=1)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=6; echo $((x^=5)); echo $x'
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'x=7; echo $((x>>=1)); echo $x'
+	atf_check -s exit:0 -o inline:'2\n2\n' -e empty ${TEST_SH} -c \
+		'x=1; echo $((x<<=1)); echo $x'
+
+	atf_check -s exit:0 -o inline:'2\n3\n' -e empty ${TEST_SH} -c \
+		'x=2; echo $(( (x+=1)-1 )); echo $x'
+	atf_check -s exit:0 -o inline:'4\n3\n' -e empty ${TEST_SH} -c \
+		'x=4; echo $(( (x-=1)+1 )); echo $x'
+
+	atf_check -s exit:0 -o inline:'36\n5 7\n' -e empty ${TEST_SH} -c \
+		'unset x y; echo $(( (x=5) * (y=7) + 1 )); echo $x $y'
+	atf_check -s exit:0 -o inline:'36\n5 7\n' -e empty ${TEST_SH} -c \
+		'x=99; y=17; echo $(( (x=5) * (y=7) + 1 )); echo $x $y'
+	atf_check -s exit:0 -o inline:'36\n5 7\n' -e empty ${TEST_SH} -c \
+		'x=4; y=9; echo $(( (x+=1) * (y-=2) + 1 )); echo $x $y'
+
+	atf_check -s exit:0 -o inline:'3\n3\n' -e empty ${TEST_SH} -c \
+		'set -u; unset x; echo $(( x = 3 )); echo $x'
+	atf_check -s not-exit:0 -o ignore -e not-empty ${TEST_SH} -c \
+		'set -u; unset x; echo $(( x + 3 )); echo $x'
+	atf_check -s not-exit:0 -o ignore -e not-empty ${TEST_SH} -c \
+		'set -u; unset x; echo $(( x+=3 )); echo $x'
+}
+
 atf_test_case arithmetic_fails
 arithmetic_fails_head()
 {
@@ -1030,6 +1087,6 @@ atf_init_test_cases() {
 	# atf_add_test_case progressive			# build up big expr
 	# atf_add_test_case test_errors			# erroneous input
 	# atf_add_test_case torture		# hard stuff (if there is any)
-	# atf_add_test_case var_assign			# assignment ops
+	atf_add_test_case var_assign			# assignment ops
 	# atf_add_test_case vulgarity	# truly evil inputs (syntax in vars...)
 }

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 11:31:00 UTC 2017

Modified Files:
src/bin/sh: arith_token.c

Log Message:
Alternative way of writing (part of) the arithmetic lexical analyzer
- committed separately to make it easier to swap back if desired.

This version avoids open coding is_name() and isdigit() - measurements
show it is perhaps fractionally faster (though the difference is so small
as to probably be statistically insignifigant - if I were a statician
I might understand that) and just a little larger than the previous version.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/bin/sh/arith_token.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/arith_token.c
diff -u src/bin/sh/arith_token.c:1.1 src/bin/sh/arith_token.c:1.2
--- src/bin/sh/arith_token.c:1.1	Mon Mar 20 11:26:07 2017
+++ src/bin/sh/arith_token.c	Mon Mar 20 11:31:00 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: arith_token.c,v 1.1 2017/03/20 11:26:07 kre Exp $	*/
+/*	$NetBSD: arith_token.c,v 1.2 2017/03/20 11:31:00 kre Exp $	*/
 
 /*-
  * Copyright (c) 2002
@@ -39,7 +39,7 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: arith_token.c,v 1.1 2017/03/20 11:26:07 kre Exp $");
+__RCSID("$NetBSD: arith_token.c,v 1.2 2017/03/20 11:31:00 kre Exp $");
 #endif /* not lint */
 
 #include 
@@ -79,35 +79,22 @@ arith_token(void)
 	for (;;) {
 		token = *buf;
 
-		switch (token) {
-		case ' ':
-		case '\t':
-		case '\n':
-			buf++;
-			continue;
-
-		default:
-			error("arithmetic: unexpected '%c' (%#x) in expression",
-			token, token);
-			/* NOTREACHED */
-
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
+		if (isdigit(token)) {
+			/*
+			 * Numbers all start with a digit, and nothing
+			 * else does, the number ends wherever
+			 * strtoimax() stops...
+			 */
 			a_t_val.val = strtoimax(buf, &end, 0);
 			arith_buf = end;
 			return ARITH_NUM;
 
-		case 'A': case 'B': case 'C': case 'D': case 'E':
-		case 'F': case 'G': case 'H': case 'I': case 'J':
-		case 'K': case 'L': case 'M': case 'N': case 'O':
-		case 'P': case 'Q': case 'R': case 'S': case 'T':
-		case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
-		case 'a': case 'b': case 'c': case 'd': case 'e':
-		case 'f': case 'g': case 'h': case 'i': case 'j':
-		case 'k': case 'l': case 'm': case 'n': case 'o':
-		case 'p': case 'q': case 'r': case 's': case 't':
-		case 'u': case 'v': case 'w': case 'x': case 'y': case 'z':
-		case '_':
+		} else if (is_name(token) {
+			/*
+			 * Variable names all start with an alpha (or '_')
+			 * and nothing else does.  They continue for the
+			 * longest unbroken sequence of alphanumerics ( + _ )
+			 */
 			p = buf;
 			while (buf++, is_in_name(*buf))
 ;
@@ -117,6 +104,22 @@ arith_token(void)
 			arith_buf = buf;
 			return ARITH_VAR;
 
+		} else switch (token) {
+			/*
+			 * everything else must be some kind of
+			 * operator, white space, or an error.
+			 */
+		case ' ':
+		case '\t':
+		case '\n':
+			buf++;
+			continue;
+
+		default:
+			error("arithmetic: unexpected '%c' (%#x) in expression",
+			token, token);
+			/* NOTREACHED */
+
 		case '=':
 			token = ARITH_ASS;
  checkeq:

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 11:26:07 UTC 2017

Modified Files:
src/bin/sh: Makefile expand.c expand.h sh.1
Added Files:
src/bin/sh: arith_token.c arith_tokens.h arithmetic.c arithmetic.h
Removed Files:
src/bin/sh: arith.y arith_lex.l

Log Message:
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958

That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.

To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).

While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/bin/sh/Makefile
cvs rdiff -u -r1.25 -r0 src/bin/sh/arith.y
cvs rdiff -u -r1.18 -r0 src/bin/sh/arith_lex.l
cvs rdiff -u -r0 -r1.1 src/bin/sh/arith_token.c src/bin/sh/arith_tokens.h \
src/bin/sh/arithmetic.c src/bin/sh/arithmetic.h
cvs rdiff -u -r1.102 -r1.103 src/bin/sh/expand.c
cvs rdiff -u -r1.19 -r1.20 src/bin/sh/expand.h
cvs rdiff -u -r1.125 -r1.126 src/bin/sh/sh.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/Makefile
diff -u src/bin/sh/Makefile:1.103 src/bin/sh/Makefile:1.104
--- src/bin/sh/Makefile:1.103	Thu Mar 16 13:09:06 2017
+++ src/bin/sh/Makefile	Mon Mar 20 11:26:07 2017
@@ -1,16 +1,15 @@
-#	$NetBSD: Makefile,v 1.103 2017/03/16 13:09:06 kre Exp $
+#	$NetBSD: Makefile,v 1.104 2017/03/20 11:26:07 kre Exp $
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 
 .include 
 
-YHEADER=1
 PROG=	sh
-SHSRCS=	alias.c cd.c echo.c error.c eval.c exec.c expand.c \
-	histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \
-	mystring.c options.c parser.c redir.c show.c trap.c output.c var.c \
-	test.c kill.c syntax.c
-GENSRCS=arith.c arith_lex.c builtins.c init.c nodes.c
-GENHDRS=arith.h builtins.h nodes.h token.h nodenames.h
+SHSRCS=	alias.c arith_token.c arithmetic.c cd.c echo.c error.c eval.c exec.c \
+	expand.c histedit.c input.c jobs.c mail.c main.c memalloc.c \
+	miscbltin.c mystring.c options.c parser.c redir.c show.c trap.c \
+	output.c var.c test.c kill.c syntax.c
+GENSRCS=builtins.c init.c nodes.c
+GENHDRS=builtins.h nodes.h token.h nodenames.h
 SRCS=	${SHSRCS} ${GENSRCS}
 
 DPSRCS+=${GENHDRS}
@@ -18,21 +17,11 @@ DPSRCS+=${GENHDRS}
 LDADD+=	-ll -ledit -lterminfo
 DPADD+=	${LIBL} ${LIBEDIT} ${LIBTERMINFO}
 
-LFLAGS=	-8	# 8-bit lex scanner for arithmetic
-
 # Environment for scripts executed during build.
 SCRIPT_ENV= \
 	AWK=${TOOL_AWK:Q} \
 	SED=${TOOL_SED:Q}
 
-# The .depend file can get references to these temporary files
-.OPTIONAL: lex.yy.c y.tab.c
-
-.ifdef CRUNCHEDPROG
-LFLAGS+=-L
-YFLAGS+=-l
-.endif
-
 CPPFLAGS+=-DSHELL -I. -I${.CURDIR}
 #XXX: For testing only.
 #CPPFLAGS+=-DDEBUG=2
@@ -53,7 +42,7 @@ SRCS+=printf.c
 	${NETBSDSRCDIR}/usr.bin/printf \
 	${NETBSDSRCDIR}/bin/kill
 
-CLEANFILES+= ${GENSRCS} ${GENHDRS} y.tab.h sh.html1
+CLEANFILES+= ${GENSRCS} ${GENHDRS} sh.html1
 CLEANFILES+= trace.*
 
 token.h: mktokens

Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.102 src/bin/sh/expand.c:1.103
--- src/bin/sh/expand.c:1.102	Sun Mar 12 04:19:29 2017
+++ src/bin/sh/expand.c	Mon Mar 20 11:26:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: expand.c,v 1.102 2017/03/12 04:19:29 kre Exp $	*/
+/*	$NetBSD: expand.c,v 1.103 2017/03/20 11:26:07 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #else
-__RCSID("$NetBSD: expand.c,v 1.102 2017/03/12 04:19:29 kre Exp $");
+__RCSID("$NetBSD: expand.c,v 1.103 2017/03/20 11:26:07 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,6 +64,7 @@ __RCSID("$NetBSD: expand.c,v 1.102 2017/
 #include "eval.h"
 #include "expand.h"
 #include "syntax.h"
+#include "arithmetic.h"
 #include "parser.h"
 #include "jobs.h"
 #include "options.h"
@@ -356,7 +357,7 @@ removerecordregions(int endoff)
 void
 expari(int flag)
 {
-	char *p, *start;
+	char *p, *q, *start;
 	intmax_t result;
 	int adjustment;
 	int begoff;
@@ -375,8 +376,23 @@ expari(int flag)
 	 * have to rescan starting from the beginning since CTLESC
 	 * characters have to be processed left to right.
 	 */
-/* SPACE_NEEDED is enough for all digits, plus possible "-", plus 2 (why?) */
-#define SPACE_NEEDED ((sizeof(intmax_t) * CHAR_BIT + 2) / 3 + 1 + 2)
+
+	/*
+	 * SPACE_NEEDED is enough for all possible digits (rounded up)
+	 * plus possible "-", and the terminating '\

CVS commit: [netbsd-7-1] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Mar 20 10:58:16 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.1

Log Message:
Ticket #1389


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-7.1.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.1.1
diff -u src/doc/CHANGES-7.1.1:1.1.2.1 src/doc/CHANGES-7.1.1:1.1.2.2
--- src/doc/CHANGES-7.1.1:1.1.2.1	Wed Mar 15 06:17:07 2017
+++ src/doc/CHANGES-7.1.1	Mon Mar 20 10:58:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.1,v 1.1.2.1 2017/03/15 06:17:07 snj Exp $
+# $NetBSD: CHANGES-7.1.1,v 1.1.2.2 2017/03/20 10:58:16 martin Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1
 release:
@@ -10,3 +10,187 @@ sys/sys/param.h	patched by hand
 	Welcome to 7.1.0_PATCH.
 	[snj]
 
+doc/3RDPARTY	1.1380, 1.1381
+external/bsd/ntp/Makefile.inc   up to 1.16 via patch
+external/bsd/ntp/dist/ChangeLog up to 1.1.1.11
+external/bsd/ntp/dist/CommitLog up to 1.1.1.11
+external/bsd/ntp/dist/NEWS  up to 1.1.1.11
+external/bsd/ntp/dist/configure up to 1.1.1.11
+external/bsd/ntp/dist/html/drivers/driver40-ja.html up to 1.1.1.2
+external/bsd/ntp/dist/html/drivers/driver40.html up to 1.1.1.5
+external/bsd/ntp/dist/html/miscopt.html up to 1.1.1.10
+external/bsd/ntp/dist/include/Makefile.am   up to 1.1.1.9
+external/bsd/ntp/dist/include/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/include/libssl_compat.h   up to 1.1.1.1
+external/bsd/ntp/dist/include/ntp.h up to 1.8
+external/bsd/ntp/dist/include/ntp_intres.h  up to 1.5
+external/bsd/ntp/dist/include/ntpd.hup to 1.9
+external/bsd/ntp/dist/libntp/Makefile.amup to 1.1.1.7
+external/bsd/ntp/dist/libntp/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.7
+external/bsd/ntp/dist/libntp/audio.cup to 1.11
+external/bsd/ntp/dist/libntp/libssl_compat.cup to 1.1.1.1
+external/bsd/ntp/dist/libntp/ntp_calendar.c up to 1.9
+external/bsd/ntp/dist/libntp/ntp_intres.c   up to 1.10
+external/bsd/ntp/dist/libntp/ssl_init.c up to 1.9
+external/bsd/ntp/dist/libntp/work_fork.cup to 1.10
+external/bsd/ntp/dist/libparse/clk_hopf6021.c   up to 1.6
+external/bsd/ntp/dist/ntpd/complete.conf.in up to 1.1.1.5
+external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/keyword-gen-utd  up to 1.1.1.7
+external/bsd/ntp/dist/ntpd/keyword-gen.cup to 1.11
+external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.def up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.16
+external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.18
+external/bsd/ntp/dist/ntpd/ntp_crypto.c up to 1.13
+external/bsd/ntp/dist/ntpd/ntp_keyword.hup to 1.12
+external/bsd/ntp/dist/ntpd/ntp_loopfilter.c up to 1.10
+external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.15
+external/bsd/ntp/dist/ntpd/ntp_peer.c   up to 1.10
+external/bsd/ntp/dist/ntpd/ntp_proto.c  up to 1.14
+external/bsd/ntp/dist/ntpd/ntp_refclock.c   up to 1.10
+external/bsd/ntp/dist/ntpd/ntpd-opts.c  up to 1.9
+external/bsd/ntp/dist/ntpd/ntpd-opts.h  up to 1.12
+external/bsd/ntp/dist/ntpd/ntpd.1ntpdmanup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.1ntpdmdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c  up to 1.10
+external/bsd/ntp/dist/ntpd/refclock_jjy.c   up to 1.11
+external/bsd/ntp/dist/ntpd/refclock_jupiter.c   up to 1.11
+external/bsd/ntp/dist/ntpdc/invoke-ntpdc.texi   up to 1.1.1.9
+external/bsd/ntp/dist/ntpdc/ntpdc-opts.cup to 1.9
+external/bsd/ntp/dist/ntpdc/ntpdc-opts.hup to 1.9
+external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcman up to 1.1.1.9
+external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcmdocup to 1.1.1.9
+extern

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Mar 20 11:01:22 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
Ticket #1389


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-7.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.2 src/doc/CHANGES-7.2:1.1.2.3
--- src/doc/CHANGES-7.2:1.1.2.2	Sat Mar 18 05:50:30 2017
+++ src/doc/CHANGES-7.2	Mon Mar 20 11:01:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.2 2017/03/18 05:50:30 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.3 2017/03/20 11:01:22 martin Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -30,3 +30,187 @@ sys/kern/exec_elf.c1.88 via patch
 	an executable.
 	[uwe, ticket #1368]
 
+doc/3RDPARTY	1.1380, 1.1381
+external/bsd/ntp/Makefile.inc   up to 1.16 via patch
+external/bsd/ntp/dist/ChangeLog up to 1.1.1.11
+external/bsd/ntp/dist/CommitLog up to 1.1.1.11
+external/bsd/ntp/dist/NEWS  up to 1.1.1.11
+external/bsd/ntp/dist/configure up to 1.1.1.11
+external/bsd/ntp/dist/html/drivers/driver40-ja.html up to 1.1.1.2
+external/bsd/ntp/dist/html/drivers/driver40.html up to 1.1.1.5
+external/bsd/ntp/dist/html/miscopt.html up to 1.1.1.10
+external/bsd/ntp/dist/include/Makefile.am   up to 1.1.1.9
+external/bsd/ntp/dist/include/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/include/libssl_compat.h   up to 1.1.1.1
+external/bsd/ntp/dist/include/ntp.h up to 1.8
+external/bsd/ntp/dist/include/ntp_intres.h  up to 1.5
+external/bsd/ntp/dist/include/ntpd.hup to 1.9
+external/bsd/ntp/dist/libntp/Makefile.amup to 1.1.1.7
+external/bsd/ntp/dist/libntp/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.7
+external/bsd/ntp/dist/libntp/audio.cup to 1.11
+external/bsd/ntp/dist/libntp/libssl_compat.cup to 1.1.1.1
+external/bsd/ntp/dist/libntp/ntp_calendar.c up to 1.9
+external/bsd/ntp/dist/libntp/ntp_intres.c   up to 1.10
+external/bsd/ntp/dist/libntp/ssl_init.c up to 1.9
+external/bsd/ntp/dist/libntp/work_fork.cup to 1.10
+external/bsd/ntp/dist/libparse/clk_hopf6021.c   up to 1.6
+external/bsd/ntp/dist/ntpd/complete.conf.in up to 1.1.1.5
+external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/keyword-gen-utd  up to 1.1.1.7
+external/bsd/ntp/dist/ntpd/keyword-gen.cup to 1.11
+external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.def up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.16
+external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.18
+external/bsd/ntp/dist/ntpd/ntp_crypto.c up to 1.13
+external/bsd/ntp/dist/ntpd/ntp_keyword.hup to 1.12
+external/bsd/ntp/dist/ntpd/ntp_loopfilter.c up to 1.10
+external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.15
+external/bsd/ntp/dist/ntpd/ntp_peer.c   up to 1.10
+external/bsd/ntp/dist/ntpd/ntp_proto.c  up to 1.14
+external/bsd/ntp/dist/ntpd/ntp_refclock.c   up to 1.10
+external/bsd/ntp/dist/ntpd/ntpd-opts.c  up to 1.9
+external/bsd/ntp/dist/ntpd/ntpd-opts.h  up to 1.12
+external/bsd/ntp/dist/ntpd/ntpd.1ntpdmanup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.1ntpdmdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c  up to 1.10
+external/bsd/ntp/dist/ntpd/refclock_jjy.c   up to 1.11
+external/bsd/ntp/dist/ntpd/refclock_jupiter.c   up to 1.11
+external/bsd/ntp/dist/ntpdc/invoke-ntpdc.texi   up to 1.1.1.9
+external/bsd/ntp/dist/ntpdc/ntpdc-opts.cup to 1.9
+external/bsd/ntp/dist/ntpdc/ntpdc-opts.hup to 1.9
+external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcman up to 1.1.1.9
+external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcmdocup to 1.1.1.9
+external/bsd/ntp/dist

CVS commit: [netbsd-7-0] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Mar 20 10:55:39 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
Ticket #1389


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-7.0.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.34 src/doc/CHANGES-7.0.3:1.1.2.35
--- src/doc/CHANGES-7.0.3:1.1.2.34	Sat Mar 11 07:49:14 2017
+++ src/doc/CHANGES-7.0.3	Mon Mar 20 10:55:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.34 2017/03/11 07:49:14 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.35 2017/03/20 10:55:38 martin Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -1317,3 +1317,187 @@ sys/conf/copyright1.14, 1.15
 	Update copyright year.
 	[tsutsui, ticket #1384]
 
+doc/3RDPARTY	1.1380, 1.1381
+external/bsd/ntp/Makefile.inc   up to 1.16 via patch
+external/bsd/ntp/dist/ChangeLog up to 1.1.1.11
+external/bsd/ntp/dist/CommitLog up to 1.1.1.11
+external/bsd/ntp/dist/NEWS  up to 1.1.1.11
+external/bsd/ntp/dist/configure up to 1.1.1.11
+external/bsd/ntp/dist/html/drivers/driver40-ja.html up to 1.1.1.2
+external/bsd/ntp/dist/html/drivers/driver40.html up to 1.1.1.5
+external/bsd/ntp/dist/html/miscopt.html up to 1.1.1.10
+external/bsd/ntp/dist/include/Makefile.am   up to 1.1.1.9
+external/bsd/ntp/dist/include/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/include/libssl_compat.h   up to 1.1.1.1
+external/bsd/ntp/dist/include/ntp.h up to 1.8
+external/bsd/ntp/dist/include/ntp_intres.h  up to 1.5
+external/bsd/ntp/dist/include/ntpd.hup to 1.9
+external/bsd/ntp/dist/libntp/Makefile.amup to 1.1.1.7
+external/bsd/ntp/dist/libntp/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.7
+external/bsd/ntp/dist/libntp/audio.cup to 1.11
+external/bsd/ntp/dist/libntp/libssl_compat.cup to 1.1.1.1
+external/bsd/ntp/dist/libntp/ntp_calendar.c up to 1.9
+external/bsd/ntp/dist/libntp/ntp_intres.c   up to 1.10
+external/bsd/ntp/dist/libntp/ssl_init.c up to 1.9
+external/bsd/ntp/dist/libntp/work_fork.cup to 1.10
+external/bsd/ntp/dist/libparse/clk_hopf6021.c   up to 1.6
+external/bsd/ntp/dist/ntpd/complete.conf.in up to 1.1.1.5
+external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/keyword-gen-utd  up to 1.1.1.7
+external/bsd/ntp/dist/ntpd/keyword-gen.cup to 1.11
+external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.def up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.16
+external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.18
+external/bsd/ntp/dist/ntpd/ntp_crypto.c up to 1.13
+external/bsd/ntp/dist/ntpd/ntp_keyword.hup to 1.12
+external/bsd/ntp/dist/ntpd/ntp_loopfilter.c up to 1.10
+external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.15
+external/bsd/ntp/dist/ntpd/ntp_peer.c   up to 1.10
+external/bsd/ntp/dist/ntpd/ntp_proto.c  up to 1.14
+external/bsd/ntp/dist/ntpd/ntp_refclock.c   up to 1.10
+external/bsd/ntp/dist/ntpd/ntpd-opts.c  up to 1.9
+external/bsd/ntp/dist/ntpd/ntpd-opts.h  up to 1.12
+external/bsd/ntp/dist/ntpd/ntpd.1ntpdmanup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.1ntpdmdoc   up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.htmlup to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.man.in  up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/ntpd.mdoc.in up to 1.1.1.9
+external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c  up to 1.10
+external/bsd/ntp/dist/ntpd/refclock_jjy.c   up to 1.11
+external/bsd/ntp/dist/ntpd/refclock_jupiter.c   up to 1.11
+external/bsd/ntp/dist/ntpdc/invoke-ntpdc.texi   up to 1.1.1.9
+external/bsd/ntp/dist/ntpdc/ntpdc-opts.cup to 1.9
+external/bsd/ntp/dist/ntpdc/ntpdc-opts.hup to 1.9
+external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcman up to 1.1.1.9
+external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcmd

CVS commit: src/sys/uvm

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 10:44:24 UTC 2017

Modified Files:
src/sys/uvm: uvm_bio.c

Log Message:
Third time lucky...

Why is there no PRI[xd]OFF ?   How are off_t's intended to be printed?

If a PRIxOFF gets added in some appropriate place, the XXX lines in this
commit can go away.

(I understand not having PRI[xd]VOFF).


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/uvm/uvm_bio.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/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.86 src/sys/uvm/uvm_bio.c:1.87
--- src/sys/uvm/uvm_bio.c:1.86	Mon Mar 20 07:31:28 2017
+++ src/sys/uvm/uvm_bio.c	Mon Mar 20 10:44:24 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_bio.c,v 1.86 2017/03/20 07:31:28 kre Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.87 2017/03/20 10:44:24 kre Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.86 2017/03/20 07:31:28 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.87 2017/03/20 10:44:24 kre Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
@@ -347,12 +347,15 @@ ubc_fault(struct uvm_faultinfo *ufi, vad
 	va, ubc_offset, access_type, 0);
 
 	if ((access_type & VM_PROT_WRITE) != 0) {
+#ifndef PRIxOFF		/* XXX */
+#define PRIxOFF "llx"	/* XXX */
+#endif			/* XXX */
 		KASSERTMSG((trunc_page(umap->writeoff) <= slot_offset),
-		"out of range write: slot=%#"PRIxVSIZE" off=%#"PRIxVADDR,
+		"out of range write: slot=%#"PRIxVSIZE" off=%#"PRIxOFF,
 		slot_offset, umap->writeoff);
 		KASSERTMSG((slot_offset < umap->writeoff + umap->writelen),
-		"out of range write: slot=%#"PRIxVSIZE
-		"off=%#"PRIxVADDR" len=%#"PRIxVSIZE,
+		"out of range write: slot=%#"PRIxVADDR
+		" off=%#"PRIxOFF" len=%#"PRIxVSIZE,
 		slot_offset, umap->writeoff, umap->writelen);
 	}
 

CVS commit: src/lib/libcurses

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Mar 20 10:20:16 UTC 2017

Modified Files:
src/lib/libcurses: screen.c

Log Message:
Put back filter(3) I mistakenly removed in r1.29


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/screen.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/screen.c
diff -u src/lib/libcurses/screen.c:1.32 src/lib/libcurses/screen.c:1.33
--- src/lib/libcurses/screen.c:1.32	Fri Feb 17 11:18:38 2017
+++ src/lib/libcurses/screen.c	Mon Mar 20 10:20:16 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: screen.c,v 1.32 2017/02/17 11:18:38 roy Exp $	*/
+/*	$NetBSD: screen.c,v 1.33 2017/03/20 10:20:16 roy Exp $	*/
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)screen.c	8.2 (blymn) 11/27/2001";
 #else
-__RCSID("$NetBSD: screen.c,v 1.32 2017/02/17 11:18:38 roy Exp $");
+__RCSID("$NetBSD: screen.c,v 1.33 2017/03/20 10:20:16 roy Exp $");
 #endif
 #endif	/* not lint */
 
@@ -45,10 +45,19 @@ __RCSID("$NetBSD: screen.c,v 1.32 2017/0
 
 static int filtered;
 
-
 static void	 __delscreen(SCREEN *);
 
 /*
+ * filter has to be called before either initscr or newterm.
+ */
+void
+filter(void)
+{
+
+	filtered = TRUE;
+}
+
+/*
  * set_term --
  *  Change the term to the given screen.
  *

CVS commit: src/sys/uvm

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Mar 20 07:31:28 UTC 2017

Modified Files:
src/sys/uvm: uvm_bio.c

Log Message:
One more (should have noticed last time) and this time fix the
format the way it should have been fixed, not just what was easiest...


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/uvm/uvm_bio.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/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.85 src/sys/uvm/uvm_bio.c:1.86
--- src/sys/uvm/uvm_bio.c:1.85	Mon Mar 20 04:35:04 2017
+++ src/sys/uvm/uvm_bio.c	Mon Mar 20 07:31:28 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_bio.c,v 1.85 2017/03/20 04:35:04 kre Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.86 2017/03/20 07:31:28 kre Exp $	*/
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.85 2017/03/20 04:35:04 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.86 2017/03/20 07:31:28 kre Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
@@ -348,10 +348,11 @@ ubc_fault(struct uvm_faultinfo *ufi, vad
 
 	if ((access_type & VM_PROT_WRITE) != 0) {
 		KASSERTMSG((trunc_page(umap->writeoff) <= slot_offset),
-		"out of range write: slot=0x%lx off=0x%llx",
+		"out of range write: slot=%#"PRIxVSIZE" off=%#"PRIxVADDR,
 		slot_offset, umap->writeoff);
 		KASSERTMSG((slot_offset < umap->writeoff + umap->writelen),
-		"out of range write: slot=0x%lx off=0x%lx len=0x%lx",
+		"out of range write: slot=%#"PRIxVSIZE
+		"off=%#"PRIxVADDR" len=%#"PRIxVSIZE,
 		slot_offset, umap->writeoff, umap->writelen);
 	}