CVS commit: src/sys/dev/pci/ixgbe

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 03:15:33 UTC 2024

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

Log Message:
Modify comment. The number of queues is not limited to 8.

The number of queue is calculated from both the number of CPUs and
the number of MSI-X vectors.


To generate a diff of this commit:
cvs rdiff -u -r1.349 -r1.350 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.349 src/sys/dev/pci/ixgbe/ixgbe.c:1.350
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.349	Wed Jan 24 05:18:59 2024
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Mon May 13 03:15:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.349 2024/01/24 05:18:59 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.350 2024/05/13 03:15:33 msaitoh Exp $ */
 
 /**
 
@@ -64,7 +64,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.349 2024/01/24 05:18:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.350 2024/05/13 03:15:33 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -358,8 +358,8 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix
 /*
  * Number of Queues, can be set to 0,
  * it then autoconfigures based on the
- * number of cpus with a max of 8. This
- * can be overridden manually here.
+ * number of cpus and number of MSI-X vectors.
+ * This can be overridden manually here.
  */
 static int ixgbe_num_queues = 0;
 SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, &ixgbe_num_queues, 0,



CVS commit: src/sys/dev/pci/ixgbe

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 03:15:33 UTC 2024

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

Log Message:
Modify comment. The number of queues is not limited to 8.

The number of queue is calculated from both the number of CPUs and
the number of MSI-X vectors.


To generate a diff of this commit:
cvs rdiff -u -r1.349 -r1.350 src/sys/dev/pci/ixgbe/ixgbe.c

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



CVS commit: src/usr.bin/telnet

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:32:39 UTC 2024

Modified Files:
src/usr.bin/telnet: ring.c

Log Message:
s/of of/of/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/telnet/ring.c

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/telnet/ring.c
diff -u src/usr.bin/telnet/ring.c:1.16 src/usr.bin/telnet/ring.c:1.17
--- src/usr.bin/telnet/ring.c:1.16	Mon Aug  7 23:31:11 2023
+++ src/usr.bin/telnet/ring.c	Mon May 13 00:32:39 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ring.c,v 1.16 2023/08/07 23:31:11 mrg Exp $	*/
+/*	$NetBSD: ring.c,v 1.17 2024/05/13 00:32:39 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
 #else
-__RCSID("$NetBSD: ring.c,v 1.16 2023/08/07 23:31:11 mrg Exp $");
+__RCSID("$NetBSD: ring.c,v 1.17 2024/05/13 00:32:39 msaitoh Exp $");
 #endif
 #endif /* not lint */
 
@@ -267,7 +267,7 @@ ring_full_consecutive(Ring *ring)
 }
 
 /*
- * Move data into the "supply" portion of of the ring buffer.
+ * Move data into the "supply" portion of the ring buffer.
  */
 void
 ring_supply_data(Ring *ring, unsigned char *buffer, int count)



CVS commit: src/usr.bin/telnet

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:32:39 UTC 2024

Modified Files:
src/usr.bin/telnet: ring.c

Log Message:
s/of of/of/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/telnet/ring.c

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



CVS commit: src/sys/kern

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:32:09 UTC 2024

Modified Files:
src/sys/kern: kern_module.c

Log Message:
s/signficant/significant/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/kern/kern_module.c

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

Modified files:

Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.161 src/sys/kern/kern_module.c:1.162
--- src/sys/kern/kern_module.c:1.161	Tue Jan 31 13:21:37 2023
+++ src/sys/kern/kern_module.c	Mon May 13 00:32:09 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.161 2023/01/31 13:21:37 riastradh Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.162 2024/05/13 00:32:09 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.161 2023/01/31 13:21:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.162 2024/05/13 00:32:09 msaitoh Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -641,7 +641,7 @@ module_init_class(modclass_t modclass)
  *
  *	Return true if the two supplied kernel versions are said to
  *	have the same binary interface for kernel code.  The entire
- *	version is signficant for the development tree (-current),
+ *	version is significant for the development tree (-current),
  *	major and minor versions are significant for official
  *	releases of the system.
  */



CVS commit: src/sys/kern

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:32:09 UTC 2024

Modified Files:
src/sys/kern: kern_module.c

Log Message:
s/signficant/significant/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/kern/kern_module.c

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



CVS commit: src

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:25:23 UTC 2024

Modified Files:
src/sys/arch/arm/gemini: gemini_gmacreg.h
src/usr.bin/mail: mime_decode.c

Log Message:
emtpy -> empty in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_gmacreg.h
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/mail/mime_decode.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/arch/arm/gemini/gemini_gmacreg.h
diff -u src/sys/arch/arm/gemini/gemini_gmacreg.h:1.3 src/sys/arch/arm/gemini/gemini_gmacreg.h:1.4
--- src/sys/arch/arm/gemini/gemini_gmacreg.h:1.3	Tue Dec 23 02:15:10 2008
+++ src/sys/arch/arm/gemini/gemini_gmacreg.h	Mon May 13 00:25:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmacreg.h,v 1.3 2008/12/23 02:15:10 matt Exp $ */
+/* $NetBSD: gemini_gmacreg.h,v 1.4 2024/05/13 00:25:23 msaitoh Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -125,10 +125,10 @@
 #define	INT1_TOE_IQ2_FULL	__BIT(30)	/* TOE Intr Queue2 Full */
 #define	INT1_TOE_IQ1_FULL	__BIT(29)	/* TOE Intr Queue1 Full */
 #define	INT1_TOE_IQ0_FULL	__BIT(28)	/* TOE Intr Queue0 Full */
-#define	INT1_TOE_IQ3_NONEMPTY	__BIT(27)	/* TOE Intr Queue3 !Emtpy */
-#define	INT1_TOE_IQ2_NONEMPTY	__BIT(26)	/* TOE Intr Queue2 !Emtpy */
-#define	INT1_TOE_IQ1_NONEMPTY	__BIT(25)	/* TOE Intr Queue1 !Emtpy */
-#define	INT1_TOE_IQ0_NONEMPTY	__BIT(24)	/* TOE Intr Queue0 !Emtpy */
+#define	INT1_TOE_IQ3_NONEMPTY	__BIT(27)	/* TOE Intr Queue3 !Empty */
+#define	INT1_TOE_IQ2_NONEMPTY	__BIT(26)	/* TOE Intr Queue2 !Empty */
+#define	INT1_TOE_IQ1_NONEMPTY	__BIT(25)	/* TOE Intr Queue1 !Empty */
+#define	INT1_TOE_IQ0_NONEMPTY	__BIT(24)	/* TOE Intr Queue0 !Empty */
 #define	INT1_HWTQ13_EOF		__BIT(23)	/* GMAC1 HW TX Queue3 EOF */
 #define	INT1_HWTQ12_EOF		__BIT(22)	/* GMAC1 HW TX Queue2 EOF */
 #define	INT1_HWTQ11_EOF		__BIT(21)	/* GMAC1 HW TX Queue1 EOF */

Index: src/usr.bin/mail/mime_decode.c
diff -u src/usr.bin/mail/mime_decode.c:1.17 src/usr.bin/mail/mime_decode.c:1.18
--- src/usr.bin/mail/mime_decode.c:1.17	Mon Jun 21 19:49:31 2010
+++ src/usr.bin/mail/mime_decode.c	Mon May 13 00:25:23 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: mime_decode.c,v 1.17 2010/06/21 19:49:31 christos Exp $	*/
+/*	$NetBSD: mime_decode.c,v 1.18 2024/05/13 00:25:23 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include 
 #ifndef __lint__
-__RCSID("$NetBSD: mime_decode.c,v 1.17 2010/06/21 19:49:31 christos Exp $");
+__RCSID("$NetBSD: mime_decode.c,v 1.18 2024/05/13 00:25:23 msaitoh Exp $");
 #endif /* not __lint__ */
 
 #include 
