CVS commit: [netbsd-9] src/doc

2022-04-12 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Apr 13 03:39:58 UTC 2022

Modified Files:
src/doc [netbsd-9]: CHANGES-9.3

Log Message:
1436


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.82 -r1.1.2.83 src/doc/CHANGES-9.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-9.3
diff -u src/doc/CHANGES-9.3:1.1.2.82 src/doc/CHANGES-9.3:1.1.2.83
--- src/doc/CHANGES-9.3:1.1.2.82	Tue Mar 15 18:02:12 2022
+++ src/doc/CHANGES-9.3	Wed Apr 13 03:39:58 2022
@@ -1,4 +1,4 @@
-29~# $NetBSD: CHANGES-9.3,v 1.1.2.82 2022/03/15 18:02:12 martin Exp $
+29~# $NetBSD: CHANGES-9.3,v 1.1.2.83 2022/04/13 03:39:58 snj Exp $
 
 A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3
 release:
@@ -1529,3 +1529,9 @@ sys/dev/ata/ata.c1.167
 	PR 56745: avoid an unaccounted extra ATA channel freeze.
 	[perseant, ticket #1435]
 
+distrib/amd64/ramdisks/common/Makefile.ramdisk	1.16
+distrib/amd64/ramdisks/common/list.ramdisk	1.22
+
+	Add missing EFI bootloaders to the install kernel ramdisk.
+	[martin, ticket #1436]
+



CVS commit: [netbsd-9] src/doc

2022-04-12 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Apr 13 03:39:58 UTC 2022

Modified Files:
src/doc [netbsd-9]: CHANGES-9.3

Log Message:
1436


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.82 -r1.1.2.83 src/doc/CHANGES-9.3

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



CVS commit: [netbsd-9] src/distrib/amd64/ramdisks/common

2022-04-12 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Apr 13 03:39:23 UTC 2022

Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-9]: Makefile.ramdisk
list.ramdisk

Log Message:
Pull up following revision(s) (requested by martin in ticket #1436):
distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.16
distrib/amd64/ramdisks/common/list.ramdisk: revision 1.22
Add missing EFI bootloaders to the install kernel ramdisk,
noticed by Lloyd Parkes.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/amd64/ramdisks/common/list.ramdisk

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

Modified files:

Index: src/distrib/amd64/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14.2.1
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14	Sun Jan 27 04:22:46 2019
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk	Wed Apr 13 03:39:23 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ramdisk,v 1.14 2019/01/27 04:22:46 dholland Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.14.2.1 2022/04/13 03:39:23 snj Exp $
 
 NOSANITIZER=	# defined
 
@@ -28,6 +28,8 @@ IMAGEDEPENDS+= 	${CRUNCHBIN} \
 		${DESTDIR}/usr/mdec/mbr_ext \
 		${DESTDIR}/usr/mdec/mbr_bootsel \
 		${DESTDIR}/usr/mdec/gptmbr.bin \
+		${DESTDIR}/usr/mdec/bootia32.efi \
+		${DESTDIR}/usr/mdec/bootx64.efi \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services

Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 src/distrib/amd64/ramdisks/common/list.ramdisk:1.21.2.1
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.21	Mon Oct  1 17:50:08 2018
+++ src/distrib/amd64/ramdisks/common/list.ramdisk	Wed Apr 13 03:39:23 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
+#	$NetBSD: list.ramdisk,v 1.21.2.1 2022/04/13 03:39:23 snj Exp $
 
 SRCDIRS	external/bsd/less/bin
 SRCDIRS	bin sbin usr.bin usr.sbin libexec
@@ -81,6 +81,8 @@ COPY	${DESTDIR}/usr/mdec/bootxx_ffsv1	us
 COPY	${DESTDIR}/usr/mdec/bootxx_ffsv2	usr/mdec/bootxx_ffsv2
 COPY	${DESTDIR}/usr/mdec/bootxx_lfsv2	usr/mdec/bootxx_lfsv2
 COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
+COPY	${DESTDIR}/usr/mdec/bootia32.efi	usr/mdec/bootia32.efi
+COPY	${DESTDIR}/usr/mdec/bootx64.efi		usr/mdec/bootx64.efi
 COPY	${DESTDIR}/usr/mdec/mbr_ext		usr/mdec/mbr_ext
 COPY	${DESTDIR}/usr/mdec/mbr_bootsel		usr/mdec/mbr_bootsel
 COPY	${DESTDIR}/usr/mdec/gptmbr.bin		usr/mdec/gptmbr.bin



CVS commit: [netbsd-9] src/distrib/amd64/ramdisks/common

2022-04-12 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Wed Apr 13 03:39:23 UTC 2022

Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-9]: Makefile.ramdisk
list.ramdisk

Log Message:
Pull up following revision(s) (requested by martin in ticket #1436):
distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.16
distrib/amd64/ramdisks/common/list.ramdisk: revision 1.22
Add missing EFI bootloaders to the install kernel ramdisk,
noticed by Lloyd Parkes.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/amd64/ramdisks/common/list.ramdisk

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



CVS commit: src/sys/dev/pci

2022-04-12 Thread Shoichi YAMAGUCHI
Module Name:src
Committed By:   yamaguchi
Date:   Wed Apr 13 02:28:01 UTC 2022

Modified Files:
src/sys/dev/pci: if_vioif.c

Log Message:
vioif(4): issue VIRTIO_NET_CTRL_MAC_ADDR_SET command only when
VIRTIO_NET_F_CTRL_MAC_ADDR is negotiated


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/if_vioif.c

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



CVS commit: src/sys/dev/pci

2022-04-12 Thread Shoichi YAMAGUCHI
Module Name:src
Committed By:   yamaguchi
Date:   Wed Apr 13 02:28:01 UTC 2022

Modified Files:
src/sys/dev/pci: if_vioif.c

Log Message:
vioif(4): issue VIRTIO_NET_CTRL_MAC_ADDR_SET command only when
VIRTIO_NET_F_CTRL_MAC_ADDR is negotiated


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/if_vioif.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/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.77 src/sys/dev/pci/if_vioif.c:1.78
--- src/sys/dev/pci/if_vioif.c:1.77	Thu Mar 31 06:17:34 2022
+++ src/sys/dev/pci/if_vioif.c	Wed Apr 13 02:28:01 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vioif.c,v 1.77 2022/03/31 06:17:34 yamaguchi Exp $	*/
+/*	$NetBSD: if_vioif.c,v 1.78 2022/04/13 02:28:01 yamaguchi Exp $	*/
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.77 2022/03/31 06:17:34 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.78 2022/04/13 02:28:01 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -99,9 +99,11 @@ __KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v
 #define VIRTIO_NET_F_CTRL_RX_EXTRA	__BIT(20)
 #define VIRTIO_NET_F_GUEST_ANNOUNCE	__BIT(21)
 #define VIRTIO_NET_F_MQ			__BIT(22)
+#define VIRTIO_NET_F_CTRL_MAC_ADDR 	__BIT(23)
 
 #define VIRTIO_NET_FLAG_BITS \
 	VIRTIO_COMMON_FLAG_BITS \
+	"\x18""CTRL_MAC" \
 	"\x17""MQ" \
 	"\x16""GUEST_ANNOUNCE" \
 	"\x15""CTRL_RX_EXTRA" \
@@ -858,6 +860,7 @@ vioif_attach(device_t parent, device_t s
 	VIRTIO_NET_F_MAC | VIRTIO_NET_F_STATUS | VIRTIO_NET_F_CTRL_VQ |
 	VIRTIO_NET_F_CTRL_RX | VIRTIO_F_NOTIFY_ON_EMPTY;
 	req_features |= VIRTIO_F_RING_EVENT_IDX;
+	req_features |= VIRTIO_NET_F_CTRL_MAC_ADDR;
 #ifdef VIOIF_MULTIQ
 	req_features |= VIRTIO_NET_F_MQ;
 #endif
@@ -2170,23 +2173,41 @@ vioif_set_mac_addr(struct vioif_softc *s
 	struct vioif_ctrl_cmdspec specs[1];
 	struct ifnet *ifp = >sc_ethercom.ec_if;
 	int nspecs = __arraycount(specs);
+	uint64_t features;
 	int r;
+	size_t i;
 
 	if (!sc->sc_has_ctrl)
 		return ENOTSUP;
 
-	vioif_ctrl_acquire(sc);
+	if (memcmp(CLLADDR(ifp->if_sadl), sc->sc_mac,
+	ETHER_ADDR_LEN) == 0) {
+		return 0;
+	}
 
-	memcpy(ma->mac, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN);
-	specs[0].dmamap = sc->sc_ctrlq.ctrlq_mac_addr_dmamap;
-	specs[0].buf = ma;
-	specs[0].bufsize = sizeof(*ma);
+	memcpy(sc->sc_mac, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN);
 
-	r = vioif_ctrl_send_command(sc,
-	VIRTIO_NET_CTRL_MAC, VIRTIO_NET_CTRL_MAC_ADDR_SET,
-	specs, nspecs);
+	features = virtio_features(sc->sc_virtio);
+	if (features & VIRTIO_NET_F_CTRL_MAC_ADDR) {
+		vioif_ctrl_acquire(sc);
+
+		memcpy(ma->mac, sc->sc_mac, ETHER_ADDR_LEN);
+		specs[0].dmamap = sc->sc_ctrlq.ctrlq_mac_addr_dmamap;
+		specs[0].buf = ma;
+		specs[0].bufsize = sizeof(*ma);
+
+		r = vioif_ctrl_send_command(sc,
+		VIRTIO_NET_CTRL_MAC, VIRTIO_NET_CTRL_MAC_ADDR_SET,
+		specs, nspecs);
 
-	vioif_ctrl_release(sc);
+		vioif_ctrl_release(sc);
+	} else {
+		for (i = 0; i < __arraycount(sc->sc_mac); i++) {
+			virtio_write_device_config_1(sc->sc_virtio,
+			VIRTIO_NET_CONFIG_MAC + i, sc->sc_mac[i]);
+		}
+		r = 0;
+	}
 
 	return r;
 }



CVS commit: src/lib/libcurses

2022-04-12 Thread Brett Lymn
Module Name:src
Committed By:   blymn
Date:   Tue Apr 12 21:54:16 UTC 2022

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

Log Message:
Fix compile breakage when wide char support is disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libcurses/insdelln.c
cvs rdiff -u -r1.119 -r1.120 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/insdelln.c
diff -u src/lib/libcurses/insdelln.c:1.21 src/lib/libcurses/insdelln.c:1.22
--- src/lib/libcurses/insdelln.c:1.21	Tue Apr 12 07:03:04 2022
+++ src/lib/libcurses/insdelln.c	Tue Apr 12 21:54:16 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: insdelln.c,v 1.21 2022/04/12 07:03:04 blymn Exp $	*/
+/*	$NetBSD: insdelln.c,v 1.22 2022/04/12 21:54:16 blymn Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: insdelln.c,v 1.21 2022/04/12 07:03:04 blymn Exp $");
+__RCSID("$NetBSD: insdelln.c,v 1.22 2022/04/12 21:54:16 blymn Exp $");
 #endif/* not lint */
 
 /*
@@ -158,7 +158,7 @@ winsdelln(WINDOW *win, int nlines)
 win->alines[y]->line[i].ch = win->bch;
 win->alines[y]->line[i].attr = attr;
 win->alines[y]->line[i].ch = win->bch;
-#ifndef HAVE_WCHAR
+#ifdef HAVE_WCHAR
 lp = >alines[y]->line[i];
 lp->wcols = 1;
 if (_cursesi_copy_nsp(win->bnsp, lp) == ERR)

Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.119 src/lib/libcurses/refresh.c:1.120
--- src/lib/libcurses/refresh.c:1.119	Tue Apr 12 07:03:04 2022
+++ src/lib/libcurses/refresh.c	Tue Apr 12 21:54:16 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: refresh.c,v 1.119 2022/04/12 07:03:04 blymn Exp $	*/
+/*	$NetBSD: refresh.c,v 1.120 2022/04/12 21:54:16 blymn 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.119 2022/04/12 07:03:04 blymn Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.120 2022/04/12 21:54:16 blymn Exp $");
 #endif
 #endif/* not lint */
 
@@ -1297,8 +1297,8 @@ makech(int wy)
 #ifdef HAVE_WCHAR
 		if (_cursesi_copy_nsp(blank.nsp, csp) == ERR)
 			return ERR;
-#endif /* HAVE_WCHAR */
 		csp->wcols = blank.wcols;
+#endif /* HAVE_WCHAR */
 		assert(csp != );
 		csp++;
 	}



CVS commit: src/lib/libcurses

2022-04-12 Thread Brett Lymn
Module Name:src
Committed By:   blymn
Date:   Tue Apr 12 21:54:16 UTC 2022

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

Log Message:
Fix compile breakage when wide char support is disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libcurses/insdelln.c
cvs rdiff -u -r1.119 -r1.120 src/lib/libcurses/refresh.c

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



CVS commit: src

2022-04-12 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue Apr 12 21:05:37 UTC 2022

Modified Files:
src/lib/libperfuse: ops.c
src/sys/arch/hp300/DOC: TODO.hp300
src/sys/dev/ieee1394: sbp.c
src/sys/dev/marvell: mvxpsec.c
src/tests/lib/libc/gen: t_closefrom.c

Log Message:
s/sould/should/ and s/shoud/should/


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/DOC/TODO.hp300
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ieee1394/sbp.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/marvell/mvxpsec.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/gen/t_closefrom.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/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.89 src/lib/libperfuse/ops.c:1.90
--- src/lib/libperfuse/ops.c:1.89	Sat Sep 11 21:30:46 2021
+++ src/lib/libperfuse/ops.c	Tue Apr 12 21:05:36 2022
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.89 2021/09/11 21:30:46 andvar Exp $ */
+/*  $NetBSD: ops.c,v 1.90 2022/04/12 21:05:36 andvar Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -2367,7 +2367,7 @@ perfuse_node_rmdir(struct puffs_usermoun
 		return ENOENT;
 
 	/*
-	 * Attempt to rmdir dir/.. shoud raise ENOTEMPTY
+	 * Attempt to rmdir dir/.. should raise ENOTEMPTY
 	 */
 	if (PERFUSE_NODE_DATA(targ)->pnd_nodeid == pnd->pnd_parent_nodeid)
 		return ENOTEMPTY;

Index: src/sys/arch/hp300/DOC/TODO.hp300
diff -u src/sys/arch/hp300/DOC/TODO.hp300:1.2 src/sys/arch/hp300/DOC/TODO.hp300:1.3
--- src/sys/arch/hp300/DOC/TODO.hp300:1.2	Wed Oct 26 07:22:59 1994
+++ src/sys/arch/hp300/DOC/TODO.hp300	Tue Apr 12 21:05:37 2022
@@ -1,4 +1,4 @@
-$NetBSD: TODO.hp300,v 1.2 1994/10/26 07:22:59 cgd Exp $
+$NetBSD: TODO.hp300,v 1.3 2022/04/12 21:05:37 andvar Exp $
 
 1. Create and use an interrupt stack.
Well actually, use the master SP for kernel stacks instead of
@@ -55,7 +55,7 @@ $NetBSD: TODO.hp300,v 1.2 1994/10/26 07:
statistics/profiling timer.  Should be able to compile-time (runtime?)
select between the two.
 
-7. Conditional MMU code sould be restructured.
+7. Conditional MMU code should be restructured.
Right now it reflects the evolutionary path of the code: 320/350 MMU
was supported and PMMU support was glued on.  The latter can be ifdef'ed
out when not needed, but not all of the former (e.g. ``mmutype'' tests).

Index: src/sys/dev/ieee1394/sbp.c
diff -u src/sys/dev/ieee1394/sbp.c:1.41 src/sys/dev/ieee1394/sbp.c:1.42
--- src/sys/dev/ieee1394/sbp.c:1.41	Sat Aug  7 16:19:12 2021
+++ src/sys/dev/ieee1394/sbp.c	Tue Apr 12 21:05:37 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbp.c,v 1.41 2021/08/07 16:19:12 thorpej Exp $	*/
+/*	$NetBSD: sbp.c,v 1.42 2022/04/12 21:05:37 andvar Exp $	*/
 /*-
  * Copyright (c) 2003 Hidetoshi Shimokawa
  * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.41 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.42 2022/04/12 21:05:37 andvar Exp $");
 
 
 #include 
@@ -672,7 +672,7 @@ sbp_alloc_lun(struct sbp_target *target)
 
 	sc = target->sbp;
 	crom_init_context(, target->fwdev->csrrom);
-	/* XXX shoud parse appropriate unit directories only */
+	/* XXX should parse appropriate unit directories only */
 	maxlun = -1;
 	while (cc.depth >= 0) {
 		reg = crom_search_key(, CROM_LUN);

Index: src/sys/dev/marvell/mvxpsec.c
diff -u src/sys/dev/marvell/mvxpsec.c:1.13 src/sys/dev/marvell/mvxpsec.c:1.14
--- src/sys/dev/marvell/mvxpsec.c:1.13	Sat Apr  9 23:38:32 2022
+++ src/sys/dev/marvell/mvxpsec.c	Tue Apr 12 21:05:37 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: mvxpsec.c,v 1.13 2022/04/09 23:38:32 riastradh Exp $	*/
+/*	$NetBSD: mvxpsec.c,v 1.14 2022/04/12 21:05:37 andvar Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -403,7 +403,7 @@ mvxpsec_attach(device_t parent, device_t
 	MVXPSEC_WRITE(sc, MV_TDMA_ERR_MASK, MVXPSEC_DEFAULT_ERR);
 	sc->sc_done_ih =
 	marvell_intr_establish(mva->mva_irq, IPL_NET, mvxpsec_intr, sc);
-	/* XXX: sould pass error IRQ using mva */
+	/* XXX: should pass error IRQ using mva */
 	sc->sc_error_ih = marvell_intr_establish(MVXPSEC_ERR_INT(sc),
 	IPL_NET, mvxpsec_eintr, sc);
 	aprint_normal_dev(self,

Index: src/tests/lib/libc/gen/t_closefrom.c
diff -u src/tests/lib/libc/gen/t_closefrom.c:1.4 src/tests/lib/libc/gen/t_closefrom.c:1.5
--- src/tests/lib/libc/gen/t_closefrom.c:1.4	Wed May 11 08:11:36 2011
+++ src/tests/lib/libc/gen/t_closefrom.c	Tue Apr 12 21:05:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: t_closefrom.c,v 1.4 2011/05/11 08:11:36 jruoho Exp $ */
+/* $NetBSD: t_closefrom.c,v 1.5 2022/04/12 21:05:37 andvar Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: 

CVS commit: src

2022-04-12 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue Apr 12 21:05:37 UTC 2022

Modified Files:
src/lib/libperfuse: ops.c
src/sys/arch/hp300/DOC: TODO.hp300
src/sys/dev/ieee1394: sbp.c
src/sys/dev/marvell: mvxpsec.c
src/tests/lib/libc/gen: t_closefrom.c

Log Message:
s/sould/should/ and s/shoud/should/


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/DOC/TODO.hp300
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ieee1394/sbp.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/marvell/mvxpsec.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/gen/t_closefrom.c

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



CVS commit: src

2022-04-12 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue Apr 12 20:51:42 UTC 2022

Modified Files:
src/sbin/mount_tmpfs: mount_tmpfs.8
src/sys/dev/ic: ispvar.h
src/sys/net: zlib.c

Log Message:
s/similarily/similarly/


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/mount_tmpfs/mount_tmpfs.8
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/ispvar.h
cvs rdiff -u -r1.37 -r1.38 src/sys/net/zlib.c

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

Modified files:

Index: src/sbin/mount_tmpfs/mount_tmpfs.8
diff -u src/sbin/mount_tmpfs/mount_tmpfs.8:1.18 src/sbin/mount_tmpfs/mount_tmpfs.8:1.19
--- src/sbin/mount_tmpfs/mount_tmpfs.8:1.18	Sat Jun  7 10:03:44 2014
+++ src/sbin/mount_tmpfs/mount_tmpfs.8	Tue Apr 12 20:51:42 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mount_tmpfs.8,v 1.18 2014/06/07 10:03:44 martin Exp $
+.\"	$NetBSD: mount_tmpfs.8,v 1.19 2022/04/12 20:51:42 andvar Exp $
 .\"
 .\" Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -94,7 +94,7 @@ system ram by using the notation
 where
 .Ar n
 is a number between 1 and 100.
-Similarily it can be specified as a fraction of the available system
+Similarly it can be specified as a fraction of the available system
 ram by using
 .Ar ram/n
 where

Index: src/sys/dev/ic/ispvar.h
diff -u src/sys/dev/ic/ispvar.h:1.74 src/sys/dev/ic/ispvar.h:1.75
--- src/sys/dev/ic/ispvar.h:1.74	Sat Sep 11 20:28:06 2021
+++ src/sys/dev/ic/ispvar.h	Tue Apr 12 20:51:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ispvar.h,v 1.74 2021/09/11 20:28:06 andvar Exp $ */
+/* $NetBSD: ispvar.h,v 1.75 2022/04/12 20:51:42 andvar Exp $ */
 /*
  * Copyright (C) 1999 National Aeronautics & Space Administration
  * All rights reserved.
@@ -395,9 +395,9 @@ typedef struct {
  * index to put it into the Database, but that's just an optimization. We mark
  * the entry VALID and make sure that the target index is updated and correct.
  *
- * When we get done searching the local loop, we then search similarily for
+ * When we get done searching the local loop, we then search similarly for
  * a list of devices we've gotten from the fabric name controller (if we're
- * on a fabric). VALID marking is also done similarily.
+ * on a fabric). VALID marking is also done similarly.
  *
  * When all of this is done, we can march through the database and clean up
  * any entry that is still PROBATIONAL (these represent devices which have

Index: src/sys/net/zlib.c
diff -u src/sys/net/zlib.c:1.37 src/sys/net/zlib.c:1.38
--- src/sys/net/zlib.c:1.37	Thu Jul 11 03:49:51 2019
+++ src/sys/net/zlib.c	Tue Apr 12 20:51:42 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlib.c,v 1.37 2019/07/11 03:49:51 msaitoh Exp $	*/
+/*	$NetBSD: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $	*/
 /*
  * This file is derived from various .h and .c files from the zlib-1.0.4
  * distribution by Jean-loup Gailly and Mark Adler, with some additions
@@ -11,7 +11,7 @@
  * - added inflateIncomp and deflateOutputPending
  * - allow strm->next_out to be NULL, meaning discard the output
  *
- * $Id: zlib.c,v 1.37 2019/07/11 03:49:51 msaitoh Exp $
+ * $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $
  */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.37 2019/07/11 03:49:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $");
 
 #define NO_DUMMY_DECL
 #define NO_ZCFUNCS
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.3
subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zlib.c,v 1.37 2019/07/11 03:49:51 msaitoh Exp $ */
+/* @(#) $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
@@ -294,7 +294,7 @@ void   zcfree(voidpf opaque, voidpf ptr)
subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zlib.c,v 1.37 2019/07/11 03:49:51 msaitoh Exp $ */
+/* @(#) $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
 
 #ifndef _DEFLATE_H
 #define _DEFLATE_H
@@ -656,7 +656,7 @@ void _tr_stored_type_only(deflate_state 
  *
  */
 
-/* @(#) $Id: zlib.c,v 1.37 2019/07/11 03:49:51 msaitoh Exp $ */
+/* @(#) $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
 
 /* #include "deflate.h" */
 
@@ -1999,7 +1999,7 @@ local block_state deflate_slow(deflate_s
  *  Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $Id: zlib.c,v 1.37 2019/07/11 03:49:51 msaitoh Exp $ */
+/* @(#) $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
 
 /* #define GEN_TREES_H */
 
@@ -3986,7 +3986,7 @@ local const uInt border[] = { /* Order o
   end-of-block.  Note however that the static length tree defines
   288 codes just to fill out the Huffman codes.  Codes 286 and 287
   cannot be used though, since there is no length base or extra bits
-  defined for them.  Similarily, there are up to 30 distance codes.
+  defined for them.  Similarly, there are up to 

CVS commit: src

2022-04-12 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue Apr 12 20:51:42 UTC 2022

Modified Files:
src/sbin/mount_tmpfs: mount_tmpfs.8
src/sys/dev/ic: ispvar.h
src/sys/net: zlib.c

Log Message:
s/similarily/similarly/


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/mount_tmpfs/mount_tmpfs.8
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/ispvar.h
cvs rdiff -u -r1.37 -r1.38 src/sys/net/zlib.c

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



CVS commit: src/sys/uvm

2022-04-12 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue Apr 12 20:27:56 UTC 2022

Modified Files:
src/sys/uvm: uvm_pdpolicy_clock.c uvm_pdpolicy_clockpro.c

Log Message:
s/stablize/stabilize/


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/uvm/uvm_pdpolicy_clock.c
cvs rdiff -u -r1.26 -r1.27 src/sys/uvm/uvm_pdpolicy_clockpro.c

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



CVS commit: src/sys/uvm

2022-04-12 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Tue Apr 12 20:27:56 UTC 2022

Modified Files:
src/sys/uvm: uvm_pdpolicy_clock.c uvm_pdpolicy_clockpro.c

Log Message:
s/stablize/stabilize/


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/uvm/uvm_pdpolicy_clock.c
cvs rdiff -u -r1.26 -r1.27 src/sys/uvm/uvm_pdpolicy_clockpro.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_pdpolicy_clock.c
diff -u src/sys/uvm/uvm_pdpolicy_clock.c:1.39 src/sys/uvm/uvm_pdpolicy_clock.c:1.40
--- src/sys/uvm/uvm_pdpolicy_clock.c:1.39	Thu Jun 11 22:21:05 2020
+++ src/sys/uvm/uvm_pdpolicy_clock.c	Tue Apr 12 20:27:56 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.39 2020/06/11 22:21:05 ad Exp $	*/
+/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.40 2022/04/12 20:27:56 andvar Exp $	*/
 /*	NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $	*/
 
 /*-
@@ -98,7 +98,7 @@
 #else /* defined(PDSIM) */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.39 2020/06/11 22:21:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.40 2022/04/12 20:27:56 andvar Exp $");
 
 #include 
 #include 
@@ -261,7 +261,7 @@ uvmpdpol_selectvictim(krwlock_t **plock)
 		uvmexp.pdscans++;
 
 		/*
-		 * acquire interlock to stablize page identity.
+		 * acquire interlock to stabilize page identity.
 		 * if we have caught the page in a state of flux
 		 * deal with it and retry.
 		 */
@@ -383,7 +383,7 @@ uvmpdpol_balancequeue(int swap_shortage)
 		KASSERT((p->flags & PG_MARKER) == 0);
 
 		/*
-		 * acquire interlock to stablize page identity.
+		 * acquire interlock to stabilize page identity.
 		 * if we have caught the page in a state of flux
 		 * deal with it and retry.
 		 */

Index: src/sys/uvm/uvm_pdpolicy_clockpro.c
diff -u src/sys/uvm/uvm_pdpolicy_clockpro.c:1.26 src/sys/uvm/uvm_pdpolicy_clockpro.c:1.27
--- src/sys/uvm/uvm_pdpolicy_clockpro.c:1.26	Sun May 17 19:38:17 2020
+++ src/sys/uvm/uvm_pdpolicy_clockpro.c	Tue Apr 12 20:27:56 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pdpolicy_clockpro.c,v 1.26 2020/05/17 19:38:17 ad Exp $	*/
+/*	$NetBSD: uvm_pdpolicy_clockpro.c,v 1.27 2022/04/12 20:27:56 andvar Exp $	*/
 
 /*-
  * Copyright (c)2005, 2006 YAMAMOTO Takashi,
@@ -43,7 +43,7 @@
 #else /* defined(PDSIM) */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clockpro.c,v 1.26 2020/05/17 19:38:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clockpro.c,v 1.27 2022/04/12 20:27:56 andvar Exp $");
 
 #include "opt_ddb.h"
 
@@ -648,7 +648,7 @@ clockpro_movereferencebit(struct vm_page
 	KASSERT(!locked || uvm_page_owner_locked_p(pg, false));
 	if (!locked) {
 		/*
-		 * acquire interlock to stablize page identity.
+		 * acquire interlock to stabilize page identity.
 		 * if we have caught the page in a state of flux
 		 * and it should be dequeued, abort.  it will be
 		 * dequeued later.
@@ -1354,7 +1354,7 @@ uvmpdpol_selectvictim(kmutex_t **plock)
 		}
 		ss->ss_nscanned++;
 		/*
-		 * acquire interlock to stablize page identity.
+		 * acquire interlock to stabilize page identity.
 		 * if we have caught the page in a state of flux
 		 * and it should be dequeued, do it now and then
 		 * move on to the next.



CVS commit: src/distrib/sets/lists/debug

2022-04-12 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Apr 12 11:54:57 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: shl.mi

Log Message:
Adapt to libcurses minor bump


To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/distrib/sets/lists/debug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.290 src/distrib/sets/lists/debug/shl.mi:1.291
--- src/distrib/sets/lists/debug/shl.mi:1.290	Mon Mar  7 09:23:20 2022
+++ src/distrib/sets/lists/debug/shl.mi	Tue Apr 12 11:54:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.290 2022/03/07 09:23:20 mrg Exp $
+# $NetBSD: shl.mi,v 1.291 2022/04/12 11:54:57 martin Exp $
 ./usr/lib/libbfd_g.a		comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,dynamicroot,zfs
@@ -98,7 +98,8 @@
 ./usr/libdata/debug/usr/lib/libcurses.so.7.1.debug		comp-obsolete	debug,obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libcurses.so.7.2.debug		comp-sys-debug	debug,obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libcurses.so.8.2.debug		comp-sys-debug	debug,obsolete,compatfile
-./usr/libdata/debug/usr/lib/libcurses.so.9.0.debug		comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libcurses.so.9.0.debug		comp-sys-debug	debug,obsolete,compatfile
+./usr/libdata/debug/usr/lib/libcurses.so.9.1.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libdes.so.12.0.debug			comp-crypto-debug	debug,compatfile,openssl=10
 ./usr/libdata/debug/usr/lib/libdes.so.14.0.debug			comp-crypto-debug	debug,compatfile,openssl=11
 ./usr/libdata/debug/usr/lib/libdevmapper.so.1.0.debug		comp-lvm-debug	debug,compatfile,lvm



CVS commit: src/distrib/sets/lists/debug

2022-04-12 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Apr 12 11:54:57 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: shl.mi

Log Message:
Adapt to libcurses minor bump


To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/distrib/sets/lists/debug/shl.mi

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



CVS commit: src/tests/lib/libcurses/check_files

2022-04-12 Thread Brett Lymn
Module Name:src
Committed By:   blymn
Date:   Tue Apr 12 07:04:19 UTC 2022

Modified Files:
src/tests/lib/libcurses/check_files: addstr2.chk addstr3.chk chgat1.chk
chgat2.chk color_blank_draw.chk mvwchgat2.chk slk6.chk wchgat1.chk
wchgat2.chk wchgat3.chk wcolor_set.chk wins_wch3.chk

Log Message:
Update to account for default colour change in libcurses.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/check_files/addstr2.chk \
src/tests/lib/libcurses/check_files/slk6.chk
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/addstr3.chk \
src/tests/lib/libcurses/check_files/wins_wch3.chk
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/chgat1.chk \
src/tests/lib/libcurses/check_files/chgat2.chk \
src/tests/lib/libcurses/check_files/color_blank_draw.chk \
src/tests/lib/libcurses/check_files/mvwchgat2.chk \
src/tests/lib/libcurses/check_files/wchgat1.chk \
src/tests/lib/libcurses/check_files/wchgat2.chk \
src/tests/lib/libcurses/check_files/wchgat3.chk \
src/tests/lib/libcurses/check_files/wcolor_set.chk

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

Modified files:

Index: src/tests/lib/libcurses/check_files/addstr2.chk
diff -u src/tests/lib/libcurses/check_files/addstr2.chk:1.3 src/tests/lib/libcurses/check_files/addstr2.chk:1.4
--- src/tests/lib/libcurses/check_files/addstr2.chk:1.3	Tue Sep  7 01:29:13 2021
+++ src/tests/lib/libcurses/check_files/addstr2.chk	Tue Apr 12 07:04:19 2022
@@ -1 +1 @@
-cup24;1X0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890123456cup24;1Xclearcsr1;24Xhomecup24;1Xindn4Xcsr1;24Xhomehomecup24;76Xa   rmamhsmamcup24;1X
\ No newline at end of file
+cup24;1X0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890123456cup24;1Xclearcup24;76Xa   rmamhsmamcup24;1X
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/slk6.chk
diff -u src/tests/lib/libcurses/check_files/slk6.chk:1.3 src/tests/lib/libcurses/check_files/slk6.chk:1.4
--- src/tests/lib/libcurses/check_files/slk6.chk:1.3	Tue Jun 22 07:29:16 2021
+++ src/tests/lib/libcurses/check_files/slk6.chk	Tue Apr 12 07:04:19 2022
@@ -1 +1 @@
-opsetaf7Xsetab0Xsmulrev onesgr0setaf7Xsetab0X smulrev  two   sgr0setaf7Xsetab0X smulrevsgr0setaf7Xsetab0X setaf1Xsetab2Xsmulrevfoursgr0setaf7Xsetab0X  smulrev  five  sgr0setaf7Xsetab0X smulrevsgr0setaf7Xsetab0X smulrevsgr0setaf7Xsetab0X smulreveight!!rmam!smamcup24;40Xrmulsgr0op
\ No newline at end of file
+opsetaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0Xosetaf7Xsetab0Xnsetaf7Xsetab0Xesgr0setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0Xtsetaf7Xsetab0Xwsetaf7Xsetab0Xosetaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X sgr0setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X sgr0setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf1Xsetab2Xsmulrev setaf1Xsetab2X setaf1Xsetab2X setaf1Xsetab2X setaf1Xsetab2Xfsetaf1Xsetab2Xosetaf1Xsetab2Xusetaf1Xsetab2Xrsgr0setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0Xfsetaf7Xsetab0Xisetaf7Xsetab0Xvsetaf7Xsetab0Xesetaf7Xsetab0X setaf7Xsetab0X sgr0setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X sg
 r0setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X sgr0setaf7Xsetab0X setaf7Xsetab0Xsmulrevesetaf7Xsetab0Xisetaf7Xsetab0Xgsetaf7Xsetab0Xhsetaf7Xsetab0Xtsetaf7Xsetab0X!setaf7Xsetab0X!rmamsetaf7Xsetab0X!smamcup24;40Xrmulsgr0op
\ No newline at end of file

Index: src/tests/lib/libcurses/check_files/addstr3.chk
diff -u src/tests/lib/libcurses/check_files/addstr3.chk:1.2 src/tests/lib/libcurses/check_files/addstr3.chk:1.3
--- src/tests/lib/libcurses/check_files/addstr3.chk:1.2	Tue Jun 22 07:49:58 2021
+++ src/tests/lib/libcurses/check_files/addstr3.chk	Tue Apr 12 07:04:19 2022
@@ -1,4 +1,5 @@
 csr2;24Xhomehome
 rin1Xcsr1;24Xhomehomecup24;1Xhome
-()cup23;1X0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*cup2;3Xclear
+()cup23;1X0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*cup2;3Xclearcsr2;23Xhome
+rin1Xcsr1;24Xhomehome
 hellocup23;76Xacup2;6X
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/wins_wch3.chk
diff -u src/tests/lib/libcurses/check_files/wins_wch3.chk:1.2 src/tests/lib/libcurses/check_files/wins_wch3.chk:1.3
--- src/tests/lib/libcurses/check_files/wins_wch3.chk:1.2	Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/wins_wch3.chk	

CVS commit: src/tests/lib/libcurses/check_files

2022-04-12 Thread Brett Lymn
Module Name:src
Committed By:   blymn
Date:   Tue Apr 12 07:04:19 UTC 2022

Modified Files:
src/tests/lib/libcurses/check_files: addstr2.chk addstr3.chk chgat1.chk
chgat2.chk color_blank_draw.chk mvwchgat2.chk slk6.chk wchgat1.chk
wchgat2.chk wchgat3.chk wcolor_set.chk wins_wch3.chk

Log Message:
Update to account for default colour change in libcurses.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/check_files/addstr2.chk \
src/tests/lib/libcurses/check_files/slk6.chk
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/addstr3.chk \
src/tests/lib/libcurses/check_files/wins_wch3.chk
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/chgat1.chk \
src/tests/lib/libcurses/check_files/chgat2.chk \
src/tests/lib/libcurses/check_files/color_blank_draw.chk \
src/tests/lib/libcurses/check_files/mvwchgat2.chk \
src/tests/lib/libcurses/check_files/wchgat1.chk \
src/tests/lib/libcurses/check_files/wchgat2.chk \
src/tests/lib/libcurses/check_files/wchgat3.chk \
src/tests/lib/libcurses/check_files/wcolor_set.chk

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



CVS commit: src/distrib/sets/lists/base

2022-04-12 Thread Brett Lymn
Module Name:src
Committed By:   blymn
Date:   Tue Apr 12 07:03:29 UTC 2022

Modified Files:
src/distrib/sets/lists/base: shl.mi

Log Message:
Bump libcurses minor


To generate a diff of this commit:
cvs rdiff -u -r1.933 -r1.934 src/distrib/sets/lists/base/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.933 src/distrib/sets/lists/base/shl.mi:1.934
--- src/distrib/sets/lists/base/shl.mi:1.933	Mon Mar  7 09:45:02 2022
+++ src/distrib/sets/lists/base/shl.mi	Tue Apr 12 07:03:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.933 2022/03/07 09:45:02 mrg Exp $
+# $NetBSD: shl.mi,v 1.934 2022/04/12 07:03:29 blymn Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -279,7 +279,7 @@
 ./usr/lib/libctf.so.3.0base-sys-shlib		compatfile,ctf
 ./usr/lib/libcurses.sobase-sys-shlib		compatfile
 ./usr/lib/libcurses.so.9			base-sys-shlib		compatfile
-./usr/lib/libcurses.so.9.0			base-sys-shlib		compatfile
+./usr/lib/libcurses.so.9.1			base-sys-shlib		compatfile
 ./usr/lib/libdes.sobase-crypto-shlib	compatfile
 ./usr/lib/libdes.so.12base-crypto-shlib	compatfile,openssl=10
 ./usr/lib/libdes.so.12.0base-crypto-shlib	compatfile,openssl=10



CVS commit: src/distrib/sets/lists/base

2022-04-12 Thread Brett Lymn
Module Name:src
Committed By:   blymn
Date:   Tue Apr 12 07:03:29 UTC 2022

Modified Files:
src/distrib/sets/lists/base: shl.mi

Log Message:
Bump libcurses minor


To generate a diff of this commit:
cvs rdiff -u -r1.933 -r1.934 src/distrib/sets/lists/base/shl.mi

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



CVS commit: src/lib/libcurses

2022-04-12 Thread Brett Lymn
Module Name:src
Committed By:   blymn
Date:   Tue Apr 12 07:03:05 UTC 2022

Modified Files:
src/lib/libcurses: add_wchstr.c addbytes.c attributes.c background.c
border.c clrtobot.c clrtoeol.c color.c copywin.c curses_private.h
delch.c erase.c get_wstr.c ins_wch.c ins_wstr.c insdelln.c mvwin.c
newwin.c refresh.c shlib_version slk.c touchwin.c

Log Message:
Make the default colour pair be pair 0 which appears to match other
curses implementations.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libcurses/add_wchstr.c
cvs rdiff -u -r1.61 -r1.62 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.33 -r1.34 src/lib/libcurses/attributes.c \
src/lib/libcurses/clrtoeol.c src/lib/libcurses/touchwin.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libcurses/background.c \
src/lib/libcurses/clrtobot.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libcurses/border.c \
src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.45 -r1.46 src/lib/libcurses/color.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libcurses/copywin.c \
src/lib/libcurses/insdelln.c
cvs rdiff -u -r1.77 -r1.78 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.27 -r1.28 src/lib/libcurses/delch.c
cvs rdiff -u -r1.34 -r1.35 src/lib/libcurses/erase.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/get_wstr.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libcurses/ins_wch.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libcurses/mvwin.c
cvs rdiff -u -r1.65 -r1.66 src/lib/libcurses/newwin.c
cvs rdiff -u -r1.118 -r1.119 src/lib/libcurses/refresh.c
cvs rdiff -u -r1.46 -r1.47 src/lib/libcurses/shlib_version
cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/slk.c

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



CVS commit: src/lib/libcurses

2022-04-12 Thread Brett Lymn
Module Name:src
Committed By:   blymn
Date:   Tue Apr 12 07:03:05 UTC 2022

Modified Files:
src/lib/libcurses: add_wchstr.c addbytes.c attributes.c background.c
border.c clrtobot.c clrtoeol.c color.c copywin.c curses_private.h
delch.c erase.c get_wstr.c ins_wch.c ins_wstr.c insdelln.c mvwin.c
newwin.c refresh.c shlib_version slk.c touchwin.c

Log Message:
Make the default colour pair be pair 0 which appears to match other
curses implementations.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libcurses/add_wchstr.c
cvs rdiff -u -r1.61 -r1.62 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.33 -r1.34 src/lib/libcurses/attributes.c \
src/lib/libcurses/clrtoeol.c src/lib/libcurses/touchwin.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libcurses/background.c \
src/lib/libcurses/clrtobot.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libcurses/border.c \
src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.45 -r1.46 src/lib/libcurses/color.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libcurses/copywin.c \
src/lib/libcurses/insdelln.c
cvs rdiff -u -r1.77 -r1.78 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.27 -r1.28 src/lib/libcurses/delch.c
cvs rdiff -u -r1.34 -r1.35 src/lib/libcurses/erase.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/get_wstr.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libcurses/ins_wch.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libcurses/mvwin.c
cvs rdiff -u -r1.65 -r1.66 src/lib/libcurses/newwin.c
cvs rdiff -u -r1.118 -r1.119 src/lib/libcurses/refresh.c
cvs rdiff -u -r1.46 -r1.47 src/lib/libcurses/shlib_version
cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/slk.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/add_wchstr.c
diff -u src/lib/libcurses/add_wchstr.c:1.11 src/lib/libcurses/add_wchstr.c:1.12
--- src/lib/libcurses/add_wchstr.c:1.11	Tue Jan 25 03:05:06 2022
+++ src/lib/libcurses/add_wchstr.c	Tue Apr 12 07:03:04 2022
@@ -1,4 +1,4 @@
-/*   $NetBSD: add_wchstr.c,v 1.11 2022/01/25 03:05:06 blymn Exp $ */
+/*   $NetBSD: add_wchstr.c,v 1.12 2022/04/12 07:03:04 blymn Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: add_wchstr.c,v 1.11 2022/01/25 03:05:06 blymn Exp $");
+__RCSID("$NetBSD: add_wchstr.c,v 1.12 2022/04/12 07:03:04 blymn Exp $");
 #endif/* not lint */
 
 #include 
@@ -170,7 +170,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t 
 		if (wcwidth(chp->vals[0])) {
 			/* clear the partial character before cursor */
 			for (tp = lp + cw; tp < lp; tp++) {
-tp->ch = (wchar_t) btowc((int) win->bch);
+tp->ch = win->bch;
 if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
 	return ERR;
 tp->attr = win->battr;
@@ -205,8 +205,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t 
 			if (cw > win->maxx - ex) {
 /* clear to EOL */
 while (ex < win->maxx) {
-	lp->ch = (wchar_t)
-		btowc((int) win->bch);
+	lp->ch = win->bch;
 	if (_cursesi_copy_nsp(win->bnsp, lp)
 	== ERR)
 		return ERR;

Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.61 src/lib/libcurses/addbytes.c:1.62
--- src/lib/libcurses/addbytes.c:1.61	Tue Jan 25 03:05:06 2022
+++ src/lib/libcurses/addbytes.c	Tue Apr 12 07:03:04 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: addbytes.c,v 1.61 2022/01/25 03:05:06 blymn Exp $	*/
+/*	$NetBSD: addbytes.c,v 1.62 2022/04/12 07:03:04 blymn Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)addbytes.c	8.4 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: addbytes.c,v 1.61 2022/01/25 03:05:06 blymn Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.62 2022/04/12 07:03:04 blymn Exp $");
 #endif
 #endif/* not lint */
 
@@ -448,7 +448,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 			"_cursesi_addwchar: clear current char (%d,%d)\n",
 			*y, sx);
 			tp = >alines[*y]->line[sx];
-			tp->ch = (wchar_t) btowc((int) win->bch);
+			tp->ch = win->bch;
 			if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
 return ERR;
 
@@ -481,7 +481,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 		if (newx < *(*lnp)->firstchp)
 			*(*lnp)->firstchp = newx;
 		for (tp = lp; *x < win->maxx; tp++, (*x)++) {
-			tp->ch = (wchar_t) btowc((int) win->bch);
+			tp->ch = win->bch;
 			if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
 return ERR;
 			tp->attr = win->battr;
@@ -595,7 +595,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 "_cursesi_addwchar: clear "
 "remaining of current char (%d,%d)nn",
 *y, ex);
-tp->ch = (wchar_t) btowc((int) win->bch);
+tp->ch = win->bch;
 if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
 	return ERR;
 tp->attr = win->battr;

Index: src/lib/libcurses/attributes.c
diff -u src/lib/libcurses/attributes.c:1.33 src/lib/libcurses/attributes.c:1.34
--- src/lib/libcurses/attributes.c:1.33	Wed Dec  8 20:50:01 2021
+++