@@ -111,7 +111,7 @@ __unused
 static void
 show_mime_info(FILE *fp, struct mime_info *mip, struct mime_info *end_mip)
 {
-	for (/* EMTPY */; mip != end_mip; mip = mip->mi_flink)
+	for (/* EMPTY */; mip != end_mip; mip = mip->mi_flink)
 		show_one_mime_info(fp, mip);
 
 	(void)fprintf(fp, "++ =\n");



CVS commit: src

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:25:23 UTC 2024

Modified Files:
src/sys/arch/arm/gemini: gemini_gmacreg.h
src/usr.bin/mail: mime_decode.c

Log Message:
emtpy -> empty in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_gmacreg.h
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/mail/mime_decode.c

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



CVS commit: src/sys

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:24:19 UTC 2024

Modified Files:
src/sys/fs/adosfs: advnops.c
src/sys/fs/msdosfs: msdosfs_fat.c
src/sys/nfs: nfs_bootdhcp.c
src/sys/ufs/ext2fs: ext2fs_alloc.c
src/sys/ufs/ffs: ffs_alloc.c ffs_wapbl.c

Log Message:
s/contigous/contiguous/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/fs/adosfs/advnops.c
cvs rdiff -u -r1.36 -r1.37 src/sys/fs/msdosfs/msdosfs_fat.c
cvs rdiff -u -r1.57 -r1.58 src/sys/nfs/nfs_bootdhcp.c
cvs rdiff -u -r1.56 -r1.57 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.172 -r1.173 src/sys/ufs/ffs/ffs_alloc.c
cvs rdiff -u -r1.48 -r1.49 src/sys/ufs/ffs/ffs_wapbl.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/fs/adosfs/advnops.c
diff -u src/sys/fs/adosfs/advnops.c:1.59 src/sys/fs/adosfs/advnops.c:1.60
--- src/sys/fs/adosfs/advnops.c:1.59	Mon Apr  4 19:33:45 2022
+++ src/sys/fs/adosfs/advnops.c	Mon May 13 00:24:18 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: advnops.c,v 1.59 2022/04/04 19:33:45 andvar Exp $	*/
+/*	$NetBSD: advnops.c,v 1.60 2024/05/13 00:24:18 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.59 2022/04/04 19:33:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.60 2024/05/13 00:24:18 msaitoh Exp $");
 
 #include 
 #include 
@@ -273,7 +273,7 @@ adosfs_read(void *v)
 		/*
 		 * read ahead could possibly be worth something
 		 * but not much as ados makes little attempt to
-		 * make things contigous
+		 * make things contiguous
 		 */
 		error = bread(sp->a_vp, lbn, amp->bsize, 0, &bp);
 		if (error) {

Index: src/sys/fs/msdosfs/msdosfs_fat.c
diff -u src/sys/fs/msdosfs/msdosfs_fat.c:1.36 src/sys/fs/msdosfs/msdosfs_fat.c:1.37
--- src/sys/fs/msdosfs/msdosfs_fat.c:1.36	Sat Oct 23 16:58:17 2021
+++ src/sys/fs/msdosfs/msdosfs_fat.c	Mon May 13 00:24:19 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_fat.c,v 1.36 2021/10/23 16:58:17 thorpej Exp $	*/
+/*	$NetBSD: msdosfs_fat.c,v 1.37 2024/05/13 00:24:19 msaitoh Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -52,7 +52,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.36 2021/10/23 16:58:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.37 2024/05/13 00:24:19 msaitoh Exp $");
 
 /*
  * kernel include files.
@@ -765,7 +765,7 @@ chainlength(struct msdosfsmount *pmp, u_
 }
 
 /*
- * Allocate contigous free clusters.
+ * Allocate contiguous free clusters.
  *
  * pmp	  - mount point.
  * start  - start of cluster chain.

Index: src/sys/nfs/nfs_bootdhcp.c
diff -u src/sys/nfs/nfs_bootdhcp.c:1.57 src/sys/nfs/nfs_bootdhcp.c:1.58
--- src/sys/nfs/nfs_bootdhcp.c:1.57	Sat Dec 24 15:37:50 2022
+++ src/sys/nfs/nfs_bootdhcp.c	Mon May 13 00:24:19 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bootdhcp.c,v 1.57 2022/12/24 15:37:50 andvar Exp $	*/
+/*	$NetBSD: nfs_bootdhcp.c,v 1.58 2024/05/13 00:24:19 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nfs_bootdhcp.c,v 1.57 2022/12/24 15:37:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bootdhcp.c,v 1.58 2024/05/13 00:24:19 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs_boot.h"
@@ -309,7 +309,7 @@ bootpset(struct mbuf *m, void *context, 
 {
 	struct bootp *bootp;
 
-	/* we know it's contigous (in 1 mbuf cluster) */
+	/* we know it's contiguous (in 1 mbuf cluster) */
 	bootp = mtod(m, struct bootp*);
 
 	bootp->bp_secs = htons(waited);

Index: src/sys/ufs/ext2fs/ext2fs_alloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.56 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.57
--- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.56	Sat Aug 26 22:08:22 2023
+++ src/sys/ufs/ext2fs/ext2fs_alloc.c	Mon May 13 00:24:19 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_alloc.c,v 1.56 2023/08/26 22:08:22 christos Exp $	*/
+/*	$NetBSD: ext2fs_alloc.c,v 1.57 2024/05/13 00:24:19 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.56 2023/08/26 22:08:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.57 2024/05/13 00:24:19 msaitoh Exp $");
 
 #include 
 #include 
@@ -240,7 +240,7 @@ ext2fs_dirpref(struct m_ext2fs *fs)
  * If no blocks have been allocated in the first section, the policy is to
  * request a block in the same cylinder group as the inode that describes
  * the file. Otherwise, the policy is to try to allocate the blocks
- * contigously. The two fields of the ext2 inode extension (see
+ * contiguously. The two fields of the ext2 inode extension (see
  * ufs/ufs/inode.h) help this.
  */
 daddr_t

Index: src/sys/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.172 src/sys/ufs/ffs/ffs_alloc.c:1.173
--- src/sys/ufs/ff

CVS commit: src/sys

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:24:19 UTC 2024

Modified Files:
src/sys/fs/adosfs: advnops.c
src/sys/fs/msdosfs: msdosfs_fat.c
src/sys/nfs: nfs_bootdhcp.c
src/sys/ufs/ext2fs: ext2fs_alloc.c
src/sys/ufs/ffs: ffs_alloc.c ffs_wapbl.c

Log Message:
s/contigous/contiguous/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/fs/adosfs/advnops.c
cvs rdiff -u -r1.36 -r1.37 src/sys/fs/msdosfs/msdosfs_fat.c
cvs rdiff -u -r1.57 -r1.58 src/sys/nfs/nfs_bootdhcp.c
cvs rdiff -u -r1.56 -r1.57 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.172 -r1.173 src/sys/ufs/ffs/ffs_alloc.c
cvs rdiff -u -r1.48 -r1.49 src/sys/ufs/ffs/ffs_wapbl.c

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



CVS commit: src/sys

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:12:33 UTC 2024

Modified Files:
src/sys/arch/sparc64/sparc64: trap.c
src/sys/netipsec: ipsec.c

Log Message:
s/priviliged/privileged/


To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/sparc64/sparc64/trap.c
cvs rdiff -u -r1.178 -r1.179 src/sys/netipsec/ipsec.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/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.197 src/sys/arch/sparc64/sparc64/trap.c:1.198
--- src/sys/arch/sparc64/sparc64/trap.c:1.197	Mon Jan 15 08:13:45 2024
+++ src/sys/arch/sparc64/sparc64/trap.c	Mon May 13 00:12:33 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.197 2024/01/15 08:13:45 andvar Exp $ */
+/*	$NetBSD: trap.c,v 1.198 2024/05/13 00:12:33 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.197 2024/01/15 08:13:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.198 2024/05/13 00:12:33 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -520,7 +520,7 @@ trap(struct trapframe64 *tf, unsigned in
 #endif
 		/*
 		 * The kernel needs to use FPU registers for block
-		 * load/store.  If we trap in priviliged code, save
+		 * load/store.  If we trap in privileged code, save
 		 * the FPU state if there is any and enable the FPU.
 		 *
 		 * We rely on the kernel code properly enabling the FPU
@@ -1386,7 +1386,7 @@ data_access_error(struct trapframe64 *tf
 		}
 
 		/*
-		 * If this was a priviliged error but not a probe, we
+		 * If this was a privileged error but not a probe, we
 		 * cannot recover, so panic.
 		 */
 		if (afsr & ASFR_PRIV) {

Index: src/sys/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.178 src/sys/netipsec/ipsec.c:1.179
--- src/sys/netipsec/ipsec.c:1.178	Fri Jan 27 09:33:43 2023
+++ src/sys/netipsec/ipsec.c	Mon May 13 00:12:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.178 2023/01/27 09:33:43 ozaki-r Exp $ */
+/* $NetBSD: ipsec.c,v 1.179 2024/05/13 00:12:33 msaitoh Exp $ */
 /* $FreeBSD: ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
 /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.178 2023/01/27 09:33:43 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.179 2024/05/13 00:12:33 msaitoh Exp $");
 
 /*
  * IPsec controller part.
@@ -489,7 +489,7 @@ ipsec_getpolicybysock(struct mbuf *m, u_
 			switch (currsp->policy) {
 			case IPSEC_POLICY_BYPASS:
 IPSECLOG(LOG_ERR, "Illegal policy for "
-"non-priviliged defined %d\n",
+"non-privileged defined %d\n",
 currsp->policy);
 *error = EINVAL;
 return NULL;



CVS commit: src/sys

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:12:33 UTC 2024

Modified Files:
src/sys/arch/sparc64/sparc64: trap.c
src/sys/netipsec: ipsec.c

Log Message:
s/priviliged/privileged/


To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/sparc64/sparc64/trap.c
cvs rdiff -u -r1.178 -r1.179 src/sys/netipsec/ipsec.c

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



CVS commit: src/sys

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:11:22 UTC 2024

Modified Files:
src/sys/arch/sgimips/stand/sgivol: sgivol.c
src/sys/nfs: nfs_vfsops.c

Log Message:
ficticious -> fictitious in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/stand/sgivol/sgivol.c
cvs rdiff -u -r1.245 -r1.246 src/sys/nfs/nfs_vfsops.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/arch/sgimips/stand/sgivol/sgivol.c
diff -u src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.21 src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.22
--- src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.21	Fri Mar 28 15:00:53 2014
+++ src/sys/arch/sgimips/stand/sgivol/sgivol.c	Mon May 13 00:11:22 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sgivol.c,v 1.21 2014/03/28 15:00:53 christos Exp $	*/
+/*	$NetBSD: sgivol.c,v 1.22 2024/05/13 00:11:22 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #if HAVE_NBTOOL_CONFIG_H
 #include "../../../../../sys/sys/bootblock.h"
-/* Ficticious geometry for cross tool usage against a file image */
+/* Fictitious geometry for cross tool usage against a file image */
 #define SGIVOL_NBTOOL_NSECS	32
 #define SGIVOL_NBTOOL_NTRACKS	64
 #else

Index: src/sys/nfs/nfs_vfsops.c
diff -u src/sys/nfs/nfs_vfsops.c:1.245 src/sys/nfs/nfs_vfsops.c:1.246
--- src/sys/nfs/nfs_vfsops.c:1.245	Tue Mar 21 15:47:46 2023
+++ src/sys/nfs/nfs_vfsops.c	Mon May 13 00:11:22 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vfsops.c,v 1.245 2023/03/21 15:47:46 christos Exp $	*/
+/*	$NetBSD: nfs_vfsops.c,v 1.246 2024/05/13 00:11:22 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.245 2023/03/21 15:47:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.246 2024/05/13 00:11:22 msaitoh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_nfs.h"
@@ -81,7 +81,7 @@ extern struct nfsstats nfsstats;
 extern int nfs_ticks;
 
 /*
- * keep a count of the nfs mounts to generate ficticious drive names
+ * keep a count of the nfs mounts to generate fictitious drive names
  * for the per drive stats.
  */
 unsigned int nfs_mount_count = 0;



CVS commit: src/sys

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:11:22 UTC 2024

Modified Files:
src/sys/arch/sgimips/stand/sgivol: sgivol.c
src/sys/nfs: nfs_vfsops.c

Log Message:
ficticious -> fictitious in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/stand/sgivol/sgivol.c
cvs rdiff -u -r1.245 -r1.246 src/sys/nfs/nfs_vfsops.c

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



CVS commit: src/sys/arch/m68k/060sp

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:10:07 UTC 2024

Modified Files:
src/sys/arch/m68k/060sp: inetbsd.S
src/sys/arch/m68k/060sp/dist: iskeletn.s

Log Message:
s/Instrcution/Instruction/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/060sp/inetbsd.S
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/060sp/dist/iskeletn.s

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/m68k/060sp/inetbsd.S
diff -u src/sys/arch/m68k/060sp/inetbsd.S:1.4 src/sys/arch/m68k/060sp/inetbsd.S:1.5
--- src/sys/arch/m68k/060sp/inetbsd.S:1.4	Thu Nov 30 21:00:51 2000
+++ src/sys/arch/m68k/060sp/inetbsd.S	Mon May 13 00:10:06 2024
@@ -1,6 +1,6 @@
 /*
 #
-# $NetBSD: inetbsd.S,v 1.4 2000/11/30 21:00:51 scw Exp $
+# $NetBSD: inetbsd.S,v 1.5 2024/05/13 00:10:06 msaitoh Exp $
 #
 #
 # MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -83,7 +83,7 @@ ASENTRY_NOPROFILE(_060_isp_done)
 # This is an alternate exit point for the Unimplemented Integer
 # Instruction exception handler. If the instruction was a "chk2"
 # and the operand was out of bounds, then _isp_unimp() creates
-# a CHK exception stack frame from the Unimplemented Integer Instrcution
+# a CHK exception stack frame from the Unimplemented Integer Instruction
 # stack frame and branches to this routine.
 #
 */

Index: src/sys/arch/m68k/060sp/dist/iskeletn.s
diff -u src/sys/arch/m68k/060sp/dist/iskeletn.s:1.1 src/sys/arch/m68k/060sp/dist/iskeletn.s:1.2
--- src/sys/arch/m68k/060sp/dist/iskeletn.s:1.1	Fri Apr 14 20:24:39 2000
+++ src/sys/arch/m68k/060sp/dist/iskeletn.s	Mon May 13 00:10:06 2024
@@ -1,5 +1,5 @@
 #
-# $NetBSD: iskeletn.s,v 1.1 2000/04/14 20:24:39 is Exp $
+# $NetBSD: iskeletn.s,v 1.2 2024/05/13 00:10:06 msaitoh Exp $
 #
 
 #
@@ -81,7 +81,7 @@ _060_isp_done:
 # This is an alternate exit point for the Unimplemented Integer
 # Instruction exception handler. If the instruction was a "chk2"
 # and the operand was out of bounds, then _isp_unimp() creates
-# a CHK exception stack frame from the Unimplemented Integer Instrcution
+# a CHK exception stack frame from the Unimplemented Integer Instruction
 # stack frame and branches to this routine.
 #
 	global		_060_real_chk



CVS commit: src/sys/arch/m68k/060sp

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:10:07 UTC 2024

Modified Files:
src/sys/arch/m68k/060sp: inetbsd.S
src/sys/arch/m68k/060sp/dist: iskeletn.s

Log Message:
s/Instrcution/Instruction/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/060sp/inetbsd.S
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/060sp/dist/iskeletn.s

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



CVS commit: src/sys/arch/hp300/include

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:08:49 UTC 2024

Modified Files:
src/sys/arch/hp300/include: hp300spu.h

Log Message:
s/combindations/combinations/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/include/hp300spu.h

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

Modified files:

Index: src/sys/arch/hp300/include/hp300spu.h
diff -u src/sys/arch/hp300/include/hp300spu.h:1.16 src/sys/arch/hp300/include/hp300spu.h:1.17
--- src/sys/arch/hp300/include/hp300spu.h:1.16	Thu Jan 18 14:39:06 2024
+++ src/sys/arch/hp300/include/hp300spu.h	Mon May 13 00:08:49 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: hp300spu.h,v 1.16 2024/01/18 14:39:06 thorpej Exp $	*/
+/*	$NetBSD: hp300spu.h,v 1.17 2024/05/13 00:08:49 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@ extern	int mmuid;		/* MMU id */
 
 /*
  * This section associates hp300 model configurations with certain
- * combindations of CPU, MMU, and cache.
+ * combinations of CPU, MMU, and cache.
  */
 
 /*



CVS commit: src/sys/arch/hp300/include

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:08:49 UTC 2024

Modified Files:
src/sys/arch/hp300/include: hp300spu.h

Log Message:
s/combindations/combinations/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/include/hp300spu.h

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



CVS commit: src/sys

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:08:06 UTC 2024

Modified Files:
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/zaurus/zaurus: machdep.c
src/sys/dev/microcode/atmel: atmel_intersil_fw.h atmel_rfmd2958_fw.h
atmel_rfmd_fw.h

Log Message:
s/slighly/slightly/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/zaurus/zaurus/machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/atmel/atmel_intersil_fw.h \
src/sys/dev/microcode/atmel/atmel_rfmd_fw.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/atmel/atmel_rfmd2958_fw.h

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

Modified files:

Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.42 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.43
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.42	Tue Feb 20 23:36:02 2024
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c	Mon May 13 00:08:06 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: g42xxeb_machdep.c,v 1.42 2024/02/20 23:36:02 andvar Exp $ */
+/*	$NetBSD: g42xxeb_machdep.c,v 1.43 2024/05/13 00:08:06 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004, 2005  Genetec Corporation.
@@ -789,7 +789,7 @@ initarm(void *arg)
 	 * Until then we will use a handler that just panics but tells us
 	 * why.
 	 * Initialisation of the vectors will just panic on a data abort.
-	 * This just fills in a slighly better one.
+	 * This just fills in a slightly better one.
 	 */
 #ifdef	VERBOSE_INIT_ARM
 	printf("vectors ");

Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.32 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.33
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.32	Tue Feb 20 23:36:01 2024
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c	Mon May 13 00:08:06 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: npwr_fc_machdep.c,v 1.32 2024/02/20 23:36:01 andvar Exp $	*/
+/*	$NetBSD: npwr_fc_machdep.c,v 1.33 2024/05/13 00:08:06 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.32 2024/02/20 23:36:01 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.33 2024/05/13 00:08:06 msaitoh Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -686,7 +686,7 @@ initarm(void *arg)
 	 * Until then we will use a handler that just panics but tells us
 	 * why.
 	 * Initialisation of the vectors will just panic on a data abort.
-	 * This just fills in a slighly better one.
+	 * This just fills in a slightly better one.
 	 */
 #ifdef VERBOSE_INIT_ARM
 	printf("vectors ");

Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.54 src/sys/arch/zaurus/zaurus/machdep.c:1.55
--- src/sys/arch/zaurus/zaurus/machdep.c:1.54	Tue Mar  5 14:15:36 2024
+++ src/sys/arch/zaurus/zaurus/machdep.c	Mon May 13 00:08:06 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.54 2024/03/05 14:15:36 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.55 2024/05/13 00:08:06 msaitoh Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2024/03/05 14:15:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2024/05/13 00:08:06 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1090,7 +1090,7 @@ initarm(void *arg)
 	 * Until then we will use a handler that just panics but tells us
 	 * why.
 	 * Initialisation of the vectors will just panic on a data abort.
-	 * This just fills in a slighly better one.
+	 * This just fills in a slightly better one.
 	 */
 #ifdef VERBOSE_INIT_ARM
 	printf("vectors ");

Index: src/sys/dev/microcode/atmel/atmel_intersil_fw.h
diff -u src/sys/dev/microcode/atmel/atmel_intersil_fw.h:1.3 src/sys/dev/microcode/atmel/atmel_intersil_fw.h:1.4
--- src/sys/dev/microcode/atmel/atmel_intersil_fw.h:1.3	Wed Sep 10 19:23:44 2008
+++ src/sys/dev/microcode/atmel/atmel_intersil_fw.h	Mon May 13 00:08:06 2024
@@ -1,5 +1,5 @@
 /*
- * The following firmware has been taken (and reformatted slighly) from the
+ * The following firmware has been taken (and reformatted slightly) from the
  * Atmel (atmelwlandriver) driver source.
  *
  *   Target:  AT76C503 with Intersil 3861 radio
Index: src/sys/dev/microcode/atmel/atmel_rfmd_fw.h
diff -u src/sys/dev/microcode/atmel/atmel_rfmd_fw.h:1.3 src/sys/dev/microcode/atmel/atmel_rfmd_fw.h:1.4
--- src/sys/dev/microcode/atmel/atmel_rfmd_fw.h:1.3	Wed Sep 10 19:23:44 2008
+++ src/sys/dev/microcode/atmel/atmel_rfmd_fw.h	Mon May 13 00:08:

CVS commit: src/sys

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:08:06 UTC 2024

Modified Files:
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/zaurus/zaurus: machdep.c
src/sys/dev/microcode/atmel: atmel_intersil_fw.h atmel_rfmd2958_fw.h
atmel_rfmd_fw.h

Log Message:
s/slighly/slightly/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/zaurus/zaurus/machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/atmel/atmel_intersil_fw.h \
src/sys/dev/microcode/atmel/atmel_rfmd_fw.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/atmel/atmel_rfmd2958_fw.h

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



CVS commit: src/share/man/man4

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:06:05 UTC 2024

Modified Files:
src/share/man/man4: options.4

Log Message:
s/withe/with/


To generate a diff of this commit:
cvs rdiff -u -r1.529 -r1.530 src/share/man/man4/options.4

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

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.529 src/share/man/man4/options.4:1.530
--- src/share/man/man4/options.4:1.529	Sat May 11 06:50:23 2024
+++ src/share/man/man4/options.4	Mon May 13 00:06:04 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.529 2024/05/11 06:50:23 andvar Exp $
+.\"	$NetBSD: options.4,v 1.530 2024/05/13 00:06:04 msaitoh Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd September 3, 2023
+.Dd May 12, 2024
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -1294,7 +1294,7 @@ for more information.
 .It Cd options SELFRELOC
 Make the kernel able to self relocate at bootstrap, so that it can
 run whatever its load address is.
-This is intented to be used withe the
+This is intented to be used with the
 .Ic reloc
 bootstrap command documented in
 .Xr x86/boot 8 ,



CVS commit: src/share/man/man4

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:06:05 UTC 2024

Modified Files:
src/share/man/man4: options.4

Log Message:
s/withe/with/


To generate a diff of this commit:
cvs rdiff -u -r1.529 -r1.530 src/share/man/man4/options.4

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



CVS commit: src

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:01:54 UTC 2024

Modified Files:
src/lib/libc/sys: mmap.2
src/lib/libc/time: zdump.c
src/share/man/man5: elf.5
src/sys/arch/sparc/dev: vme_machdep.c
src/sys/dev/eisa: eisa.c
src/sys/dev/mca: mca_subr.c
src/sys/dev/tc: tc.c
src/sys/kern: vfs_wapbl.c
src/sys/sys: wapbl_replay.h
src/sys/ufs/ffs: fs.h

Log Message:
s/of of/of/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/lib/libc/sys/mmap.2
cvs rdiff -u -r1.62 -r1.63 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.15 -r1.16 src/share/man/man5/elf.5
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc/dev/vme_machdep.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/eisa/eisa.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/mca/mca_subr.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/tc/tc.c
cvs rdiff -u -r1.112 -r1.113 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/wapbl_replay.h
cvs rdiff -u -r1.71 -r1.72 src/sys/ufs/ffs/fs.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/libc/sys/mmap.2
diff -u src/lib/libc/sys/mmap.2:1.56 src/lib/libc/sys/mmap.2:1.57
--- src/lib/libc/sys/mmap.2:1.56	Wed Mar  1 15:11:28 2023
+++ src/lib/libc/sys/mmap.2	Mon May 13 00:01:52 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mmap.2,v 1.56 2023/03/01 15:11:28 uwe Exp $
+.\"	$NetBSD: mmap.2,v 1.57 2024/05/13 00:01:52 msaitoh Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -178,7 +178,7 @@ Synonymous with
 .Dv MAP_ANON .
 .It Dv MAP_FILE
 Mapped from a regular file or character-special device memory.
-Read accesses beyond the end of of the file or device but less
+Read accesses beyond the end of the file or device but less
 than the current page size will be zero-filled.
 Write accesses beyond the end of the file or device but less
 than the current page size will not affect the file or device.

Index: src/lib/libc/time/zdump.c
diff -u src/lib/libc/time/zdump.c:1.62 src/lib/libc/time/zdump.c:1.63
--- src/lib/libc/time/zdump.c:1.62	Sat Sep 16 18:40:26 2023
+++ src/lib/libc/time/zdump.c	Mon May 13 00:01:53 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: zdump.c,v 1.62 2023/09/16 18:40:26 christos Exp $	*/
+/*	$NetBSD: zdump.c,v 1.63 2024/05/13 00:01:53 msaitoh Exp $	*/
 /* Dump time zone data in a textual format.  */
 
 /*
@@ -8,7 +8,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: zdump.c,v 1.62 2023/09/16 18:40:26 christos Exp $");
+__RCSID("$NetBSD: zdump.c,v 1.63 2024/05/13 00:01:53 msaitoh Exp $");
 #endif /* !defined lint */
 
 #ifndef NETBSD_INSPIRED
@@ -153,7 +153,7 @@ sumsize(size_t a, size_t b)
   size_overflow();
 }
 
-/* Return the size of of the string STR, including its trailing NUL.
+/* Return the size of the string STR, including its trailing NUL.
Report an error and exit if this would exceed INDEX_MAX which means
pointer subtraction wouldn't work.  */
 static ptrdiff_t

Index: src/share/man/man5/elf.5
diff -u src/share/man/man5/elf.5:1.15 src/share/man/man5/elf.5:1.16
--- src/share/man/man5/elf.5:1.15	Mon Mar 22 18:58:32 2010
+++ src/share/man/man5/elf.5	Mon May 13 00:01:53 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: elf.5,v 1.15 2010/03/22 18:58:32 joerg Exp $
+.\"	$NetBSD: elf.5,v 1.16 2024/05/13 00:01:53 msaitoh Exp $
 .\"
 .\" Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -269,7 +269,7 @@ Section index of the associated string t
 Section index of the symbol table to which the hash table applies.
 .Pp
 .It Dv SHT_DYNAMIC
-Section index of of the string table by which entries in this section are used.
+Section index of the string table by which entries in this section are used.
 .El
 .It Fa sh_info
 Contains extra information. The interpretation depends on the type as

Index: src/sys/arch/sparc/dev/vme_machdep.c
diff -u src/sys/arch/sparc/dev/vme_machdep.c:1.77 src/sys/arch/sparc/dev/vme_machdep.c:1.78
--- src/sys/arch/sparc/dev/vme_machdep.c:1.77	Fri Dec  1 05:22:01 2023
+++ src/sys/arch/sparc/dev/vme_machdep.c	Mon May 13 00:01:53 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme_machdep.c,v 1.77 2023/12/01 05:22:01 thorpej Exp $	*/
+/*	$NetBSD: vme_machdep.c,v 1.78 2024/05/13 00:01:53 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.77 2023/12/01 05:22:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.78 2024/05/13 00:01:53 msaitoh Exp $");
 
 #include 
 #include 
@@ -196,7 +196,7 @@ vmem_t *vme_dvmamap;
  * The VME hardware on the sun4m IOMMU maps the first 8MB of 32-bit
  * VME space to the last 8MB of DVMA space and the first 1MB of
  * 24-bit VME space to the first 1MB of the last 8MB of DVMA space
- * (thus 24-bit VME space overlaps the first 1MB of of 32-bit space).
+ * (thus 24-bit VME space overlaps the

CVS commit: src

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon May 13 00:01:54 UTC 2024

Modified Files:
src/lib/libc/sys: mmap.2
src/lib/libc/time: zdump.c
src/share/man/man5: elf.5
src/sys/arch/sparc/dev: vme_machdep.c
src/sys/dev/eisa: eisa.c
src/sys/dev/mca: mca_subr.c
src/sys/dev/tc: tc.c
src/sys/kern: vfs_wapbl.c
src/sys/sys: wapbl_replay.h
src/sys/ufs/ffs: fs.h

Log Message:
s/of of/of/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/lib/libc/sys/mmap.2
cvs rdiff -u -r1.62 -r1.63 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.15 -r1.16 src/share/man/man5/elf.5
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc/dev/vme_machdep.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/eisa/eisa.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/mca/mca_subr.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/tc/tc.c
cvs rdiff -u -r1.112 -r1.113 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/wapbl_replay.h
cvs rdiff -u -r1.71 -r1.72 src/sys/ufs/ffs/fs.h

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



CVS commit: src/lib/libc/inet

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:58:18 UTC 2024

Modified Files:
src/lib/libc/inet: inet_net_pton.c

Log Message:
s/Firey/Fiery/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/inet/inet_net_pton.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/libc/inet/inet_net_pton.c
diff -u src/lib/libc/inet/inet_net_pton.c:1.6 src/lib/libc/inet/inet_net_pton.c:1.7
--- src/lib/libc/inet/inet_net_pton.c:1.6	Mon Feb  5 21:46:05 2024
+++ src/lib/libc/inet/inet_net_pton.c	Sun May 12 23:58:18 2024
@@ -20,7 +20,7 @@
 #if 0
 static const char rcsid[] = "Id: inet_net_pton.c,v 1.4.2.1 2002/08/02 02:17:21 marka Exp ";
 #else
-__RCSID("$NetBSD: inet_net_pton.c,v 1.6 2024/02/05 21:46:05 andvar Exp $");
+__RCSID("$NetBSD: inet_net_pton.c,v 1.7 2024/05/12 23:58:18 msaitoh Exp $");
 #endif
 #endif
 
@@ -150,7 +150,7 @@ inet_net_pton_ipv4(const char *src, u_ch
 			goto enoent;
 	}
 
-	/* Firey death and destruction unless we prefetched EOS. */
+	/* Fiery death and destruction unless we prefetched EOS. */
 	if (ch != '\0')
 		goto enoent;
 



CVS commit: src/lib/libc/inet

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:58:18 UTC 2024

Modified Files:
src/lib/libc/inet: inet_net_pton.c

Log Message:
s/Firey/Fiery/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/inet/inet_net_pton.c

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



CVS commit: src/include/rpcsvc

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:57:12 UTC 2024

Modified Files:
src/include/rpcsvc: yp_prot.h

Log Message:
Remove duplicated yppush.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/include/rpcsvc/yp_prot.h

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

Modified files:

Index: src/include/rpcsvc/yp_prot.h
diff -u src/include/rpcsvc/yp_prot.h:1.20 src/include/rpcsvc/yp_prot.h:1.21
--- src/include/rpcsvc/yp_prot.h:1.20	Thu Apr  2 15:30:25 2020
+++ src/include/rpcsvc/yp_prot.h	Sun May 12 23:57:11 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: yp_prot.h,v 1.20 2020/04/02 15:30:25 msaitoh Exp $	*/
+/*	$NetBSD: yp_prot.h,v 1.21 2024/05/12 23:57:11 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt 
@@ -265,7 +265,7 @@ struct ypbind_setdom {
  * 
  * Sun says:
  * "Protocol between clients (ypxfr, only) and yppush
- *  yppush speaks a protocol in the transient range, which
+ *  speaks a protocol in the transient range, which
  *  is supplied to ypxfr as a command-line parameter when it
  *  is activated by ypserv."
  * 



CVS commit: src/include/rpcsvc

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:57:12 UTC 2024

Modified Files:
src/include/rpcsvc: yp_prot.h

Log Message:
Remove duplicated yppush.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/include/rpcsvc/yp_prot.h

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



CVS commit: src

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:55:58 UTC 2024

Modified Files:
src/doc: HACKS
src/lib/libc/sys: ptrace.2
src/sbin/dump_lfs: lfs_inode.c
src/sys/netinet: dccp_tfrc.c

Log Message:
s/unitialized/uninitialized/


To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/doc/HACKS
cvs rdiff -u -r1.85 -r1.86 src/lib/libc/sys/ptrace.2
cvs rdiff -u -r1.28 -r1.29 src/sbin/dump_lfs/lfs_inode.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/dccp_tfrc.c

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

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.243 src/doc/HACKS:1.244
--- src/doc/HACKS:1.243	Sun May  5 23:08:53 2024
+++ src/doc/HACKS	Sun May 12 23:55:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.243 2024/05/05 23:08:53 riastradh Exp $
+# $NetBSD: HACKS,v 1.244 2024/05/12 23:55:57 msaitoh Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -597,7 +597,7 @@ port	vax
 	file	src/games/gomoku/Makefile : 1.12
 	descr
 		pickmove.c crashes with -O2, warns about ovi.o_intersect being
-		unitialized with -O1, works with -O0
+		uninitialized with -O1, works with -O0
 	kcah
 
 	hack	gdtoa/misc.c miscompile

Index: src/lib/libc/sys/ptrace.2
diff -u src/lib/libc/sys/ptrace.2:1.85 src/lib/libc/sys/ptrace.2:1.86
--- src/lib/libc/sys/ptrace.2:1.85	Thu May 14 13:40:49 2020
+++ src/lib/libc/sys/ptrace.2	Sun May 12 23:55:57 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ptrace.2,v 1.85 2020/05/14 13:40:49 wiz Exp $
+.\"	$NetBSD: ptrace.2,v 1.86 2024/05/12 23:55:57 msaitoh Exp $
 .\"
 .\" This file is in the public domain.
 .Dd May 14, 2020
@@ -907,7 +907,7 @@ Other components (fields) will be ignore
 The
 .Fa xs_xstate_bv
 field specifies whether component state should be set to provided
-values (when 1) or reset to unitialized (when 0).
+values (when 1) or reset to uninitialized (when 0).
 The request will fail if
 .Fa xs_xstate_bv
 is not a subset of

Index: src/sbin/dump_lfs/lfs_inode.c
diff -u src/sbin/dump_lfs/lfs_inode.c:1.28 src/sbin/dump_lfs/lfs_inode.c:1.29
--- src/sbin/dump_lfs/lfs_inode.c:1.28	Thu Oct 15 06:25:12 2015
+++ src/sbin/dump_lfs/lfs_inode.c	Sun May 12 23:55:57 2024
@@ -1,4 +1,4 @@
-/*  $NetBSD: lfs_inode.c,v 1.28 2015/10/15 06:25:12 dholland Exp $ */
+/*  $NetBSD: lfs_inode.c,v 1.29 2024/05/12 23:55:57 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
 #if 0
 static char sccsid[] = "@(#)main.c  8.6 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: lfs_inode.c,v 1.28 2015/10/15 06:25:12 dholland Exp $");
+__RCSID("$NetBSD: lfs_inode.c,v 1.29 2024/05/12 23:55:57 msaitoh Exp $");
 #endif
 #endif /* not lint */
 
@@ -230,7 +230,7 @@ lfs_bmap(struct lfs *fs, union lfs_dinod
 	int off=0;
 	char bp[MAXBSIZE];
 
-	up = UNASSIGNED;	/* XXXGCC -Wunitialized [sh3] */
+	up = UNASSIGNED;	/* XXXGCC -Wuninitialized [sh3] */
 	
 	if(lbn > 0 && lbn > lfs_lblkno(fs, lfs_dino_getsize(fs, idinode))) {
 		return UNASSIGNED;

Index: src/sys/netinet/dccp_tfrc.c
diff -u src/sys/netinet/dccp_tfrc.c:1.11 src/sys/netinet/dccp_tfrc.c:1.12
--- src/sys/netinet/dccp_tfrc.c:1.11	Mon Aug 14 03:03:48 2023
+++ src/sys/netinet/dccp_tfrc.c	Sun May 12 23:55:58 2024
@@ -1,5 +1,5 @@
 /*	$KAME: dccp_tfrc.c,v 1.16 2006/03/01 17:34:08 nishida Exp $	*/
-/*	$NetBSD: dccp_tfrc.c,v 1.11 2023/08/14 03:03:48 mrg Exp $ */
+/*	$NetBSD: dccp_tfrc.c,v 1.12 2024/05/12 23:55:58 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2003  Nils-Erik Mattsson
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.11 2023/08/14 03:03:48 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.12 2024/05/12 23:55:58 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dccp.h"
@@ -669,7 +669,7 @@ tfrc_send_packet(void *ccb, long datasiz
 
 #ifdef TFRCDEBUG
 if (cb->t_last_win_count.tv_sec == -1)
-	panic("TFRC - t_last_win_count unitialized (tfrc_send_packet)\n");
+	panic("TFRC - t_last_win_count uninitialized (tfrc_send_packet)\n");
 #endif
 t_temp = t_now;
 timersub(&t_temp, &(cb->t_last_win_count), &t_temp);



CVS commit: src

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:55:58 UTC 2024

Modified Files:
src/doc: HACKS
src/lib/libc/sys: ptrace.2
src/sbin/dump_lfs: lfs_inode.c
src/sys/netinet: dccp_tfrc.c

Log Message:
s/unitialized/uninitialized/


To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/doc/HACKS
cvs rdiff -u -r1.85 -r1.86 src/lib/libc/sys/ptrace.2
cvs rdiff -u -r1.28 -r1.29 src/sbin/dump_lfs/lfs_inode.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/dccp_tfrc.c

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



CVS commit: src/doc

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:53:45 UTC 2024

Modified Files:
src/doc: CHANGES.prev

Log Message:
s/occuring/occurring/


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/doc/CHANGES.prev

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.prev
diff -u src/doc/CHANGES.prev:1.182 src/doc/CHANGES.prev:1.183
--- src/doc/CHANGES.prev:1.182	Wed Feb  7 04:02:36 2024
+++ src/doc/CHANGES.prev	Sun May 12 23:53:45 2024
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES:			<$Revision: 1.182 $>
+LIST OF CHANGES FROM PREVIOUS RELEASES:			<$Revision: 1.183 $>
 
 
 Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -2847,7 +2847,7 @@ Changes from NetBSD 1.2 to NetBSD 1.3:
 		images.	 [cgd 19961003]
 	hp300: fix a few of outstanding bugs:
 		- Fix vector table corruption caused by clock
-		  interrupt occuring during critical section of
+		  interrupt occurring during critical section of
 		  code.
 		- Fix ITE/HIL bug which prevented booting directly
 		  into DDB on non-serial console machines.



CVS commit: src/doc

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:53:45 UTC 2024

Modified Files:
src/doc: CHANGES.prev

Log Message:
s/occuring/occurring/


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/doc/CHANGES.prev

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



CVS commit: src/common/lib/libc/rpc

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:52:58 UTC 2024

Modified Files:
src/common/lib/libc/rpc: xdr.c

Log Message:
s/descriminated/discriminated/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/rpc/xdr.c

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

Modified files:

Index: src/common/lib/libc/rpc/xdr.c
diff -u src/common/lib/libc/rpc/xdr.c:1.3 src/common/lib/libc/rpc/xdr.c:1.4
--- src/common/lib/libc/rpc/xdr.c:1.3	Sun Jun 16 16:01:44 2019
+++ src/common/lib/libc/rpc/xdr.c	Sun May 12 23:52:57 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: xdr.c,v 1.3 2019/06/16 16:01:44 christos Exp $	*/
+/*	$NetBSD: xdr.c,v 1.4 2024/05/12 23:52:57 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
 static char *sccsid = "@(#)xdr.c 1.35 87/08/12";
 static char *sccsid = "@(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: xdr.c,v 1.3 2019/06/16 16:01:44 christos Exp $");
+__RCSID("$NetBSD: xdr.c,v 1.4 2024/05/12 23:52:57 msaitoh Exp $");
 #endif
 #endif
 
@@ -674,7 +674,7 @@ xdr_netobj(XDR *xdrs, struct netobj *np)
 }
 
 /*
- * XDR a descriminated union
+ * XDR a discriminated union
  * Support routine for discriminated unions.
  * You create an array of xdrdiscrim structures, terminated with
  * an entry with a null procedure pointer.  The routine gets



CVS commit: src/common/lib/libc/rpc

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:52:58 UTC 2024

Modified Files:
src/common/lib/libc/rpc: xdr.c

Log Message:
s/descriminated/discriminated/ in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/rpc/xdr.c

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



CVS commit: src/sys/arch/x86/include

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:41:10 UTC 2024

Modified Files:
src/sys/arch/x86/include: specialreg.h

Log Message:
s/RPMQUERY/RMPQUERY/


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/arch/x86/include/specialreg.h

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

Modified files:

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.210 src/sys/arch/x86/include/specialreg.h:1.211
--- src/sys/arch/x86/include/specialreg.h:1.210	Fri Mar  8 20:29:17 2024
+++ src/sys/arch/x86/include/specialreg.h	Sun May 12 23:41:10 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.210 2024/03/08 20:29:17 rillig Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.211 2024/05/12 23:41:10 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2014-2020 The NetBSD Foundation, Inc.
@@ -1021,7 +1021,7 @@
 #define CPUID_AMD_ENCMEM_SEVES	__BIT(3)   /* SEV Encrypted State */
 #define CPUID_AMD_ENCMEM_SEV_SNP __BIT(4)  /* Secure Nested Paging */
 #define CPUID_AMD_ENCMEM_VMPL	__BIT(5)   /* Virtual Machine Privilege Lvl */
-#define CPUID_AMD_ENCMEM_RPMQUERY __BIT(6) /* RMPQUERY instruction */
+#define CPUID_AMD_ENCMEM_RMPQUERY __BIT(6) /* RMPQUERY instruction */
 #define CPUID_AMD_ENCMEM_VMPLSSS __BIT(7)  /* VMPL Secure Shadow Stack */
 #define CPUID_AMD_ENCMEM_SECTSC	__BIT(8)   /* Secure TSC */
 #define CPUID_AMD_ENCMEM_TSCAUX_V __BIT(9)  /* TSC AUX Virtualization */



CVS commit: src/sys/arch/x86/include

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:41:10 UTC 2024

Modified Files:
src/sys/arch/x86/include: specialreg.h

Log Message:
s/RPMQUERY/RMPQUERY/


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/arch/x86/include/specialreg.h

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

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:30:37 UTC 2024

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1484 -r1.1485 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1483 -r1.1484 src/sys/dev/pci/pcidevs_data.h

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

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:30:07 UTC 2024

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add some Intel Rapotr Lake graphics.


To generate a diff of this commit:
cvs rdiff -u -r1.1505 -r1.1506 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1505 src/sys/dev/pci/pcidevs:1.1506
--- src/sys/dev/pci/pcidevs:1.1505	Sun May 12 23:29:14 2024
+++ src/sys/dev/pci/pcidevs	Sun May 12 23:30:07 2024
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1505 2024/05/12 23:29:14 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1506 2024/05/12 23:30:07 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7476,6 +7476,9 @@ product INTEL RPL_IGD_6		0xa7a0	Raptor L
 product INTEL RPL_IGD_7		0xa7a1	Raptor Lake Graphics (96 or 80EU)
 product INTEL RPL_IGD_8		0xa7a8	Raptor Lake Graphics (64 or 48EU)
 product INTEL RPL_IGD_9		0xa7a9	Raptor Lake Graphics (64 or 48EU)
+product INTEL RPL_IGD_10	0xa7aa	Raptor Lake Graphics (96 or 80EU)
+product INTEL RPL_IGD_11	0xa7ac	Raptor Lake Graphics (96 or 80EU)
+product INTEL RPL_IGD_12	0xa7ad	Raptor Lake Graphics (64EU)
 product INTEL 21152		0xb152	S21152BB PCI-PCI Bridge
 product INTEL 21154		0xb154	S21152BA,S21154AE/BE PCI-PCI Bridge
 product INTEL 21555		0xb555	21555 Non-Transparent PCI-PCI Bridge



CVS commit: src/sys/dev/pci

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:30:07 UTC 2024

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add some Intel Rapotr Lake graphics.


To generate a diff of this commit:
cvs rdiff -u -r1.1505 -r1.1506 src/sys/dev/pci/pcidevs

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

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:29:14 UTC 2024

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add Phison PS5021 and PS5026.


To generate a diff of this commit:
cvs rdiff -u -r1.1504 -r1.1505 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1504 src/sys/dev/pci/pcidevs:1.1505
--- src/sys/dev/pci/pcidevs:1.1504	Sat Apr  6 09:10:11 2024
+++ src/sys/dev/pci/pcidevs	Sun May 12 23:29:14 2024
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1504 2024/04/06 09:10:11 andvar Exp $
+$NetBSD: pcidevs,v 1.1505 2024/05/12 23:29:14 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7856,8 +7856,10 @@ product PHILIPS SAA7135HL	0x7135	SAA7135
 product PHILIPS SAA7146AH	0x7146	SAA7146AH PCI Multimedia Bridge
 
 /* Phison products */
-product PHISON PS5000		0x5000 PS5000
-product PHISON PS5016		0x5016 PS5016
+product PHISON PS5000		0x5000	PS5000
+product PHISON PS5016		0x5016	PS5016
+product PHISON PS5021		0x5021	PS5021
+product PHISON PS5026		0x5026	PS5026
 
 /* NCR/Symbios Logic products */
 product SYMBIOS 810			0x0001	53c810



CVS commit: src/sys/dev/pci

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:29:14 UTC 2024

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add Phison PS5021 and PS5026.


To generate a diff of this commit:
cvs rdiff -u -r1.1504 -r1.1505 src/sys/dev/pci/pcidevs

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



CVS commit: src/usr.sbin/acpitools/acpidump

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:00:21 UTC 2024

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
s/iast/iasl/ from FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/acpitools/acpidump/acpi.c

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

Modified files:

Index: src/usr.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.55 src/usr.sbin/acpitools/acpidump/acpi.c:1.56
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.55	Tue May 24 20:50:21 2022
+++ src/usr.sbin/acpitools/acpidump/acpi.c	Sun May 12 23:00:21 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.55 2022/05/24 20:50:21 andvar Exp $ */
+/* $NetBSD: acpi.c,v 1.56 2024/05/12 23:00:21 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: acpi.c,v 1.55 2022/05/24 20:50:21 andvar Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.56 2024/05/12 23:00:21 msaitoh Exp $");
 
 #include 
 #include 
@@ -4719,7 +4719,7 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt,
 		goto out;
 	}
 	if (status != 0) {
-		fprintf(stderr, "iast exit status = %d\n", status);
+		fprintf(stderr, "iasl exit status = %d\n", status);
 	}
 
 	/* Dump iasl's output to stdout */



CVS commit: src/usr.sbin/acpitools/acpidump

2024-05-12 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Sun May 12 23:00:21 UTC 2024

Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c

Log Message:
s/iast/iasl/ from FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/acpitools/acpidump/acpi.c

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



CVS commit: src/tests/lib/libm

2024-05-12 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun May 12 21:53:26 UTC 2024

Modified Files:
src/tests/lib/libm: t_fenv.c

Log Message:
tests/lib/libm/t_fenv: Work around PR 58253.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tests/lib/libm/t_fenv.c

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/libm/t_fenv.c
diff -u src/tests/lib/libm/t_fenv.c:1.16 src/tests/lib/libm/t_fenv.c:1.17
--- src/tests/lib/libm/t_fenv.c:1.16	Mon Mar 18 16:33:54 2024
+++ src/tests/lib/libm/t_fenv.c	Sun May 12 21:53:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fenv.c,v 1.16 2024/03/18 16:33:54 martin Exp $ */
+/* $NetBSD: t_fenv.c,v 1.17 2024/05/12 21:53:26 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: t_fenv.c,v 1.16 2024/03/18 16:33:54 martin Exp $");
+__RCSID("$NetBSD: t_fenv.c,v 1.17 2024/05/12 21:53:26 riastradh Exp $");
 
 #include 
 
@@ -341,6 +341,17 @@ ATF_TC_BODY(feenableexcept, tc)
 	(int)fpgetmask(), (int)FP_X_INV);
 }
 
+/*
+ * Temporary workaround for PR 58253: powerpc has more fenv exception
+ * bits than it can handle.
+ */
+#if defined __powerpc__
+#define	FE_TRAP_EXCEPT			  \
+	(FE_DIVBYZERO|FE_INEXACT|FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW)
+#else
+#define	FE_TRAP_EXCEPT	FE_ALL_EXCEPT
+#endif
+
 ATF_TC(fetestexcept_trap);
 ATF_TC_HEAD(fetestexcept_trap, tc)
 {
@@ -353,21 +364,21 @@ ATF_TC_BODY(fetestexcept_trap, tc)
 
 	FPU_EXC_PREREQ();
 
-	fedisableexcept(FE_ALL_EXCEPT);
+	fedisableexcept(FE_TRAP_EXCEPT);
 	ATF_CHECK_EQ_MSG((except = fegetexcept()), 0,
 	"fegetexcept()=0x%x", except);
 
-	(void)fetestexcept(FE_ALL_EXCEPT);
+	(void)fetestexcept(FE_TRAP_EXCEPT);
 	ATF_CHECK_EQ_MSG((except = fegetexcept()), 0,
 	"fegetexcept()=0x%x", except);
 
-	feenableexcept(FE_ALL_EXCEPT);
-	ATF_CHECK_EQ_MSG((except = fegetexcept()), FE_ALL_EXCEPT,
-	"fegetexcept()=0x%x FE_ALL_EXCEPT=0x%x", except, FE_ALL_EXCEPT);
-
-	(void)fetestexcept(FE_ALL_EXCEPT);
-	ATF_CHECK_EQ_MSG((except = fegetexcept()), FE_ALL_EXCEPT,
-	"fegetexcept()=0x%x FE_ALL_EXCEPT=0x%x", except, FE_ALL_EXCEPT);
+	feenableexcept(FE_TRAP_EXCEPT);
+	ATF_CHECK_EQ_MSG((except = fegetexcept()), FE_TRAP_EXCEPT,
+	"fegetexcept()=0x%x FE_TRAP_EXCEPT=0x%x", except, FE_TRAP_EXCEPT);
+
+	(void)fetestexcept(FE_TRAP_EXCEPT);
+	ATF_CHECK_EQ_MSG((except = fegetexcept()), FE_TRAP_EXCEPT,
+	"fegetexcept()=0x%x FE_ALL_EXCEPT=0x%x", except, FE_TRAP_EXCEPT);
 }
 
 ATF_TP_ADD_TCS(tp)



CVS commit: src/tests/lib/libm

2024-05-12 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun May 12 21:53:26 UTC 2024

Modified Files:
src/tests/lib/libm: t_fenv.c

Log Message:
tests/lib/libm/t_fenv: Work around PR 58253.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tests/lib/libm/t_fenv.c

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



CVS commit: src/tests/lib/libm

2024-05-12 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun May 12 20:58:44 UTC 2024

Modified Files:
src/tests/lib/libm: t_hypot.c

Log Message:
t_hypot: Use an ld80 test case that actually fits in ld80.

Also add comments explaining how I generated these test cases.

(No autoconf back doors hidden in these magic numbers, I promise!  No
pythagoreans were harmed in the production of these tests either.)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_hypot.c

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



CVS commit: src/tests/lib/libm

2024-05-12 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun May 12 20:58:44 UTC 2024

Modified Files:
src/tests/lib/libm: t_hypot.c

Log Message:
t_hypot: Use an ld80 test case that actually fits in ld80.

Also add comments explaining how I generated these test cases.

(No autoconf back doors hidden in these magic numbers, I promise!  No
pythagoreans were harmed in the production of these tests either.)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_hypot.c

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/libm/t_hypot.c
diff -u src/tests/lib/libm/t_hypot.c:1.6 src/tests/lib/libm/t_hypot.c:1.7
--- src/tests/lib/libm/t_hypot.c:1.6	Sat May 11 20:51:41 2024
+++ src/tests/lib/libm/t_hypot.c	Sun May 12 20:58:44 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_hypot.c,v 1.6 2024/05/11 20:51:41 riastradh Exp $ */
+/* $NetBSD: t_hypot.c,v 1.7 2024/05/12 20:58:44 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -440,6 +440,23 @@ ATF_TC_BODY(hypotl_trivial, tc)
 	}
 }
 
+/*
+ * All primitive Pythagorean triples are generated from coprime
+ * integers m > n > 0 by Euclid's formula,
+ *
+ *	a = m^2 - n^2
+ *	b = 2 m n,
+ *	c = m^2 + n^2.
+ *
+ * We test cases with various different numbers and positions of bits,
+ * generated by this formula.
+ *
+ * If you're curious, you can recover m and n from a, b, and c by
+ *
+ *	m = sqrt((a + c)/2)
+ *	n = b/2m.
+ */
+
 __CTASSERT(FLT_MANT_DIG >= 24);
 static const struct {
 	float a, b, c;
@@ -468,7 +485,7 @@ static const struct {
 	long double a, b, c;
 } exact_casesl[] = {
 	{ 3458976450080784639, 4611968592949214720, 5764960744407842561 },
-	{ 0x1, 0x1fffep0L, 0x1fffe0001p0L },
+	{ 0x2, 0x7ffe, 0x8002 },
 #if LDBL_MANT_DIG >= 113
 	{ 973555668229277869436257492279295.L,
 	  1298074224305703705819019479072768.L,



CVS commit: src/tests/lib/libm

2024-05-12 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun May 12 20:17:57 UTC 2024

Modified Files:
src/tests/lib/libm: t_next.c

Log Message:
tests/lib/libm/t_next: Disable a test if long double is double.

This test, to verify nexttoward(x, x*(1 - LDBL_EPSILON/2)) moves in
the direction of x*(1 - LDBL_EPSILON/2), only makes sense if long
double has more precision than double -- the point of the exercise is
to verify that nexttoward moves even if the direction parameter can't
be rounded to double.  But if long double is just double, this test
makes no sense.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_next.c

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/libm/t_next.c
diff -u src/tests/lib/libm/t_next.c:1.6 src/tests/lib/libm/t_next.c:1.7
--- src/tests/lib/libm/t_next.c:1.6	Sat May 11 02:07:54 2024
+++ src/tests/lib/libm/t_next.c	Sun May 12 20:17:57 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_next.c,v 1.6 2024/05/11 02:07:54 riastradh Exp $	*/
+/*	$NetBSD: t_next.c,v 1.7 2024/05/12 20:17:57 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_next.c,v 1.6 2024/05/11 02:07:54 riastradh Exp $");
+__RCSID("$NetBSD: t_next.c,v 1.7 2024/05/12 20:17:57 riastradh Exp $");
 
 #include 
 #include 
@@ -110,10 +110,12 @@ check(const double *x, unsigned n)
 	for (i = n; i --> 1;) {
 		ATF_REQUIRE_MSG(x[i - 1] < x[i], "i=%u", i);
 
+#ifdef __HAVE_LONG_DOUBLE
 		if (isnormal(x[i])) {
 			CHECK(i, nexttoward, x[i], x[i]*(1 - LDBL_EPSILON/2),
 			x[i - 1]);
 		}
+#endif
 
 		CHECK(i, nextafter, x[i], x[i - 1], x[i - 1]);
 		CHECK(i, nexttoward, x[i], x[i - 1], x[i - 1]);



CVS commit: src/tests/lib/libm

2024-05-12 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun May 12 20:17:57 UTC 2024

Modified Files:
src/tests/lib/libm: t_next.c

Log Message:
tests/lib/libm/t_next: Disable a test if long double is double.

This test, to verify nexttoward(x, x*(1 - LDBL_EPSILON/2)) moves in
the direction of x*(1 - LDBL_EPSILON/2), only makes sense if long
double has more precision than double -- the point of the exercise is
to verify that nexttoward moves even if the direction parameter can't
be rounded to double.  But if long double is just double, this test
makes no sense.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_next.c

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



CVS commit: src/sys/arch/riscv/include

2024-05-12 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun May 12 20:04:12 UTC 2024

Modified Files:
src/sys/arch/riscv/include: fenv.h

Log Message:
riscv fenv.h: Make sure FE_* exception constants have type int.

This may not be formally required by the standard, but the values
must be representable by int since that's the type that functions
like fetestexcept and feclearexcept traffic in.  And this is less
work than changing all the printf %d users in tree.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/fenv.h

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



CVS commit: src/sys/arch/riscv/include

2024-05-12 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun May 12 20:04:12 UTC 2024

Modified Files:
src/sys/arch/riscv/include: fenv.h

Log Message:
riscv fenv.h: Make sure FE_* exception constants have type int.

This may not be formally required by the standard, but the values
must be representable by int since that's the type that functions
like fetestexcept and feclearexcept traffic in.  And this is less
work than changing all the printf %d users in tree.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/fenv.h

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

Modified files:

Index: src/sys/arch/riscv/include/fenv.h
diff -u src/sys/arch/riscv/include/fenv.h:1.4 src/sys/arch/riscv/include/fenv.h:1.5
--- src/sys/arch/riscv/include/fenv.h:1.4	Fri May 10 08:20:37 2024
+++ src/sys/arch/riscv/include/fenv.h	Sun May 12 20:04:12 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: fenv.h,v 1.4 2024/05/10 08:20:37 skrll Exp $	*/
+/*	$NetBSD: fenv.h,v 1.5 2024/05/12 20:04:12 riastradh Exp $	*/
 
 /*
  * Based on ieeefp.h written by J.T. Conklin, Apr 28, 1995
@@ -11,11 +11,11 @@
 typedef int fenv_t;		/* FPSCR */
 typedef int fexcept_t;
 
-#define	FE_INEXACT	__BIT(0)	/* Result inexact */
-#define	FE_UNDERFLOW	__BIT(1)	/* Result underflowed */
-#define	FE_OVERFLOW	__BIT(2)	/* Result overflowed */
-#define	FE_DIVBYZERO	__BIT(3)	/* divide-by-zero */
-#define	FE_INVALID	__BIT(4)	/* Result invalid */
+#define	FE_INEXACT	((int)__BIT(0))	/* Result inexact */
+#define	FE_UNDERFLOW	((int)__BIT(1))	/* Result underflowed */
+#define	FE_OVERFLOW	((int)__BIT(2))	/* Result overflowed */
+#define	FE_DIVBYZERO	((int)__BIT(3))	/* divide-by-zero */
+#define	FE_INVALID	((int)__BIT(4))	/* Result invalid */
 
 #define	FE_ALL_EXCEPT	\
 (FE_INEXACT | FE_UNDERFLOW | FE_OVERFLOW | FE_DIVBYZERO | FE_INVALID)



CVS commit: src/sys/compat/linux/common

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 19:54:48 UTC 2024

Modified Files:
src/sys/compat/linux/common: linux_misc.h

Log Message:
Add forward decl for procfs include.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/common/linux_misc.h

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

Modified files:

Index: src/sys/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.31 src/sys/compat/linux/common/linux_misc.h:1.32
--- src/sys/compat/linux/common/linux_misc.h:1.31	Sun May 12 15:50:42 2024
+++ src/sys/compat/linux/common/linux_misc.h	Sun May 12 15:54:48 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_misc.h,v 1.31 2024/05/12 19:50:42 christos Exp $	*/
+/*	$NetBSD: linux_misc.h,v 1.32 2024/05/12 19:54:48 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -174,6 +174,7 @@ __packed
 
 #ifdef _KERNEL
 __BEGIN_DECLS
+struct linux_timeval;
 int bsd_to_linux_wstat(int);
 int linux_select1(struct lwp *, register_t *, int, fd_set *, fd_set *,
 		   fd_set *, struct linux_timeval *);



CVS commit: src/sys/compat/linux/common

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 19:54:48 UTC 2024

Modified Files:
src/sys/compat/linux/common: linux_misc.h

Log Message:
Add forward decl for procfs include.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/common/linux_misc.h

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



CVS commit: src/sys/compat/linux/common

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 19:50:42 UTC 2024

Modified Files:
src/sys/compat/linux/common: linux_misc.h

Log Message:
fix whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/linux/common/linux_misc.h

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

Modified files:

Index: src/sys/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.30 src/sys/compat/linux/common/linux_misc.h:1.31
--- src/sys/compat/linux/common/linux_misc.h:1.30	Sun May 12 13:23:10 2024
+++ src/sys/compat/linux/common/linux_misc.h	Sun May 12 15:50:42 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_misc.h,v 1.30 2024/05/12 17:23:10 christos Exp $	*/
+/*	$NetBSD: linux_misc.h,v 1.31 2024/05/12 19:50:42 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -94,11 +94,11 @@ struct linux_sysinfo {
 #define	LINUX_RLIMIT_MEMLOCK	8
 #define	LINUX_RLIMIT_AS		9
 #define	LINUX_RLIMIT_LOCKS	10
-#define LINUX_RLIMIT_SIGPENDING	11
-#define LINUX_RLIMIT_MSGQUEUE	12
-#define LINUX_RLIMIT_NICE	13
-#define LINUX_RLIMIT_RTPRIO	14
-#define LINUX_RLIMIT_RTTIME	15
+#define	LINUX_RLIMIT_SIGPENDING	11
+#define	LINUX_RLIMIT_MSGQUEUE	12
+#define	LINUX_RLIMIT_NICE	13
+#define	LINUX_RLIMIT_RTPRIO	14
+#define	LINUX_RLIMIT_RTTIME	15
 #ifdef __mips__  /* XXX only mips32. On mips64, it's ~0ul */
 #define	LINUX_RLIM_INFINITY	0x7fffUL
 #define	LINUX32_RLIM_INFINITY	0x7fffU



CVS commit: src/sys/compat/linux/common

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 19:50:42 UTC 2024

Modified Files:
src/sys/compat/linux/common: linux_misc.h

Log Message:
fix whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/linux/common/linux_misc.h

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



CVS commit: src/usr.sbin/flashctl

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 19:03:55 UTC 2024

Modified Files:
src/usr.sbin/flashctl: flashctl.c

Log Message:
flashctl: fix lint's strict bool mode with Clang preprocessor

Treating the return value from the  character classification
functions as an 'int' is neither elegant nor idiomatic, but it works for
now.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/flashctl/flashctl.c

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



CVS commit: src/usr.sbin/flashctl

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 19:03:55 UTC 2024

Modified Files:
src/usr.sbin/flashctl: flashctl.c

Log Message:
flashctl: fix lint's strict bool mode with Clang preprocessor

Treating the return value from the  character classification
functions as an 'int' is neither elegant nor idiomatic, but it works for
now.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/flashctl/flashctl.c

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

Modified files:

Index: src/usr.sbin/flashctl/flashctl.c
diff -u src/usr.sbin/flashctl/flashctl.c:1.9 src/usr.sbin/flashctl/flashctl.c:1.10
--- src/usr.sbin/flashctl/flashctl.c:1.9	Sun Jan  8 16:01:49 2023
+++ src/usr.sbin/flashctl/flashctl.c	Sun May 12 19:03:55 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: flashctl.c,v 1.9 2023/01/08 16:01:49 rillig Exp $	*/
+/*	$NetBSD: flashctl.c,v 1.10 2024/05/12 19:03:55 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -32,7 +32,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: flashctl.c,v 1.9 2023/01/08 16:01:49 rillig Exp $");
+__RCSID("$NetBSD: flashctl.c,v 1.10 2024/05/12 19:03:55 rillig Exp $");
 
 #include 
 #include 
@@ -233,11 +233,11 @@ to_intmax(intmax_t *num, const char *str
 
 	errno = 0;
 	if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) {
-		if (!isxdigit((unsigned char)str[2]))
+		if (isxdigit((unsigned char)str[2]) == 0)
 			return EINVAL;
 		*num = strtoimax(str, &endptr, 16);
 	} else {
-		if (!isdigit((unsigned char)str[0]))
+		if (isdigit((unsigned char)str[0]) == 0)
 			return EINVAL;
 		*num = strtoimax(str, &endptr, 10);
 	}



CVS commit: src/usr.bin/xlint/lint2

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 19:00:10 UTC 2024

Modified Files:
src/usr.bin/xlint/lint2: Makefile

Log Message:
lint: remove redundant LINTFLAGS for lint2

The -T flag is already provided by ../Makefile.inc, along with several
other flags.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/xlint/lint2/Makefile

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/xlint/lint2/Makefile
diff -u src/usr.bin/xlint/lint2/Makefile:1.23 src/usr.bin/xlint/lint2/Makefile:1.24
--- src/usr.bin/xlint/lint2/Makefile:1.23	Fri Jan 13 19:50:00 2023
+++ src/usr.bin/xlint/lint2/Makefile	Sun May 12 19:00:10 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2023/01/13 19:50:00 rillig Exp $
+#	$NetBSD: Makefile,v 1.24 2024/05/12 19:00:10 rillig Exp $
 
 NOMAN=		# defined
 
@@ -8,7 +8,6 @@ SRCS=		main2.c hash.c read.c mem.c chk.c
 BINDIR=		/usr/libexec
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	-DIS_LINT2
-LINTFLAGS+=	-T		# strict bool mode
 
 COPTS.msg.c+=	${${ACTIVE_CC} == "clang":? -Wno-format-nonliteral :}
 



CVS commit: src/usr.bin/xlint/lint2

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 19:00:10 UTC 2024

Modified Files:
src/usr.bin/xlint/lint2: Makefile

Log Message:
lint: remove redundant LINTFLAGS for lint2

The -T flag is already provided by ../Makefile.inc, along with several
other flags.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/xlint/lint2/Makefile

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



CVS commit: src/usr.bin/xlint

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 18:49:36 UTC 2024

Modified Files:
src/usr.bin/xlint/common: lint.h
src/usr.bin/xlint/lint1: cksnprintb.c decl.c emit1.c err.c lex.c
src/usr.bin/xlint/lint2: chk.c emit2.c read.c
src/usr.bin/xlint/xlint: xlint.c

Log Message:
lint: add wrapper for  functions, for strict bool mode

When using the Clang preprocessor (with MKLLVM=yes), the preprocessor
output does not indicate which tokens come from a system header and
which tokens come from the user code.  Lint's strict bool mode relies on
this information to treat the character classification functions from
 as if their return type were bool instead of int.

These wrapper functions are only used when their argument is indeed a
'char', but not when the argument might be 'EOF or representable as an
unsigned char', such as when reading a byte from the input.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/xlint/common/lint.h
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.402 -r1.403 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.94 -r1.95 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.243 -r1.244 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.227 -r1.228 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.66 -r1.67 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/xlint/lint2/emit2.c
cvs rdiff -u -r1.91 -r1.92 src/usr.bin/xlint/lint2/read.c
cvs rdiff -u -r1.124 -r1.125 src/usr.bin/xlint/xlint/xlint.c

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/xlint/common/lint.h
diff -u src/usr.bin/xlint/common/lint.h:1.49 src/usr.bin/xlint/common/lint.h:1.50
--- src/usr.bin/xlint/common/lint.h:1.49	Sat Mar  2 09:32:18 2024
+++ src/usr.bin/xlint/common/lint.h	Sun May 12 18:49:35 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: lint.h,v 1.49 2024/03/02 09:32:18 rillig Exp $	*/
+/*	$NetBSD: lint.h,v 1.50 2024/05/12 18:49:35 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -160,4 +160,46 @@ typedef struct lint2_type type_t;
 #endif
 #endif
 
+static inline bool
+ch_isalnum(char ch)
+{
+	return isalnum((unsigned char)ch) != 0;
+}
+
+static inline bool
+ch_isalpha(char ch)
+{
+	return isalpha((unsigned char)ch) != 0;
+}
+
+static inline bool
+ch_isdigit(char ch)
+{
+	return isdigit((unsigned char)ch) != 0;
+}
+
+static inline bool
+ch_islower(char ch)
+{
+	return islower((unsigned char)ch) != 0;
+}
+
+static inline bool
+ch_isprint(char ch)
+{
+	return isprint((unsigned char)ch) != 0;
+}
+
+static inline bool
+ch_isspace(char ch)
+{
+	return isspace((unsigned char)ch) != 0;
+}
+
+static inline bool
+ch_isupper(char ch)
+{
+	return isupper((unsigned char)ch) != 0;
+}
+
 #include "externs.h"

Index: src/usr.bin/xlint/lint1/cksnprintb.c
diff -u src/usr.bin/xlint/lint1/cksnprintb.c:1.14 src/usr.bin/xlint/lint1/cksnprintb.c:1.15
--- src/usr.bin/xlint/lint1/cksnprintb.c:1.14	Fri Apr 12 05:44:38 2024
+++ src/usr.bin/xlint/lint1/cksnprintb.c	Sun May 12 18:49:36 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: cksnprintb.c,v 1.14 2024/04/12 05:44:38 rillig Exp $	*/
+/*	$NetBSD: cksnprintb.c,v 1.15 2024/05/12 18:49:36 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: cksnprintb.c,v 1.14 2024/04/12 05:44:38 rillig Exp $");
+__RCSID("$NetBSD: cksnprintb.c,v 1.15 2024/05/12 18:49:36 rillig Exp $");
 #endif
 
 #include 
@@ -86,9 +86,9 @@ check_hex_escape(const buffer *buf, quot
 		bool upper = false;
 		bool lower = false;
 		for (size_t i = it.start + 2; i < it.end; i++) {
-			if (isupper((unsigned char)buf->data[i]))
+			if (ch_isupper(buf->data[i]))
 upper = true;
-			if (islower((unsigned char)buf->data[i]))
+			if (ch_islower(buf->data[i]))
 lower = true;
 		}
 		if (upper && lower)

Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.402 src/usr.bin/xlint/lint1/decl.c:1.403
--- src/usr.bin/xlint/lint1/decl.c:1.402	Sat May  4 06:52:16 2024
+++ src/usr.bin/xlint/lint1/decl.c	Sun May 12 18:49:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.402 2024/05/04 06:52:16 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.403 2024/05/12 18:49:36 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.402 2024/05/04 06:52:16 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.403 2024/05/12 18:49:36 rillig Exp $");
 #endif
 
 #include 
@@ -1808,7 +1808,7 @@ check_extern_declaration(const sym_t *sy
 	dcs->d_redeclared_symbol == NULL &&
 	ends_with(curr_pos.p_file, ".c") &&
 	allow_c90 &&
-	!isdigit((unsigned char)sym->s_name[0]) &&	/* see mktempsym */
+	!ch_isdigit(sym->s_name[0]) &&	/* see mktempsym */
 	strcmp(sym->s_name, "main") != 0) {
 		/* missing%s header declaration for '%

CVS commit: src/usr.bin/xlint

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 18:49:36 UTC 2024

Modified Files:
src/usr.bin/xlint/common: lint.h
src/usr.bin/xlint/lint1: cksnprintb.c decl.c emit1.c err.c lex.c
src/usr.bin/xlint/lint2: chk.c emit2.c read.c
src/usr.bin/xlint/xlint: xlint.c

Log Message:
lint: add wrapper for  functions, for strict bool mode

When using the Clang preprocessor (with MKLLVM=yes), the preprocessor
output does not indicate which tokens come from a system header and
which tokens come from the user code.  Lint's strict bool mode relies on
this information to treat the character classification functions from
 as if their return type were bool instead of int.

These wrapper functions are only used when their argument is indeed a
'char', but not when the argument might be 'EOF or representable as an
unsigned char', such as when reading a byte from the input.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/xlint/common/lint.h
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.402 -r1.403 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.94 -r1.95 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.243 -r1.244 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.227 -r1.228 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.66 -r1.67 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/xlint/lint2/emit2.c
cvs rdiff -u -r1.91 -r1.92 src/usr.bin/xlint/lint2/read.c
cvs rdiff -u -r1.124 -r1.125 src/usr.bin/xlint/xlint/xlint.c

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



CVS commit: src/sbin/cgdconfig

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 18:02:16 UTC 2024

Modified Files:
src/sbin/cgdconfig: Makefile cgdconfig.8 cgdconfig.c params.c params.h

Log Message:
PR/58212: Malte Dehling: Add zfs verification method


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/cgdconfig/Makefile
cvs rdiff -u -r1.57 -r1.58 src/sbin/cgdconfig/cgdconfig.8
cvs rdiff -u -r1.62 -r1.63 src/sbin/cgdconfig/cgdconfig.c
cvs rdiff -u -r1.34 -r1.35 src/sbin/cgdconfig/params.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/cgdconfig/params.h

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

Modified files:

Index: src/sbin/cgdconfig/Makefile
diff -u src/sbin/cgdconfig/Makefile:1.22 src/sbin/cgdconfig/Makefile:1.23
--- src/sbin/cgdconfig/Makefile:1.22	Fri Aug 12 06:49:17 2022
+++ src/sbin/cgdconfig/Makefile	Sun May 12 14:02:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/08/12 10:49:17 riastradh Exp $
+# $NetBSD: Makefile,v 1.23 2024/05/12 18:02:16 christos Exp $
 
 RUMPPRG=cgdconfig
 MAN=	cgdconfig.8
@@ -29,4 +29,19 @@ ARGON2_NO_THREADS=1
 .include "${NETBSDSRCDIR}/external/apache2/argon2/lib/libargon2/Makefile.inc"
 .endif
 
+.if ${MKZFS} != "no"
+CPPFLAGS+=	-DHAVE_ZFS
+
+OSNET=${NETBSDSRCDIR}/external/cddl/osnet
+CPPFLAGS.cgdconfig.c+=	-I${OSNET}/include
+CPPFLAGS.cgdconfig.c+=	-I${OSNET}/sys
+CPPFLAGS.cgdconfig.c+=	-I${OSNET}/dist/head
+CPPFLAGS.cgdconfig.c+=	-I${OSNET}/dist/lib/libzpool/common
+CPPFLAGS.cgdconfig.c+=	-I${OSNET}/dist/uts/common
+CPPFLAGS.cgdconfig.c+=	-I${OSNET}/dist/uts/common/fs/zfs
+
+COPTS.cgdconfig.c+=	-Wno-unknown-pragmas
+COPTS.cgdconfig.c+=	-Wno-strict-prototypes
+.endif
+
 .include 

Index: src/sbin/cgdconfig/cgdconfig.8
diff -u src/sbin/cgdconfig/cgdconfig.8:1.57 src/sbin/cgdconfig/cgdconfig.8:1.58
--- src/sbin/cgdconfig/cgdconfig.8:1.57	Fri Aug 12 06:49:47 2022
+++ src/sbin/cgdconfig/cgdconfig.8	Sun May 12 14:02:16 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: cgdconfig.8,v 1.57 2022/08/12 10:49:47 riastradh Exp $
+.\" $NetBSD: cgdconfig.8,v 1.58 2024/05/12 18:02:16 christos Exp $
 .\"
 .\" Copyright (c) 2002, The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 4, 2021
+.Dd May 12, 2024
 .Dt CGDCONFIG 8
 .Os
 .Sh NAME
@@ -270,6 +270,8 @@ scan for a valid Master Boot Record.
 scan for a valid GUID partition table.
 .It ffs
 scan for a valid FFS file system.
+.It zfs
+scan for a valid ZFS vdev label (if compiled with MKZFS).
 .It re-enter
 prompt for passphrase twice, and ensure entered passphrases are
 identical.

Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.62 src/sbin/cgdconfig/cgdconfig.c:1.63
--- src/sbin/cgdconfig/cgdconfig.c:1.62	Sun Apr 28 20:28:18 2024
+++ src/sbin/cgdconfig/cgdconfig.c	Sun May 12 14:02:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.62 2024/04/29 00:28:18 riastradh Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.63 2024/05/12 18:02:16 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2002, 2003\
  The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.62 2024/04/29 00:28:18 riastradh Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.63 2024/05/12 18:02:16 christos Exp $");
 #endif
 
 #ifdef HAVE_ARGON2
@@ -73,6 +73,11 @@ __RCSID("$NetBSD: cgdconfig.c,v 1.62 202
 
 #include 
 
+#ifdef HAVE_ZFS
+#include 
+#include 
+#endif
+
 #include "params.h"
 #include "pkcs5_pbkdf2.h"
 #include "utils.h"
@@ -98,11 +103,11 @@ enum action {
 
 /* if nflag is set, do not configure/unconfigure the cgd's */
 
-int	nflag = 0;
+static int	nflag = 0;
 
 /* if Sflag is set, generate shared keys */
 
-int	Sflag = 0;
+static int	Sflag = 0;
 
 /* if pflag is set to PFLAG_STDIN read from stdin rather than getpass(3) */
 
@@ -110,7 +115,7 @@ int	Sflag = 0;
 #define	PFLAG_GETPASS_ECHO	0x02
 #define	PFLAG_GETPASS_MASK	0x03
 #define	PFLAG_STDIN		0x04
-int	pflag = PFLAG_GETPASS;
+static int	pflag = PFLAG_GETPASS;
 
 /*
  * When configuring all cgds, save a cache of shared keys for key
@@ -127,7 +132,7 @@ struct sharedkey {
 	SLIST_ENTRY(sharedkey)	 used;
 	int			 verified;
 };
-LIST_HEAD(, sharedkey) sharedkeys;
+static LIST_HEAD(, sharedkey) sharedkeys;
 SLIST_HEAD(sharedkeyhits, sharedkey);
 
 static int	configure(int, char **, struct params *, int);
@@ -170,11 +175,14 @@ static int	 verify_ffs(int);
 static int	 verify_reenter(struct params *);
 static int	 verify_mbr(int);
 static int	 verify_gpt(int);
+#ifdef HAVE_ZFS
+static int	 verify_zfs(int);
+#endif
 
 __dead static void	 usage(void);
 
 /* Verbose Framework */
-unsigned	verbose = 0;
+static unsigned	verbose = 0;
 
 #define VERBOSE(x,y)	if (verbose >= x) y
 #define VPRINTF(x,y)	if (verbose >= x) (void)printf y
@@ -636,12 +644,12 @@ getkey_a

CVS commit: src/sbin/cgdconfig

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 18:02:16 UTC 2024

Modified Files:
src/sbin/cgdconfig: Makefile cgdconfig.8 cgdconfig.c params.c params.h

Log Message:
PR/58212: Malte Dehling: Add zfs verification method


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/cgdconfig/Makefile
cvs rdiff -u -r1.57 -r1.58 src/sbin/cgdconfig/cgdconfig.8
cvs rdiff -u -r1.62 -r1.63 src/sbin/cgdconfig/cgdconfig.c
cvs rdiff -u -r1.34 -r1.35 src/sbin/cgdconfig/params.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/cgdconfig/params.h

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



CVS commit: src/usr.bin/xlint

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 18:00:59 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: externs1.h main1.c
src/usr.bin/xlint/xlint: xlint.c

Log Message:
lint: remove unused flag '-u' from lint1

This flag is completely handled by lint2.


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/xlint/lint1/main1.c
cvs rdiff -u -r1.123 -r1.124 src/usr.bin/xlint/xlint/xlint.c

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/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.228 src/usr.bin/xlint/lint1/externs1.h:1.229
--- src/usr.bin/xlint/lint1/externs1.h:1.228	Sun May 12 12:28:34 2024
+++ src/usr.bin/xlint/lint1/externs1.h	Sun May 12 18:00:58 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: externs1.h,v 1.228 2024/05/12 12:28:34 rillig Exp $	*/
+/*	$NetBSD: externs1.h,v 1.229 2024/05/12 18:00:58 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -46,7 +46,6 @@ extern bool eflag;
 extern bool hflag;
 extern bool pflag;
 extern bool rflag;
-extern bool uflag;
 extern bool vflag;
 extern bool wflag;
 extern bool yflag;

Index: src/usr.bin/xlint/lint1/main1.c
diff -u src/usr.bin/xlint/lint1/main1.c:1.82 src/usr.bin/xlint/lint1/main1.c:1.83
--- src/usr.bin/xlint/lint1/main1.c:1.82	Sat Feb  3 19:37:02 2024
+++ src/usr.bin/xlint/lint1/main1.c	Sun May 12 18:00:58 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: main1.c,v 1.82 2024/02/03 19:37:02 rillig Exp $	*/
+/*	$NetBSD: main1.c,v 1.83 2024/05/12 18:00:58 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: main1.c,v 1.82 2024/02/03 19:37:02 rillig Exp $");
+__RCSID("$NetBSD: main1.c,v 1.83 2024/05/12 18:00:58 rillig Exp $");
 #endif
 
 #include 
@@ -60,7 +60,6 @@ bool Pflag;
 bool pflag;
 bool rflag;
 bool Tflag;
-bool uflag;
 bool vflag;
 bool wflag;
 bool yflag;
@@ -138,7 +137,7 @@ main(int argc, char *argv[])
 	setlocale(LC_ALL, "");
 	setprogname(argv[0]);
 
-	while ((c = getopt(argc, argv, "abceghpq:rstuvwyzA:FPR:STX:")) != -1) {
+	while ((c = getopt(argc, argv, "abceghpq:rstvwyzA:FPR:STX:")) != -1) {
 		switch (c) {
 		case 'a':	aflag++;	break;
 		case 'b':	bflag = true;	break;
@@ -173,7 +172,6 @@ main(int argc, char *argv[])
 			allow_c11 = false;
 			allow_c23 = false;
 			break;
-		case 'u':	uflag = true;	break;
 		case 'w':	wflag = true;	break;
 		case 'v':	vflag = true;	break;
 		case 'y':	yflag = true;	break;
@@ -262,7 +260,7 @@ static void __dead
 usage(void)
 {
 	(void)fprintf(stderr,
-	"usage: %s [-abceghmprstuvwyzFPST] [-Alevel] [-ddirectory] "
+	"usage: %s [-abceghmprstvwyzFPST] [-Alevel] [-d directory] "
 	"[-R old=new]\n"
 	"   %*s [-X id,...] [-q id,...] src dest\n",
 	getprogname(), (int)strlen(getprogname()), "");

Index: src/usr.bin/xlint/xlint/xlint.c
diff -u src/usr.bin/xlint/xlint/xlint.c:1.123 src/usr.bin/xlint/xlint/xlint.c:1.124
--- src/usr.bin/xlint/xlint/xlint.c:1.123	Sat Mar  2 09:32:19 2024
+++ src/usr.bin/xlint/xlint/xlint.c	Sun May 12 18:00:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.123 2024/03/02 09:32:19 rillig Exp $ */
+/* $NetBSD: xlint.c,v 1.124 2024/05/12 18:00:59 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: xlint.c,v 1.123 2024/03/02 09:32:19 rillig Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.124 2024/05/12 18:00:59 rillig Exp $");
 #endif
 
 #include 
@@ -617,7 +617,6 @@ main(int argc, char *argv[])
 		case 'F':
 			Fflag = true;
 			/* FALLTHROUGH */
-		case 'u':
 		case 'h':
 			list_add_flag(&lint1.flags, c);
 			list_add_flag(&lint2.flags, c);
@@ -684,6 +683,7 @@ main(int argc, char *argv[])
 			break;
 #endif
 
+		case 'u':
 		case 'x':
 		case 'H':
 			list_add_flag(&lint2.flags, c);



CVS commit: src/usr.bin/xlint

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 18:00:59 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: externs1.h main1.c
src/usr.bin/xlint/xlint: xlint.c

Log Message:
lint: remove unused flag '-u' from lint1

This flag is completely handled by lint2.


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/xlint/lint1/main1.c
cvs rdiff -u -r1.123 -r1.124 src/usr.bin/xlint/xlint/xlint.c

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



CVS commit: src

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 17:55:37 UTC 2024

Modified Files:
src/bin: Makefile.inc
src/sbin: Makefile.inc
src/usr.bin: Makefile.inc
src/usr.sbin: Makefile.inc

Log Message:
lint: suppress "used but not defined" for bin, sbin, usr.bin, usr.sbin

These diagnostics are emitted by lint2, and like all diagnostics from
lint2, they don't affect the exit status.

In libc, lint cannot handle the renamings from namespace.h, generating
many false positive diagnostics since 'libc_function' is used but
'_libc_function' is defined. Until this situation is handled properly,
suppress this diagnostic.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/bin/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/sbin/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/Makefile.inc

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

Modified files:

Index: src/bin/Makefile.inc
diff -u src/bin/Makefile.inc:1.19 src/bin/Makefile.inc:1.20
--- src/bin/Makefile.inc:1.19	Sat Apr 20 13:24:48 2024
+++ src/bin/Makefile.inc	Sun May 12 17:55:36 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.19 2024/04/20 13:24:48 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.20 2024/05/12 17:55:36 rillig Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 
 .include 		# for MKDYNAMICROOT definition
@@ -6,6 +6,8 @@
 WARNS?=		5
 BINDIR?=	/bin
 
+LINTFLAGS+=	-u	# don't warn about "used but not defined"
+
 .if (${MKDYNAMICROOT} == "no")
 LDSTATIC?=	-static
 .endif

Index: src/sbin/Makefile.inc
diff -u src/sbin/Makefile.inc:1.24 src/sbin/Makefile.inc:1.25
--- src/sbin/Makefile.inc:1.24	Sat Apr 20 13:24:48 2024
+++ src/sbin/Makefile.inc	Sun May 12 17:55:36 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.24 2024/04/20 13:24:48 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.25 2024/05/12 17:55:36 rillig Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/8/93
 
 .include 		# for MKDYNAMICROOT definition
@@ -6,6 +6,8 @@
 WARNS?=		5
 BINDIR?=	/sbin
 
+LINTFLAGS+=	-u	# don't warn about "used but not defined"
+
 .if (${MKDYNAMICROOT} == "no")
 LDSTATIC?=	-static
 .endif

Index: src/usr.bin/Makefile.inc
diff -u src/usr.bin/Makefile.inc:1.12 src/usr.bin/Makefile.inc:1.13
--- src/usr.bin/Makefile.inc:1.12	Sat Apr 20 13:24:49 2024
+++ src/usr.bin/Makefile.inc	Sun May 12 17:55:37 2024
@@ -1,9 +1,11 @@
-#	$NetBSD: Makefile.inc,v 1.12 2024/04/20 13:24:49 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.13 2024/05/12 17:55:37 rillig Exp $
 #	from: @(#)Makefile.inc	8.1 (Berkeley) 6/6/93
 
 WARNS?=	5
 BINDIR?=/usr/bin
 
+LINTFLAGS+=	-u	# don't warn about "used but not defined"
+
 .include 
 .if ${MKLINT} != "no" && !defined(NOLINT)
 realall: lint

Index: src/usr.sbin/Makefile.inc
diff -u src/usr.sbin/Makefile.inc:1.9 src/usr.sbin/Makefile.inc:1.10
--- src/usr.sbin/Makefile.inc:1.9	Sat Apr 20 13:24:49 2024
+++ src/usr.sbin/Makefile.inc	Sun May 12 17:55:37 2024
@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile.inc,v 1.9 2024/04/20 13:24:49 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.10 2024/05/12 17:55:37 rillig Exp $
 #	from: @(#)Makefile.inc	8.1 (Berkeley) 6/6/93
 
 BINDIR?=	/usr/sbin
 WARNS?=		4
 CPPFLAGS+=	-D_KERNTYPES
 
+LINTFLAGS+=	-u	# don't warn about "used but not defined"
+
 .include 
 .if ${MKLINT} != "no" && !defined(NOLINT)
 realall: lint



CVS commit: src

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 17:55:37 UTC 2024

Modified Files:
src/bin: Makefile.inc
src/sbin: Makefile.inc
src/usr.bin: Makefile.inc
src/usr.sbin: Makefile.inc

Log Message:
lint: suppress "used but not defined" for bin, sbin, usr.bin, usr.sbin

These diagnostics are emitted by lint2, and like all diagnostics from
lint2, they don't affect the exit status.

In libc, lint cannot handle the renamings from namespace.h, generating
many false positive diagnostics since 'libc_function' is used but
'_libc_function' is defined. Until this situation is handled properly,
suppress this diagnostic.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/bin/Makefile.inc
cvs rdiff -u -r1.24 -r1.25 src/sbin/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/Makefile.inc

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



CVS commit: src/sys/miscfs/procfs

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:26:51 UTC 2024

Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_linux.c procfs_subr.c
procfs_vfsops.c procfs_vnops.c

Log Message:
PR/58227: Ricardo Branco: Add support for proc/sysvipc in Linux emulator


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.87 -r1.88 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.118 -r1.119 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.115 -r1.116 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.231 -r1.232 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs.h
diff -u src/sys/miscfs/procfs/procfs.h:1.85 src/sys/miscfs/procfs/procfs.h:1.86
--- src/sys/miscfs/procfs/procfs.h:1.85	Sun May 12 13:22:29 2024
+++ src/sys/miscfs/procfs/procfs.h	Sun May 12 13:26:50 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs.h,v 1.85 2024/05/12 17:22:29 christos Exp $	*/
+/*	$NetBSD: procfs.h,v 1.86 2024/05/12 17:26:50 christos Exp $	*/
 
 /*
  * Copyright (c) 1993
@@ -112,7 +112,11 @@ typedef enum {
 	PFSstat,	/* process status (if -o linux) */
 	PFSstatm,	/* process memory info (if -o linux) */
 	PFSstatus,	/* process status */
-	PFStask,	/* task subdirector (if -o linux) */
+	PFSsysvipc,	/* sysvipc subdirectory (if -o linux) */
+	PFSsysvipc_msg,	/* sysvipc msg info (if -o linux) */
+	PFSsysvipc_sem,	/* sysvipc sem info (if -o linux) */
+	PFSsysvipc_shm,	/* sysvipc shm info (if -o linux) */
+	PFStask,	/* task subdirectory (if -o linux) */
 	PFSuptime,	/* elapsed time since (if -o linux) */
 	PFSversion,	/* kernel version (if -o linux) */
 #ifdef __HAVE_PROCFS_MACHDEP
@@ -272,6 +276,12 @@ int procfs_dolimit(struct lwp *, struct 
 struct uio *);
 int procfs_dolimits(struct lwp *, struct proc *, struct pfsnode *,
 struct uio *);
+int procfs_dosysvipc_msg(struct lwp *, struct proc *, struct pfsnode *,
+struct uio *);
+int procfs_dosysvipc_sem(struct lwp *, struct proc *, struct pfsnode *,
+struct uio *);
+int procfs_dosysvipc_shm(struct lwp *, struct proc *, struct pfsnode *,
+struct uio *);
 
 void procfs_hashrem(struct pfsnode *);
 int procfs_getfp(struct pfsnode *, struct proc *, struct file **);

Index: src/sys/miscfs/procfs/procfs_linux.c
diff -u src/sys/miscfs/procfs/procfs_linux.c:1.87 src/sys/miscfs/procfs/procfs_linux.c:1.88
--- src/sys/miscfs/procfs/procfs_linux.c:1.87	Sat Sep  5 12:30:12 2020
+++ src/sys/miscfs/procfs/procfs_linux.c	Sun May 12 13:26:50 2024
@@ -1,4 +1,4 @@
-/*  $NetBSD: procfs_linux.c,v 1.87 2020/09/05 16:30:12 riastradh Exp $  */
+/*  $NetBSD: procfs_linux.c,v 1.88 2024/05/12 17:26:50 christos Exp $  */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.87 2020/09/05 16:30:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.88 2024/05/12 17:26:50 christos Exp $");
+
+#if defined(_KERNEL_OPT)
+#include "opt_sysv.h"
+#endif
 
 #include 
 #include 
@@ -58,6 +62,15 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_linux
 #include 
 #include 
 #include 
+#ifdef SYSVMSG
+#include 
+#endif
+#ifdef SYSVSEM
+#include 
+#endif
+#ifdef SYSVSHM
+#include 
+#endif
 
 #include 
 
@@ -746,3 +759,141 @@ out:
 	sysctl_unlock();
 	return error;
 }
+
+int
+procfs_dosysvipc_msg(struct lwp *curl, struct proc *p,
+struct pfsnode *pfs, struct uio *uio)
+{
+	char *bf;
+	int offset = 0;
+	int error = EFBIG;
+
+	bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
+
+	offset += snprintf(bf, LBFSZ,
+	"%10s %10s %4s  %10s %10s %5s %5s %5s %5s %5s %5s %10s %10s %10s\n",
+	"key", "msqid", "perms", "cbytes", "qnum", "lspid", "lrpid",
+	"uid", "gid", "cuid", "cgid", "stime", "rtime", "ctime");
+	if (offset >= LBFSZ)
+		goto out;
+
+#ifdef SYSVMSG
+	for (int id = 0; id < msginfo.msgmni; id++)
+		if (msqs[id].msq_u.msg_qbytes > 0) {
+			offset += snprintf(&bf[offset], LBFSZ - offset,
+			"%10d %10d  %4o  %10zu %10lu %5u %5u %5u %5u %5u %5u %10lld %10lld %10lld\n",
+			(int) msqs[id].msq_u.msg_perm._key,
+			IXSEQ_TO_IPCID(id, msqs[id].msq_u.msg_perm),
+			msqs[id].msq_u.msg_perm.mode,
+			msqs[id].msq_u._msg_cbytes,
+			msqs[id].msq_u.msg_qnum,
+			msqs[id].msq_u.msg_lspid,
+			msqs[id].msq_u.msg_lrpid,
+			msqs[id].msq_u.msg_perm.uid,
+			msqs[id].msq_u.msg_perm.gid,
+			msqs[id].msq_u.msg_perm.cuid,
+			msqs[id].msq_u.msg_perm.cgid,
+			(long long)msqs[id].msq_u.msg_stime,
+			(long long)msqs[id].msq_u.msg_rtime,
+			(long long)msqs[id].msq_u.msg_ctime);
+			if (offset >= LBFSZ)
+goto out;
+		}
+#endif
+
+	error = uiomove_frombuf(bf, offset, uio);
+out:
+	free(bf, M_TEMP);
+	return error;
+}
+
+int
+procfs_dosysvipc_sem(struct lwp *curl, struct proc *p,
+struct pfsnode *pfs, struct uio *ui

CVS commit: src/sys/miscfs/procfs

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:26:51 UTC 2024

Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_linux.c procfs_subr.c
procfs_vfsops.c procfs_vnops.c

Log Message:
PR/58227: Ricardo Branco: Add support for proc/sysvipc in Linux emulator


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.87 -r1.88 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.118 -r1.119 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.115 -r1.116 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.231 -r1.232 src/sys/miscfs/procfs/procfs_vnops.c

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



CVS commit: src/sys/compat/linux/common

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:23:10 UTC 2024

Modified Files:
src/sys/compat/linux/common: linux_limit.h linux_misc.h

Log Message:
PR/58240: Ricardo Branco: Add missing limits


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/common/linux_limit.h
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/linux/common/linux_misc.h

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

Modified files:

Index: src/sys/compat/linux/common/linux_limit.h
diff -u src/sys/compat/linux/common/linux_limit.h:1.8 src/sys/compat/linux/common/linux_limit.h:1.9
--- src/sys/compat/linux/common/linux_limit.h:1.8	Wed Dec  1 23:29:48 2021
+++ src/sys/compat/linux/common/linux_limit.h	Sun May 12 13:23:10 2024
@@ -1,4 +1,4 @@
-/* 	$NetBSD: linux_limit.h,v 1.8 2021/12/02 04:29:48 ryo Exp $ */
+/* 	$NetBSD: linux_limit.h,v 1.9 2024/05/12 17:23:10 christos Exp $ */
 
 /*-
  * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -94,6 +94,11 @@ linux_to_bsd_limit(int lim)
 	case LINUX_RLIMIT_AS:
 		return RLIMIT_AS;
 	case LINUX_RLIMIT_LOCKS:
+	case LINUX_RLIMIT_SIGPENDING:
+	case LINUX_RLIMIT_MSGQUEUE:
+	case LINUX_RLIMIT_NICE:
+	case LINUX_RLIMIT_RTPRIO:
+	case LINUX_RLIMIT_RTTIME:
 		return -EOPNOTSUPP;
 	default:
 		return -EINVAL;

Index: src/sys/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.29 src/sys/compat/linux/common/linux_misc.h:1.30
--- src/sys/compat/linux/common/linux_misc.h:1.29	Fri Aug 18 15:41:19 2023
+++ src/sys/compat/linux/common/linux_misc.h	Sun May 12 13:23:10 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_misc.h,v 1.29 2023/08/18 19:41:19 christos Exp $	*/
+/*	$NetBSD: linux_misc.h,v 1.30 2024/05/12 17:23:10 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -94,6 +94,11 @@ struct linux_sysinfo {
 #define	LINUX_RLIMIT_MEMLOCK	8
 #define	LINUX_RLIMIT_AS		9
 #define	LINUX_RLIMIT_LOCKS	10
+#define LINUX_RLIMIT_SIGPENDING	11
+#define LINUX_RLIMIT_MSGQUEUE	12
+#define LINUX_RLIMIT_NICE	13
+#define LINUX_RLIMIT_RTPRIO	14
+#define LINUX_RLIMIT_RTTIME	15
 #ifdef __mips__  /* XXX only mips32. On mips64, it's ~0ul */
 #define	LINUX_RLIM_INFINITY	0x7fffUL
 #define	LINUX32_RLIM_INFINITY	0x7fffU



CVS commit: src/sys/compat/linux/common

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:23:10 UTC 2024

Modified Files:
src/sys/compat/linux/common: linux_limit.h linux_misc.h

Log Message:
PR/58240: Ricardo Branco: Add missing limits


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/common/linux_limit.h
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/linux/common/linux_misc.h

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



CVS commit: src/sys/miscfs/procfs

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:22:29 UTC 2024

Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_limit.c procfs_subr.c
procfs_vfsops.c procfs_vnops.c

Log Message:
PR/58240: Ricardo Branco: Add support for proc/self/limits as used by Linux


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.4 -r1.5 src/sys/miscfs/procfs/procfs_limit.c
cvs rdiff -u -r1.117 -r1.118 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.114 -r1.115 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.230 -r1.231 src/sys/miscfs/procfs/procfs_vnops.c

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



CVS commit: src/sys/miscfs/procfs

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:22:29 UTC 2024

Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_limit.c procfs_subr.c
procfs_vfsops.c procfs_vnops.c

Log Message:
PR/58240: Ricardo Branco: Add support for proc/self/limits as used by Linux


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.4 -r1.5 src/sys/miscfs/procfs/procfs_limit.c
cvs rdiff -u -r1.117 -r1.118 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.114 -r1.115 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.230 -r1.231 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs.h
diff -u src/sys/miscfs/procfs/procfs.h:1.84 src/sys/miscfs/procfs/procfs.h:1.85
--- src/sys/miscfs/procfs/procfs.h:1.84	Wed Jan 17 05:20:12 2024
+++ src/sys/miscfs/procfs/procfs.h	Sun May 12 13:22:29 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs.h,v 1.84 2024/01/17 10:20:12 hannken Exp $	*/
+/*	$NetBSD: procfs.h,v 1.85 2024/05/12 17:22:29 christos Exp $	*/
 
 /*
  * Copyright (c) 1993
@@ -97,6 +97,7 @@ typedef enum {
 	PFSfpregs,	/* the process's FP register set */
 	PFSloadavg,	/* load average (if -o linux) */
 	PFSlimit,	/* resource limits */
+	PFSlimits,	/* resource limits, Linux style (if -o linux) */
 	PFSmap,		/* memory map */
 	PFSmaps,	/* memory map, Linux style (if -o linux) */
 	PFSmem,		/* the process's memory image */
@@ -269,6 +270,8 @@ int procfs_doauxv(struct lwp *, struct p
 struct uio *);
 int procfs_dolimit(struct lwp *, struct proc *, struct pfsnode *,
 struct uio *);
+int procfs_dolimits(struct lwp *, struct proc *, struct pfsnode *,
+struct uio *);
 
 void procfs_hashrem(struct pfsnode *);
 int procfs_getfp(struct pfsnode *, struct proc *, struct file **);

Index: src/sys/miscfs/procfs/procfs_limit.c
diff -u src/sys/miscfs/procfs/procfs_limit.c:1.4 src/sys/miscfs/procfs/procfs_limit.c:1.5
--- src/sys/miscfs/procfs/procfs_limit.c:1.4	Sat May 23 19:42:43 2020
+++ src/sys/miscfs/procfs/procfs_limit.c	Sun May 12 13:22:29 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_limit.c,v 1.4 2020/05/23 23:42:43 ad Exp $	*/
+/*	$NetBSD: procfs_limit.c,v 1.5 2024/05/12 17:22:29 christos Exp $	*/
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: procfs_limit.c,v 1.4 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_limit.c,v 1.5 2024/05/12 17:22:29 christos Exp $");
+
+#if defined(_KERNEL_OPT)
+#include "opt_sysv.h"
+#endif
 
 #include 
 #include 
@@ -38,8 +42,35 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_limit
 #include 
 #include 
 #include 
-
-#define MAXBUFFERSIZE (256 * 1024)
+#include 
+#ifdef SYSVMSG
+#include 
+#endif
+
+/* Taken from FreeBSD sys/compat/linprocfs/linprocfs.c */
+static const struct linux_rlimit_ident {
+	const char  *desc;
+	const char  *unit;
+	unsigned intrlim_id;
+} linux_rlimits_ident[] = {
+	{ "Max cpu time",	"seconds",	RLIMIT_CPU },
+	{ "Max file size",	"bytes",	RLIMIT_FSIZE },
+	{ "Max data size",	"bytes",	RLIMIT_DATA },
+	{ "Max stack size",	"bytes",	RLIMIT_STACK },
+	{ "Max core file size",	"bytes",	RLIMIT_CORE },
+	{ "Max resident set",	"bytes",	RLIMIT_RSS },
+	{ "Max processes",	"processes",	RLIMIT_NPROC },
+	{ "Max open files",	"files",	RLIMIT_NOFILE },
+	{ "Max locked memory",	"bytes",	RLIMIT_MEMLOCK },
+	{ "Max address space",	"bytes",	RLIMIT_AS },
+	{ "Max file locks",	"locks",	LINUX_RLIMIT_LOCKS },
+	{ "Max pending signals", "signals",	LINUX_RLIMIT_SIGPENDING },
+	{ "Max msgqueue size",	"bytes",	LINUX_RLIMIT_MSGQUEUE },
+	{ "Max nice priority",	"",		LINUX_RLIMIT_NICE },
+	{ "Max realtime priority", "",		LINUX_RLIMIT_RTPRIO },
+	{ "Max realtime timeout", "us",		LINUX_RLIMIT_RTTIME },
+	{ 0, 0, 0 }
+};
 
 static size_t
 prl(char *buf, size_t len, intmax_t lim, char sep)
@@ -92,3 +123,72 @@ procfs_dolimit(struct lwp *curl, struct 
 
 	return error;
 }
+
+int
+procfs_dolimits(struct lwp *curl, struct proc *p, struct pfsnode *pfs,
+ struct uio *uio)
+{
+	const struct linux_rlimit_ident *li;
+	int error;
+	char *buffer;
+	size_t bufsize, pos;
+	struct rlimit rl, rlimits[RLIM_NLIMITS];
+
+	if (uio->uio_rw != UIO_READ)
+		return EOPNOTSUPP;
+
+	mutex_enter(&proc_lock);
+	mutex_enter(p->p_lock);
+	memcpy(rlimits, p->p_rlimit, sizeof(rlimits));
+	mutex_exit(p->p_lock);
+	mutex_exit(&proc_lock);
+
+	error = 0;
+
+	bufsize = (64 * 3) * __arraycount(linux_rlimits_ident);
+	buffer = malloc(bufsize, M_TEMP, M_WAITOK);
+	pos = snprintf(buffer, bufsize, "%-26s%-21s%-21s%-21s\n",
+	"Limit", "Soft Limit", "Hard Limit", "Units");
+	for (li = linux_rlimits_ident; li->desc != NULL; ++li) {
+		switch (li->rlim_id)
+		{
+		case LINUX_RLIMIT_LOCKS:
+		case LINUX_RLIMIT_RTTIME:
+		case LINUX_RLIMIT_SIGPENDING:
+			rl.rlim_cur = RLIM_INFINITY;
+			break;
+		case LINUX

CVS commit: src/sys/dev/usb

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:18:34 UTC 2024

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
Regen


To generate a diff of this commit:
cvs rdiff -u -r1.807 -r1.808 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h

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

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.807 src/sys/dev/usb/usbdevs.h:1.808
--- src/sys/dev/usb/usbdevs.h:1.807	Tue Apr 16 22:33:04 2024
+++ src/sys/dev/usb/usbdevs.h	Sun May 12 13:18:34 2024
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.807 2024/04/17 02:33:04 maya Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.808 2024/05/12 17:18:34 christos Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp
+ *	NetBSD: usbdevs,v 1.816 2024/05/12 17:17:56 christos Exp
  */
 
 /*-
@@ -3474,6 +3474,7 @@
 #define	USB_PRODUCT_TPLINK_T4UV2	0x010d		/* Archer T4U ver 2 */
 #define	USB_PRODUCT_TPLINK_T4UHV2	0x010e		/* Archer T4UH ver 2 */
 #define	USB_PRODUCT_TPLINK_T2UNANO	0x011e		/* Archer T2U Nano */
+#define	USB_PRODUCT_TPLINK_UE300	0x0601		/* UE300 10/100/1000 LAN */
 
 /* Trek Technology products */
 #define	USB_PRODUCT_TREK_THUMBDRIVE	0x		/* ThumbDrive */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.807 src/sys/dev/usb/usbdevs_data.h:1.808
--- src/sys/dev/usb/usbdevs_data.h:1.807	Tue Apr 16 22:33:04 2024
+++ src/sys/dev/usb/usbdevs_data.h	Sun May 12 13:18:34 2024
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.807 2024/04/17 02:33:04 maya Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.808 2024/05/12 17:18:34 christos Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp
+ *	NetBSD: usbdevs,v 1.816 2024/05/12 17:17:56 christos Exp
  */
 
 /*-
@@ -4767,168 +4767,170 @@ static const uint32_t usb_products[] = {
 	20027, 20038, 7643, 6624, 0,
 	USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_T2UNANO, 
 	20027, 20043, 6975, 0,
+	USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_UE300, 
+	20047, 20053, 7459, 0,
 	USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE, 
-	20047, 0,
+	20065, 0,
 	USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB, 
-	20047, 20058, 0,
+	20065, 20076, 0,
 	USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_RTL8192CU, 
 	5282, 0,
 	USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_RTL8188CU, 
 	5302, 0,
 	USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_TEW648UBM, 
-	20062, 0,
+	20080, 0,
 	USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209, 
-	20073, 7044, 5007, 0,
+	20091, 7044, 5007, 0,
 	USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS, 
 	3207, 3213, 480, 0,
 	USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_SMARTLCD, 
-	20078, 480, 0,
+	20096, 480, 0,
 	USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_AVR550U, 
-	3207, 3213, 20087, 0,
+	3207, 3213, 20105, 0,
 	USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521, 
-	20095, 20103, 0,
+	20113, 20121, 0,
 	USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_XXX1100, 
-	16365, 20111, 0,
+	16365, 20129, 0,
 	USB_VENDOR_TSUNAMI, USB_PRODUCT_TSUNAMI_SM2000, 
-	20116, 0,
+	20134, 0,
 	USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240, 
-	20124, 0,
+	20142, 0,
 	USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS, 
 	11625, 15247, 11515, 7345, 0,
 	USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_T14BR, 
-	20129, 20135, 6945, 0,
+	20147, 20153, 6945, 0,
 	USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U, 
-	20141, 5778, 20147, 0,
+	20159, 5778, 20165, 0,
 	USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U, 
-	20141, 20155, 20147, 0,
+	20159, 20173, 20165, 0,
 	USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U, 
-	20141, 20161, 20147, 0,
+	20159, 20179, 20165, 0,
 	USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400, 
-	20141, 20167, 20147, 0,
+	20159, 20185, 20165, 0,
 	USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U, 
-	20141, 20172, 20147, 0,
+	20159, 20190, 20165, 0,
 	USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U, 
-	20141, 20178, 20147, 0,
+	20159, 20196, 20165, 0,
 	USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A, 
-	20184, 0,
+	20202, 0,
 	USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB, 
-	20196, 0,
+	20214, 0,
 	USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UBC1, 
-	20196, 9551, 0,
+	20214, 9551, 0,
 	USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_RT2870_1, 
 	5161, 0,
 	USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW645UB, 
-	20206, 0,
+	20224, 0,
 	USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2, 
-	20216, 7632, 0,
+	20234, 7632, 0,
 	USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS

CVS commit: src/sys/dev/usb

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:18:34 UTC 2024

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
Regen


To generate a diff of this commit:
cvs rdiff -u -r1.807 -r1.808 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h

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



CVS commit: src/sys/dev/usb

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:17:56 UTC 2024

Modified Files:
src/sys/dev/usb: if_ure.c usbdevs

Log Message:
PR/58250: RVP: Add TP-Link UE300 USB LAN adapter


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/if_ure.c
cvs rdiff -u -r1.815 -r1.816 src/sys/dev/usb/usbdevs

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/usb/if_ure.c
diff -u src/sys/dev/usb/if_ure.c:1.59 src/sys/dev/usb/if_ure.c:1.60
--- src/sys/dev/usb/if_ure.c:1.59	Mon Oct  9 07:28:05 2023
+++ src/sys/dev/usb/if_ure.c	Sun May 12 13:17:56 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ure.c,v 1.59 2023/10/09 11:28:05 riastradh Exp $	*/
+/*	$NetBSD: if_ure.c,v 1.60 2024/05/12 17:17:56 christos Exp $	*/
 /*	$OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
 /* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.59 2023/10/09 11:28:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.60 2024/05/12 17:17:56 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -72,7 +72,8 @@ int	uredebug = 0;
 
 static const struct usb_devno ure_devs[] = {
 	{ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8152 },
-	{ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8153 }
+	{ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8153 },
+	{ USB_VENDOR_TPLINK,  USB_PRODUCT_TPLINK_UE300 },
 };
 
 #define URE_BUFSZ	(16 * 1024)

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.815 src/sys/dev/usb/usbdevs:1.816
--- src/sys/dev/usb/usbdevs:1.815	Tue Apr 16 22:32:08 2024
+++ src/sys/dev/usb/usbdevs	Sun May 12 13:17:56 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.815 2024/04/17 02:32:08 maya Exp $
+$NetBSD: usbdevs,v 1.816 2024/05/12 17:17:56 christos Exp $
 
 /*-
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -3467,6 +3467,7 @@ product TPLINK RTL8188EU	0x010c	RTL8188E
 product	TPLINK T4UV2		0x010d  Archer T4U ver 2
 product	TPLINK T4UHV2		0x010e  Archer T4UH ver 2
 product	TPLINK T2UNANO		0x011e  Archer T2U Nano
+product	TPLINK UE300		0x0601	UE300 10/100/1000 LAN
 
 /* Trek Technology products */
 product TREK THUMBDRIVE		0x	ThumbDrive



CVS commit: src/sys/dev/usb

2024-05-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 12 17:17:56 UTC 2024

Modified Files:
src/sys/dev/usb: if_ure.c usbdevs

Log Message:
PR/58250: RVP: Add TP-Link UE300 USB LAN adapter


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/if_ure.c
cvs rdiff -u -r1.815 -r1.816 src/sys/dev/usb/usbdevs

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



CVS commit: src/sys/arch/sparc/dev

2024-05-12 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Sun May 12 13:43:27 UTC 2024

Modified Files:
src/sys/arch/sparc/dev: sxreg.h

Log Message:
add simple 16bit load and store ops


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/dev/sxreg.h

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

Modified files:

Index: src/sys/arch/sparc/dev/sxreg.h
diff -u src/sys/arch/sparc/dev/sxreg.h:1.21 src/sys/arch/sparc/dev/sxreg.h:1.22
--- src/sys/arch/sparc/dev/sxreg.h:1.21	Fri Dec 10 20:36:03 2021
+++ src/sys/arch/sparc/dev/sxreg.h	Sun May 12 13:43:27 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sxreg.h,v 1.21 2021/12/10 20:36:03 andvar Exp $	*/
+/*	$NetBSD: sxreg.h,v 1.22 2024/05/12 13:43:27 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -195,6 +195,8 @@
 SX_LONG | (dreg << 7) | (o))
 #define SX_LDB(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
 SX_UBYTE_0 | (dreg << 7) | (o))
+#define SX_LDW(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
+SX_USHORT_0 | (dreg << 7) | (o))
 #define SX_LDP(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
 SX_PACKED | (dreg << 7) | (o))
 #define SX_LDUQ0(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
@@ -223,6 +225,8 @@
 SX_UBYTE_0 | (sreg << 7) | (o))
 #define SX_STBC(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE_CLAMP | \
 SX_UBYTE_0 | (sreg << 7) | (o))
+#define SX_STW(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
+SX_USHORT_0 | (sreg << 7) | (o))
 #define SX_STP(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
 SX_PACKED | (sreg << 7) | (o))
 #define SX_STPS(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE_SELECT | \



CVS commit: src/sys/arch/sparc/dev

2024-05-12 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Sun May 12 13:43:27 UTC 2024

Modified Files:
src/sys/arch/sparc/dev: sxreg.h

Log Message:
add simple 16bit load and store ops


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/dev/sxreg.h

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



CVS commit: src/usr.bin/xlint/lint1

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 12:32:39 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: ckbool.c

Log Message:
lint: condense code for strict bool mode


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/xlint/lint1/ckbool.c

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



CVS commit: src/usr.bin/xlint/lint1

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 12:32:39 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: ckbool.c

Log Message:
lint: condense code for strict bool mode


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/xlint/lint1/ckbool.c

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/xlint/lint1/ckbool.c
diff -u src/usr.bin/xlint/lint1/ckbool.c:1.31 src/usr.bin/xlint/lint1/ckbool.c:1.32
--- src/usr.bin/xlint/lint1/ckbool.c:1.31	Sun May 12 12:28:34 2024
+++ src/usr.bin/xlint/lint1/ckbool.c	Sun May 12 12:32:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ckbool.c,v 1.31 2024/05/12 12:28:34 rillig Exp $ */
+/* $NetBSD: ckbool.c,v 1.32 2024/05/12 12:32:39 rillig Exp $ */
 
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include 
 
 #if defined(__RCSID)
-__RCSID("$NetBSD: ckbool.c,v 1.31 2024/05/12 12:28:34 rillig Exp $");
+__RCSID("$NetBSD: ckbool.c,v 1.32 2024/05/12 12:32:39 rillig Exp $");
 #endif
 
 #include 
@@ -50,26 +50,6 @@ __RCSID("$NetBSD: ckbool.c,v 1.31 2024/0
  */
 
 
-/*
- * See if in strict bool mode, the operator takes either two bool operands
- * or two arbitrary other operands.
- */
-static bool
-is_assignment_bool_or_other(op_t op)
-{
-	return op == ASSIGN ||
-	op == ANDASS || op == XORASS || op == ORASS ||
-	op == RETURN || op == INIT || op == FARG;
-}
-
-static bool
-is_symmetric_bool_or_other(op_t op)
-{
-	return op == EQ || op == NE ||
-	op == BITAND || op == BITXOR || op == BITOR ||
-	op == COLON;
-}
-
 static bool
 is_int_constant_zero(const tnode_t *tn, tspec_t t)
 {
@@ -91,10 +71,16 @@ is_typeok_strict_bool_binary(op_t op,
 	(is_int_constant_zero(ln, lt) || is_int_constant_zero(rn, rt)))
 		return true;
 
-	if (is_assignment_bool_or_other(op))
+	if (op == ASSIGN || op == ANDASS || op == XORASS || op == ORASS ||
+	op == RETURN || op == INIT || op == FARG)
 		return lt != BOOL && (ln->tn_sys || rn->tn_sys);
 
-	return !is_symmetric_bool_or_other(op);
+	if (op == EQ || op == NE ||
+	op == BITAND || op == BITXOR || op == BITOR ||
+	op == COLON)
+		return false;
+
+	return true;
 }
 
 /*



CVS commit: src

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 12:28:35 UTC 2024

Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_bool_strict.c
d_c99_bool_strict_syshdr.c
src/usr.bin/xlint/lint1: ckbool.c externs1.h func.c

Log Message:
lint: in strict bool mode, allow do-while-0

Even though 0 is not a boolean constant, allow this common idiom, to
help in those cases where the C preprocessor used by lint does not mark
tokens as coming from system headers (Clang).


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
cvs rdiff -u -r1.23 -r1.24 \
src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xlint/lint1/ckbool.c
cvs rdiff -u -r1.227 -r1.228 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.186 -r1.187 src/usr.bin/xlint/lint1/func.c

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

Modified files:

Index: src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.49 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.50
--- src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.49	Sun May 12 11:46:14 2024
+++ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c	Sun May 12 12:28:35 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: d_c99_bool_strict.c,v 1.49 2024/05/12 11:46:14 rillig Exp $	*/
+/*	$NetBSD: d_c99_bool_strict.c,v 1.50 2024/05/12 12:28:35 rillig Exp $	*/
 # 3 "d_c99_bool_strict.c"
 
 /*
@@ -476,7 +476,6 @@ strict_bool_controlling_expression(bool 
 	// or nowhere.
 	/* expect+1: warning: loop not entered at top [207] */
 	do {
-	/* expect+1: error: controlling expression must be bool, not 'int' [333] */
 	} while (0);
 }
 

Index: src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c:1.23 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c:1.24
--- src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c:1.23	Sun May 12 11:46:14 2024
+++ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c	Sun May 12 12:28:35 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: d_c99_bool_strict_syshdr.c,v 1.23 2024/05/12 11:46:14 rillig Exp $	*/
+/*	$NetBSD: d_c99_bool_strict_syshdr.c,v 1.24 2024/05/12 12:28:35 rillig Exp $	*/
 # 3 "d_c99_bool_strict_syshdr.c"
 
 /*
@@ -17,33 +17,33 @@ extern const unsigned short *ctype_table
 
 extern void println(const char *);
 
+
+
+
 /*
- * On NetBSD 8,  defines FD_ISSET by enclosing the statements
- * in the well-known 'do { ... } while (CONSTCOND 0)' loop.  The 0 in the
- * controlling expression has type INT but should be allowed nevertheless
- * since that header does not have a way to distinguish between bool and int.
- * It just follows the C99 standard, unlike the lint-provided stdbool.h,
- * which redefines 'false' to '__lint_false'.
+ * No matter whether the code is from a system header or not, the idiom
+ * 'do { ... } while (0)' is well known, and using the integer constant 0
+ * instead of the boolean constant 'false' neither creates any type confusion
+ * nor does its value take place in any conversions, as its scope is limited
+ * to the controlling expression of the loop.
  */
 void
-strict_bool_system_header_statement_macro(void)
+statement_macro(void)
 {
 
 	do {
 		println("nothing");
 	} while (/*CONSTCOND*/0);
-	/* expect-1: error: controlling expression must be bool, not 'int' [333] */
 
-# 38 "d_c99_bool_strict_syshdr.c" 3 4
+# 39 "d_c99_bool_strict_syshdr.c" 3 4
 	do {
 		println("nothing");
-	} while (/*CONSTCOND*/0);	/* ok */
+	} while (/*CONSTCOND*/0);
 
-# 43 "d_c99_bool_strict_syshdr.c"
+# 44 "d_c99_bool_strict_syshdr.c"
 	do {
 		println("nothing");
 	} while (/*CONSTCOND*/0);
-	/* expect-1: error: controlling expression must be bool, not 'int' [333] */
 }
 
 

Index: src/usr.bin/xlint/lint1/ckbool.c
diff -u src/usr.bin/xlint/lint1/ckbool.c:1.30 src/usr.bin/xlint/lint1/ckbool.c:1.31
--- src/usr.bin/xlint/lint1/ckbool.c:1.30	Sat Mar  9 13:54:47 2024
+++ src/usr.bin/xlint/lint1/ckbool.c	Sun May 12 12:28:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ckbool.c,v 1.30 2024/03/09 13:54:47 rillig Exp $ */
+/* $NetBSD: ckbool.c,v 1.31 2024/05/12 12:28:34 rillig Exp $ */
 
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include 
 
 #if defined(__RCSID)
-__RCSID("$NetBSD: ckbool.c,v 1.30 2024/03/09 13:54:47 rillig Exp $");
+__RCSID("$NetBSD: ckbool.c,v 1.31 2024/05/12 12:28:34 rillig Exp $");
 #endif
 
 #include 
@@ -149,7 +149,7 @@ typeok_scalar_strict_bool(op_t op, const
 
 	if (mp->m_compares_with_zero) {
 		bool binary = mp->m_binary;
-		bool lbool = is_typeok_bool_compares_with_zero(ln);
+		bool lbool = is_typeok_bool_compares_with_zero(ln, false);
 		bool ok = true;
 
 		if (!binary && !lbool) {
@@ -163,7 +163,7 @@ typeok_scalar_strict_bool(op_t op, const
 			ok = false;
 		}
 		if (binary && op != QUEST &&
-		!is_typeok_bool_co

CVS commit: src

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 12:28:35 UTC 2024

Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_bool_strict.c
d_c99_bool_strict_syshdr.c
src/usr.bin/xlint/lint1: ckbool.c externs1.h func.c

Log Message:
lint: in strict bool mode, allow do-while-0

Even though 0 is not a boolean constant, allow this common idiom, to
help in those cases where the C preprocessor used by lint does not mark
tokens as coming from system headers (Clang).


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
cvs rdiff -u -r1.23 -r1.24 \
src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xlint/lint1/ckbool.c
cvs rdiff -u -r1.227 -r1.228 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.186 -r1.187 src/usr.bin/xlint/lint1/func.c

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



CVS commit: src/sys/arch/sparc/dev

2024-05-12 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Sun May 12 11:48:05 UTC 2024

Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c

Log Message:
support 16bit / RGB565 colour


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/sparc/dev/cgfourteen.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/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.97 src/sys/arch/sparc/dev/cgfourteen.c:1.98
--- src/sys/arch/sparc/dev/cgfourteen.c:1.97	Wed Apr 24 11:49:58 2024
+++ src/sys/arch/sparc/dev/cgfourteen.c	Sun May 12 11:48:05 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgfourteen.c,v 1.97 2024/04/24 11:49:58 macallan Exp $ */
+/*	$NetBSD: cgfourteen.c,v 1.98 2024/05/12 11:48:05 macallan Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -385,6 +385,7 @@ cgfourteenattach(device_t parent, device
 
 	/* Attach to /dev/fb */
 	fb_attach(&sc->sc_fb, isconsole);
+
 }
 
 /*
@@ -493,6 +494,7 @@ cgfourteenioctl(dev_t dev, u_long cmd, v
 			return EINVAL;
 
 		cg14_set_depth(sc, depth);
+		cg14_init_cmap(sc);
 		}
 		break;
 	default:
@@ -608,7 +610,8 @@ cgfourteenpoll(dev_t dev, int events, st
 static void
 cg14_init(struct cgfourteen_softc *sc)
 {
-	cg14_set_depth(sc, 32);
+	cg14_set_depth(sc, 32);	
+	cg14_init_cmap(sc);
 }
 
 static void
@@ -616,6 +619,7 @@ static void
 cg14_reset(struct cgfourteen_softc *sc)
 {
 	cg14_set_depth(sc, 8);
+	cg14_init_cmap(sc);
 }
 
 /* Enable/disable video display; power down monitor if DPMS-capable */
@@ -736,7 +740,9 @@ cg14_setup_wsdisplay(struct cgfourteen_s
 		WSSCREEN_RESIZE,
 		NULL
 	};
+
 	cg14_set_depth(sc, 8);
+
 	sc->sc_screens[0] = &sc->sc_defaultscreen_descr;
 	sc->sc_screenlist = (struct wsscreen_list){1, sc->sc_screens};
 	sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
@@ -753,45 +759,50 @@ cg14_setup_wsdisplay(struct cgfourteen_s
 	sc->sc_gc.gc_rectfill = cg14_rectfill_a;
 	sc->sc_gc.gc_rop = 0xc;
 
-		vcons_init_screen(&sc->sc_vd, &sc->sc_console_screen, 1,
-		&defattr);
+	vcons_init_screen(&sc->sc_vd, &sc->sc_console_screen, 1,
+	&defattr);
+
+	/* clear the screen with the default background colour */
+	if (sc->sc_sx != NULL) {
+		cg14_rectfill(sc, 0, 0, ri->ri_width, ri->ri_height,
+			ri->ri_devcmap[(defattr >> 16) & 0xf]);
+	} else {
+		memset(sc->sc_fb.fb_pixels,
+		   ri->ri_devcmap[(defattr >> 16) & 0xf],
+		   ri->ri_stride * ri->ri_height);
+	}
+	sc->sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
+
+	sc->sc_defaultscreen_descr.textops = &ri->ri_ops;
+	sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
+	sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
+	sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
+	glyphcache_init_align(&sc->sc_gc, sc->sc_fb.fb_type.fb_height + 5,
+		(sc->sc_vramsize / sc->sc_fb.fb_type.fb_width) - 
+		 sc->sc_fb.fb_type.fb_height - 5,
+		sc->sc_fb.fb_type.fb_width,
+		ri->ri_font->fontwidth,
+		ri->ri_font->fontheight,
+		defattr, 4);
 
-		/* clear the screen with the default background colour */
-		if (sc->sc_sx != NULL) {
-			cg14_rectfill(sc, 0, 0, ri->ri_width, ri->ri_height,
-ri->ri_devcmap[(defattr >> 16) & 0xf]);
-		} else {
-			memset(sc->sc_fb.fb_pixels,
-			   ri->ri_devcmap[(defattr >> 16) & 0xf],
-			   ri->ri_stride * ri->ri_height);
-		}
-		sc->sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
-
-		sc->sc_defaultscreen_descr.textops = &ri->ri_ops;
-		sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
-		sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
-		sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
-		glyphcache_init_align(&sc->sc_gc, sc->sc_fb.fb_type.fb_height + 5,
-			(sc->sc_vramsize / sc->sc_fb.fb_type.fb_width) - 
-			 sc->sc_fb.fb_type.fb_height - 5,
-			sc->sc_fb.fb_type.fb_width,
-			ri->ri_font->fontwidth,
-			ri->ri_font->fontheight,
-			defattr, 4);
 	if (is_cons) {
 		wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, 0,
 		defattr);
 		vcons_replay_msgbuf(&sc->sc_console_screen);
 	}
 
-	cg14_init_cmap(sc);
-
 	aa.console = is_cons;
 	aa.scrdata = &sc->sc_screenlist;
 	aa.accessops = &cg14_accessops;
 	aa.accesscookie = &sc->sc_vd;
 
 	config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARGS_NONE);
+
+	/*
+	 * do this here since any output through firmware calls will mess
+	 * with XLUT settings
+	 */
+	cg14_init_cmap(sc);
 }
 
 static void
@@ -799,18 +810,74 @@ cg14_init_cmap(struct cgfourteen_softc *
 {
 	struct rasops_info *ri = &sc->sc_console_screen.scr_ri;
 	int i, j = 0;
+	uint32_t r, g, b, c;
 	uint8_t cmap[768];
 
-	rasops_get_cmap(ri, cmap, sizeof(cmap));
-
-	for (i = 0; i < 256; i++) {
-
-		sc->sc_cmap.cm_map[i][3] = cmap[j];
-		sc->sc_cmap.cm_map[i][2] = cmap[j + 1];
-		sc->sc_cmap.cm_map[i][1] = cmap[j + 2];
-		j += 3;
+	if (sc->sc_depth == 16) {
+		/* construct an R5G6B5 palette in CLUT1/2 */
+		for (i = 0; i < 0x100; i++) {
+			/* upper byte first */
+			r = (i & 0xf8);	/* red component */
+			r |= r >> 5;	

CVS commit: src/sys/arch/sparc/dev

2024-05-12 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Sun May 12 11:48:05 UTC 2024

Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c

Log Message:
support 16bit / RGB565 colour


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/sparc/dev/cgfourteen.c

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



CVS commit: src/tests/usr.bin/xlint/lint1

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 11:46:14 UTC 2024

Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_bool_strict.c
d_c99_bool_strict_syshdr.c

Log Message:
tests/lint: clean up tests for strict bool mode


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
cvs rdiff -u -r1.22 -r1.23 \
src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c

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



CVS commit: src/tests/usr.bin/xlint/lint1

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 11:46:14 UTC 2024

Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_bool_strict.c
d_c99_bool_strict_syshdr.c

Log Message:
tests/lint: clean up tests for strict bool mode


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
cvs rdiff -u -r1.22 -r1.23 \
src/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c

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

Modified files:

Index: src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.48 src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.49
--- src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c:1.48	Sat Dec 30 17:09:42 2023
+++ src/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c	Sun May 12 11:46:14 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: d_c99_bool_strict.c,v 1.48 2023/12/30 17:09:42 rillig Exp $	*/
+/*	$NetBSD: d_c99_bool_strict.c,v 1.49 2024/05/12 11:46:14 rillig Exp $	*/
 # 3 "d_c99_bool_strict.c"
 
 /*
@@ -27,7 +27,7 @@
  *
  * strict-bool-controlling-expression:
  *	Controlling expressions in 'if', 'while', 'for', '?:' must be of
- *	type bool.
+ *	type bool, except for a literal 0 in a do-while loop.
  *
  * strict-bool-operand-unary:
  *	Operator	bool?	scalar?
@@ -62,29 +62,17 @@
  *	the resulting value is used in a context where it is implicitly and
  *	immediately compared to zero.
  *
- *	Note: An efficient implementation technique for a collection of bool
- *	flags is an enum.  The enum declaration groups the available
- *	constants, and as of 2020, compilers such as GCC and Clang have basic
- *	support for detecting type mismatches on enums.  Another implementation
- *	technique for bit sets is a plain integer.
- *
  *	Note: Examples for such contexts are controlling expressions or the
  *	operands of the operators '!', '&&', '||'.
  *
- *	Note: Counterexamples for contexts are assignments to a bool variable.
- *
- *	Note: These rules ensure that conforming code can be compiled without
- *	change in behavior using old compilers that implement bool as an
- *	ordinary integer type, without the special rule C99 6.3.1.2.
- *
- *	Note: There is a crucial difference between a _Bool variable and an
- *	ordinary integer variable.  C99 6.3.1.2 defines a conversion from an
- *	arbitrary scalar value to _Bool as equivalent to (value != 0 ? 1 : 0).
- *	This means that even if _Bool is implemented as an 8-bit unsigned
- *	integer, assigning 256 to it would still result in the value 1 being
- *	stored.  Storing 256 in an ordinary 8-bit unsigned integer would
- *	result in the value 0 being stored.  See the test d_c99_bool.c for
- *	more details.
+ *	Note: Counterexamples for contexts are assignments to a bool variable,
+ *	as without the conversion from C99 6.3.1.2, converting an integer to a
+ *	"bool-like" integer type truncated the value instead of comparing it
+ *	to 0.
+ *
+ *	Note: These rules ensure that conforming code behaves the same in both
+ *	C99 and in environments that emulate a boolean type using a small
+ *	integer type.
  */
 
 /*
@@ -413,9 +401,7 @@ strict_bool_conversion_from_bool_to_scal
 }
 
 /*
- * strict-bool-controlling-expression:
- *	Controlling expressions in 'if', 'while', 'for', '?:' must be of
- *	type bool.
+ * strict-bool-controlling-expression
  */
 
 void
@@ -466,14 +452,36 @@ strict_bool_controlling_expression(bool 
 		do_nothing();
 	if (p != (void *)0)
 		do_nothing();
+
+	// An endless loop. The preferred form is 'for (;;)' instead.
+	do {
+	/* expect+1: warning: constant in conditional context [161] */
+	} while (__lint_true);
+
+	// A do-once "loop", often used in statement macros.
+	/* expect+1: warning: loop not entered at top [207] */
+	do {
+	} while (__lint_false);
+
+	// This form is too unusual to be allowed in strict bool mode.
+	do {
+	/* expect+2: error: controlling expression must be bool, not 'int' [333] */
+	/* expect+1: warning: constant in conditional context [161] */
+	} while (1);
+
+	// Even though 0 is an integer instead of a bool, this idiom is so
+	// common that it is frequently used in system headers.  Since the
+	// Clang preprocessor does not mark each token as coming from a system
+	// header or from user code, this idiom can only be allowed everywhere
+	// or nowhere.
+	/* expect+1: warning: loop not entered at top [207] */
+	do {
+	/* expect+1: error: controlling expression must be bool, not 'int' [333] */
+	} while (0);
 }
 
 /*
- * strict-bool-operand-unary:
- *	Operator	bool?	scalar?
- *	!		yes	-
- *	&		yes	yes
- *	The other unary operators do not accept bool operands.
+ * strict-bool-operand-unary
  */
 
 void
@@ -517,23 +525,7 @@ strict_bool_operand_unary_address(void)
 /* see strict_bool_operand_unary_all below for the other unary operators. */
 
 /*
- * strict-bool-operand-binary:
- *	Operator	left:	bool?	other?	right:	

CVS commit: src/lib/libc/gen

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:58:58 UTC 2024

Modified Files:
src/lib/libc/gen: pwcache.c

Log Message:
libc/pwcache.c: remove stray semicolon from do-while-0 macro


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/gen/pwcache.c

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



CVS commit: src/lib/libc/gen

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:58:58 UTC 2024

Modified Files:
src/lib/libc/gen: pwcache.c

Log Message:
libc/pwcache.c: remove stray semicolon from do-while-0 macro


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/gen/pwcache.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/libc/gen/pwcache.c
diff -u src/lib/libc/gen/pwcache.c:1.34 src/lib/libc/gen/pwcache.c:1.35
--- src/lib/libc/gen/pwcache.c:1.34	Tue Apr 19 20:32:15 2022
+++ src/lib/libc/gen/pwcache.c	Sun May 12 10:58:58 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwcache.c,v 1.34 2022/04/19 20:32:15 rillig Exp $	*/
+/*	$NetBSD: pwcache.c,v 1.35 2024/05/12 10:58:58 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -74,7 +74,7 @@
 #if 0
 static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pwcache.c,v 1.34 2022/04/19 20:32:15 rillig Exp $");
+__RCSID("$NetBSD: pwcache.c,v 1.35 2024/05/12 10:58:58 rillig Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -524,7 +524,7 @@ gid_from_group(const char *name, gid_t *
 			arr = NULL;			\
 		}	\
 		fail = 0;\
-	} while (0);
+	} while (0)
 
 int
 pwcache_userdb(



CVS commit: src/sys/sys

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:45:13 UTC 2024

Modified Files:
src/sys/sys: lock.h

Log Message:
sys/lock.h: remove stray semicolon from SPINLOCK_BACKOFF macro


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/sys/lock.h

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



CVS commit: src/sys/sys

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:45:13 UTC 2024

Modified Files:
src/sys/sys: lock.h

Log Message:
sys/lock.h: remove stray semicolon from SPINLOCK_BACKOFF macro


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/sys/lock.h

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

Modified files:

Index: src/sys/sys/lock.h
diff -u src/sys/sys/lock.h:1.93 src/sys/sys/lock.h:1.94
--- src/sys/sys/lock.h:1.93	Sun May 12 10:34:56 2024
+++ src/sys/sys/lock.h	Sun May 12 10:45:13 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock.h,v 1.93 2024/05/12 10:34:56 rillig Exp $	*/
+/*	$NetBSD: lock.h,v 1.94 2024/05/12 10:45:13 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@ do {\
 	}			\
 	if ((count) < SPINLOCK_BACKOFF_MAX)			\
 		(count) += (count);\
-} while (0);
+} while (0)
 
 #ifdef LOCKDEBUG
 #define	SPINLOCK_SPINOUT(spins)		((spins)++ > 0x0fff)



CVS commit: src/include

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:41:23 UTC 2024

Modified Files:
src/include: bitstring.h

Log Message:
include/bitstring.h: remove CONSTCOND comment from do-while-0 loop

Lint doesn't need this comment anymore, as there is nothing surprising
or unusual about this idiom.

sed -Ei 's,} *while *\(/\* *CONSTCOND *\*/ *0\),} while (0),' *.h


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/include/bitstring.h

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

Modified files:

Index: src/include/bitstring.h
diff -u src/include/bitstring.h:1.14 src/include/bitstring.h:1.15
--- src/include/bitstring.h:1.14	Thu Mar 17 02:25:32 2016
+++ src/include/bitstring.h	Sun May 12 10:41:23 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: bitstring.h,v 1.14 2016/03/17 02:25:32 christos Exp $	*/
+/*	$NetBSD: bitstring.h,v 1.15 2024/05/12 10:41:23 rillig Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -98,7 +98,7 @@ typedef	unsigned char bitstr_t;
 		bit_clear(_name, _start); \
 		_start++; \
 	} \
-} while(/*CONSTCOND*/0)
+} while (0)
 
 /* set bits start ... stop in bitstring */
 #define	bit_nset(name, start, stop) do { \
@@ -108,7 +108,7 @@ typedef	unsigned char bitstr_t;
 		bit_set(_name, _start); \
 		_start++; \
 	} \
-} while(/*CONSTCOND*/0)
+} while (0)
 
 /* find first bit clear in name */
 #define	bit_ffc(name, nbits, value) do { \
@@ -121,7 +121,7 @@ typedef	unsigned char bitstr_t;
 			break; \
 		} \
 	*(value) = _value; \
-} while(/*CONSTCOND*/0)
+} while (0)
 
 /* find first bit set in name */
 #define	bit_ffs(name, nbits, value) do { \
@@ -134,6 +134,6 @@ typedef	unsigned char bitstr_t;
 			break; \
 		} \
 	*(value) = _value; \
-} while(/*CONSTCOND*/0)
+} while (0)
 
 #endif /* !_BITSTRING_H_ */



CVS commit: src/include

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:41:23 UTC 2024

Modified Files:
src/include: bitstring.h

Log Message:
include/bitstring.h: remove CONSTCOND comment from do-while-0 loop

Lint doesn't need this comment anymore, as there is nothing surprising
or unusual about this idiom.

sed -Ei 's,} *while *\(/\* *CONSTCOND *\*/ *0\),} while (0),' *.h


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/include/bitstring.h

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



CVS commit: src/sys/sys

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:38:03 UTC 2024

Modified Files:
src/sys/sys: module_hook.h

Log Message:
sys/module_hook.h: remove CONSTCOND comment from do-while-0 loop

Lint doesn't need this comment anymore, as there is nothing surprising
or unusual about this idiom.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/module_hook.h

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

Modified files:

Index: src/sys/sys/module_hook.h
diff -u src/sys/sys/module_hook.h:1.6 src/sys/sys/module_hook.h:1.7
--- src/sys/sys/module_hook.h:1.6	Thu Dec 12 22:55:20 2019
+++ src/sys/sys/module_hook.h	Sun May 12 10:38:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.6 2019/12/12 22:55:20 pgoyette Exp $	*/
+/* $NetBSD: module_hook.h,v 1.7 2024/05/12 10:38:03 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -70,14 +70,14 @@ extern struct hook ## _t {	\
 do {\
 	(hook).f = func;	\
 	module_hook_set(&(hook).hooked, &(hook).lc);		\
-} while /* CONSTCOND */ (0)
+} while (0)
 
 #define MODULE_HOOK_UNSET(hook)	\
 do {\
 	KASSERT((hook).f);	\
 	module_hook_unset(&(hook).hooked, &(hook).lc);		\
 	(hook).f = NULL;	/* paranoia */			\
-} while /* CONSTCOND */ (0)
+} while (0)
 
 #define MODULE_HOOK_CALL(hook, args, default, retval)		\
 do {\
@@ -87,7 +87,7 @@ do {\
 	} else {		\
 		(retval) = (default);\
 	}			\
-} while /* CONSTCOND */ (0)
+} while (0)
 
 #define MODULE_HOOK_CALL_VOID(hook, args, default)		\
 do {\
@@ -97,6 +97,6 @@ do {\
 	} else {		\
 		default;	\
 	}			\
-} while /* CONSTCOND */ (0)
+} while (0)
 
 #endif	/* _SYS_MODULE_HOOK_H */



CVS commit: src/sys/sys

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:38:03 UTC 2024

Modified Files:
src/sys/sys: module_hook.h

Log Message:
sys/module_hook.h: remove CONSTCOND comment from do-while-0 loop

Lint doesn't need this comment anymore, as there is nothing surprising
or unusual about this idiom.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/module_hook.h

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



CVS commit: src/sys/sys

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:34:56 UTC 2024

Modified Files:
src/sys/sys: bitops.h boot_flag.h bootblock.h buf.h cctr.h cdefs.h
cpu_data.h fd_set.h ieee754.h ipc.h kernhist.h lock.h mbuf.h msg.h
queue.h rbtree.h resourcevar.h sem.h shm.h siginfo.h sigtypes.h
socketvar.h systm.h time.h tree.h

Log Message:
sys/sys: remove CONSTCOND comment from do-while-0 loop

Lint doesn't need this comment anymore, as there is nothing surprising
or unusual about this idiom.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/bitops.h
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/boot_flag.h src/sys/sys/fd_set.h
cvs rdiff -u -r1.59 -r1.60 src/sys/sys/bootblock.h
cvs rdiff -u -r1.134 -r1.135 src/sys/sys/buf.h
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/cctr.h
cvs rdiff -u -r1.162 -r1.163 src/sys/sys/cdefs.h
cvs rdiff -u -r1.55 -r1.56 src/sys/sys/cpu_data.h src/sys/sys/shm.h
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/ieee754.h
cvs rdiff -u -r1.37 -r1.38 src/sys/sys/ipc.h
cvs rdiff -u -r1.26 -r1.27 src/sys/sys/kernhist.h
cvs rdiff -u -r1.92 -r1.93 src/sys/sys/lock.h
cvs rdiff -u -r1.239 -r1.240 src/sys/sys/mbuf.h
cvs rdiff -u -r1.29 -r1.30 src/sys/sys/msg.h
cvs rdiff -u -r1.76 -r1.77 src/sys/sys/queue.h
cvs rdiff -u -r1.11 -r1.12 src/sys/sys/rbtree.h
cvs rdiff -u -r1.58 -r1.59 src/sys/sys/resourcevar.h
cvs rdiff -u -r1.34 -r1.35 src/sys/sys/sem.h src/sys/sys/siginfo.h
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/sigtypes.h
cvs rdiff -u -r1.168 -r1.169 src/sys/sys/socketvar.h
cvs rdiff -u -r1.305 -r1.306 src/sys/sys/systm.h
cvs rdiff -u -r1.80 -r1.81 src/sys/sys/time.h
cvs rdiff -u -r1.20 -r1.21 src/sys/sys/tree.h

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



CVS commit: src/sys/sys

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 10:34:56 UTC 2024

Modified Files:
src/sys/sys: bitops.h boot_flag.h bootblock.h buf.h cctr.h cdefs.h
cpu_data.h fd_set.h ieee754.h ipc.h kernhist.h lock.h mbuf.h msg.h
queue.h rbtree.h resourcevar.h sem.h shm.h siginfo.h sigtypes.h
socketvar.h systm.h time.h tree.h

Log Message:
sys/sys: remove CONSTCOND comment from do-while-0 loop

Lint doesn't need this comment anymore, as there is nothing surprising
or unusual about this idiom.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/bitops.h
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/boot_flag.h src/sys/sys/fd_set.h
cvs rdiff -u -r1.59 -r1.60 src/sys/sys/bootblock.h
cvs rdiff -u -r1.134 -r1.135 src/sys/sys/buf.h
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/cctr.h
cvs rdiff -u -r1.162 -r1.163 src/sys/sys/cdefs.h
cvs rdiff -u -r1.55 -r1.56 src/sys/sys/cpu_data.h src/sys/sys/shm.h
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/ieee754.h
cvs rdiff -u -r1.37 -r1.38 src/sys/sys/ipc.h
cvs rdiff -u -r1.26 -r1.27 src/sys/sys/kernhist.h
cvs rdiff -u -r1.92 -r1.93 src/sys/sys/lock.h
cvs rdiff -u -r1.239 -r1.240 src/sys/sys/mbuf.h
cvs rdiff -u -r1.29 -r1.30 src/sys/sys/msg.h
cvs rdiff -u -r1.76 -r1.77 src/sys/sys/queue.h
cvs rdiff -u -r1.11 -r1.12 src/sys/sys/rbtree.h
cvs rdiff -u -r1.58 -r1.59 src/sys/sys/resourcevar.h
cvs rdiff -u -r1.34 -r1.35 src/sys/sys/sem.h src/sys/sys/siginfo.h
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/sigtypes.h
cvs rdiff -u -r1.168 -r1.169 src/sys/sys/socketvar.h
cvs rdiff -u -r1.305 -r1.306 src/sys/sys/systm.h
cvs rdiff -u -r1.80 -r1.81 src/sys/sys/time.h
cvs rdiff -u -r1.20 -r1.21 src/sys/sys/tree.h

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

Modified files:

Index: src/sys/sys/bitops.h
diff -u src/sys/sys/bitops.h:1.15 src/sys/sys/bitops.h:1.16
--- src/sys/sys/bitops.h:1.15	Sun Sep 12 15:22:05 2021
+++ src/sys/sys/bitops.h	Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: bitops.h,v 1.15 2021/09/12 15:22:05 rillig Exp $	*/
+/*	$NetBSD: bitops.h,v 1.16 2024/05/12 10:34:56 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
@@ -323,7 +323,7 @@ fast_remainder32(uint32_t _v, uint32_t _
 	size_t __i;			\
 	for (__i = 0; __i < __arraycount((__v)->_b); __i++)		\
 		(__v)->_b[__i] = 0;	\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 #endif /* GCC 2.95 */
 
 #endif /* _SYS_BITOPS_H_ */

Index: src/sys/sys/boot_flag.h
diff -u src/sys/sys/boot_flag.h:1.7 src/sys/sys/boot_flag.h:1.8
--- src/sys/sys/boot_flag.h:1.7	Tue Apr 29 19:16:08 2008
+++ src/sys/sys/boot_flag.h	Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: boot_flag.h,v 1.7 2008/04/29 19:16:08 ad Exp $ */
+/* $NetBSD: boot_flag.h,v 1.8 2024/05/12 10:34:56 rillig Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -86,6 +86,6 @@
 		break;		\
 	} /* switch */		\
 \
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 
 #endif /* _SYS_BOOT_FLAG_H_ */
Index: src/sys/sys/fd_set.h
diff -u src/sys/sys/fd_set.h:1.7 src/sys/sys/fd_set.h:1.8
--- src/sys/sys/fd_set.h:1.7	Sun Jun 24 12:05:40 2018
+++ src/sys/sys/fd_set.h	Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd_set.h,v 1.7 2018/06/24 12:05:40 kamil Exp $	*/
+/*	$NetBSD: fd_set.h,v 1.8 2024/05/12 10:34:56 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -81,7 +81,7 @@ typedef	struct fd_set {
 	unsigned int __i;		\
 	for (__i = 0; __i < __NFD_SIZE; __i++)\
 		__fds->fds_bits[__i] = 0;\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 #endif /* GCC 2.95 */
 
 /*
@@ -100,7 +100,7 @@ typedef	struct fd_set {
 	unsigned int __i;		\
 	for (__i = 0; __i < __NFD_SIZE; __i++)\
 		__t->fds_bits[__i] = __f->fds_bits[__i];		\
-	} while (/* CONSTCOND */ 0)
+	} while (0)
 #endif /* GCC 2.95 */
 
 #endif /* _NETBSD_SOURCE */

Index: src/sys/sys/bootblock.h
diff -u src/sys/sys/bootblock.h:1.59 src/sys/sys/bootblock.h:1.60
--- src/sys/sys/bootblock.h:1.59	Sat May 11 22:10:27 2024
+++ src/sys/sys/bootblock.h	Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootblock.h,v 1.59 2024/05/11 22:10:27 tsutsui Exp $	*/
+/*	$NetBSD: bootblock.h,v 1.60 2024/05/12 10:34:56 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2002-2004 The NetBSD Foundation, Inc.
@@ -800,7 +800,7 @@ struct alpha_boot_block {
 		_i++)		\
 			_cksum += le64toh(_bb->bb_data[_i]);		\
 		*(cksum) = htole64(_cksum);\
-	} while (/*CONSTCOND*/ 0)
+	} while (0)
 
 /* --
  * apple --

Index: src/sys/sys/buf.h
diff -u src/sys/sys/buf.h:1.134 src/sys/sys/buf.h:1.135
--- src/sys/sys/buf.h:1.134	Fri Jul 31 04:07:30 2020
+++ src/sys/sys/buf.h	Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.134 2020/07/31 04:07:30 chs Exp $ */
+/* $NetBSD: buf.h,v 1.135 2024/05/12 10:34:56 rillig Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2007, 2008 The NetBSD Foundation, Inc.
@

CVS commit: src/sys/sys

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 09:34:25 UTC 2024

Modified Files:
src/sys/sys: ktrace.h

Log Message:
sys/ktrace.h: fix off-by-one in snprintb for ktrace flags

There's a one-bit gap between TRC_EMUL and INHERIT.

Noticed by RVP.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/sys/ktrace.h

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

Modified files:

Index: src/sys/sys/ktrace.h
diff -u src/sys/sys/ktrace.h:1.69 src/sys/sys/ktrace.h:1.70
--- src/sys/sys/ktrace.h:1.69	Fri May 10 09:30:47 2024
+++ src/sys/sys/ktrace.h	Sun May 12 09:34:25 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ktrace.h,v 1.69 2024/05/10 09:30:47 rillig Exp $	*/
+/*	$NetBSD: ktrace.h,v 1.70 2024/05/12 09:34:25 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -265,7 +265,7 @@ struct ktr_execfd {
 "b\16MIB\0" \
 "b\17EXEC_FD\0" \
 "f\30\4VERSION\0" \
-"b\35TRC_EMUL\0" \
+"b\34TRC_EMUL\0" \
 "b\36INHERIT\0" \
 "b\37PERSISTENT\0"
 



CVS commit: src/sys/sys

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 09:34:25 UTC 2024

Modified Files:
src/sys/sys: ktrace.h

Log Message:
sys/ktrace.h: fix off-by-one in snprintb for ktrace flags

There's a one-bit gap between TRC_EMUL and INHERIT.

Noticed by RVP.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/sys/ktrace.h

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



CVS commit: src/usr.bin/xlint/lint1

2024-05-12 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun May 12 09:07:41 UTC 2024

Modified Files:
src/usr.bin/xlint/lint1: cgram.y lex.c tree.c

Log Message:
lint: don't call memcpy with null pointer

Even copying 0 bytes from a null pointer invokes undefined behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.502 -r1.503 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.226 -r1.227 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.642 -r1.643 src/usr.bin/xlint/lint1/tree.c

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/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.502 src/usr.bin/xlint/lint1/cgram.y:1.503
--- src/usr.bin/xlint/lint1/cgram.y:1.502	Sun May 12 08:48:36 2024
+++ src/usr.bin/xlint/lint1/cgram.y	Sun May 12 09:07:41 2024
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.502 2024/05/12 08:48:36 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.503 2024/05/12 09:07:41 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.502 2024/05/12 08:48:36 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.503 2024/05/12 09:07:41 rillig Exp $");
 #endif
 
 #include 
@@ -118,9 +118,10 @@ attribute_list_add(attribute_list *list,
 		attribute *old_attrs = list->attrs;
 		list->cap = 16 + 2 * list->cap;
 		list->attrs = block_zero_alloc(
-		list->cap * sizeof(*list->attrs), "attribute_list.attrs");
-		memcpy(list->attrs, old_attrs,
-		list->len * sizeof(*list->attrs));
+		list->cap * sizeof(*list->attrs), "attribute[]");
+		if (list->len > 0)
+			memcpy(list->attrs, old_attrs,
+			list->len * sizeof(*list->attrs));
 	}
 	list->attrs[list->len++] = attr;
 }

Index: src/usr.bin/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.226 src/usr.bin/xlint/lint1/lex.c:1.227
--- src/usr.bin/xlint/lint1/lex.c:1.226	Sun May 12 08:48:36 2024
+++ src/usr.bin/xlint/lint1/lex.c	Sun May 12 09:07:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.226 2024/05/12 08:48:36 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.227 2024/05/12 09:07:41 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: lex.c,v 1.226 2024/05/12 08:48:36 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.227 2024/05/12 09:07:41 rillig Exp $");
 #endif
 
 #include 
@@ -1545,9 +1545,10 @@ seq_reserve(balanced_token_sequence *seq
 		seq->cap = 16 + 2 * seq->cap;
 		const balanced_token *old_tokens = seq->tokens;
 		balanced_token *new_tokens = block_zero_alloc(
-		seq->cap * sizeof(*seq->tokens), "balanced_tokens");
-		memcpy(new_tokens, old_tokens,
-		seq->len * sizeof(*seq->tokens));
+		seq->cap * sizeof(*seq->tokens), "balanced_token[]");
+		if (seq->len > 0)
+			memcpy(new_tokens, old_tokens,
+			seq->len * sizeof(*seq->tokens));
 		seq->tokens = new_tokens;
 	}
 }

Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.642 src/usr.bin/xlint/lint1/tree.c:1.643
--- src/usr.bin/xlint/lint1/tree.c:1.642	Sat May 11 15:53:38 2024
+++ src/usr.bin/xlint/lint1/tree.c	Sun May 12 09:07:41 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.642 2024/05/11 15:53:38 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.643 2024/05/12 09:07:41 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.642 2024/05/11 15:53:38 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.643 2024/05/12 09:07:41 rillig Exp $");
 #endif
 
 #include 
@@ -4214,10 +4214,10 @@ add_function_argument(function_call *cal
 	if (call->args_len >= call->args_cap) {
 		call->args_cap += 8;
 		tnode_t **new_args = expr_zero_alloc(
-		call->args_cap * sizeof(*call->args),
-		"function_call.args");
-		memcpy(new_args, call->args,
-		call->args_len * sizeof(*call->args));
+		call->args_cap * sizeof(*call->args), "tnode*[]");
+		if (call->args_len > 0)
+			memcpy(new_args, call->args,
+			call->args_len * sizeof(*call->args));
 		call->args = new_args;
 	}
 	call->args[call->args_len++] = arg;



  1   2   >