CVS commit: src/sys/arch
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:43:26 UTC 2023
Modified Files:
src/sys/arch/arm/xscale: ixp425_mem.c
src/sys/arch/evbarm/integrator: integrator_machdep.c
src/sys/arch/evbarm/stand/board: integrator_mem.c
Log Message:
Fix typo in error message.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xscale/ixp425_mem.c
cvs rdiff -u -r1.81 -r1.82 \
src/sys/arch/evbarm/integrator/integrator_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/stand/board/integrator_mem.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/xscale/ixp425_mem.c
diff -u src/sys/arch/arm/xscale/ixp425_mem.c:1.2 src/sys/arch/arm/xscale/ixp425_mem.c:1.3
--- src/sys/arch/arm/xscale/ixp425_mem.c:1.2 Sun Dec 11 12:16:51 2005
+++ src/sys/arch/arm/xscale/ixp425_mem.c Sat Jun 24 05:43:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_mem.c,v 1.2 2005/12/11 12:16:51 christos Exp $ */
+/* $NetBSD: ixp425_mem.c,v 1.3 2023/06/24 05:43:25 msaitoh Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixp425_mem.c,v 1.2 2005/12/11 12:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_mem.c,v 1.3 2023/06/24 05:43:25 msaitoh Exp $");
#include
#include
@@ -77,7 +77,7 @@ ixp425_sdram_size(void)
size = sdram_other[MCU_SDR_CONFIG_MCONF(sdr_config)];
if (size == 0) {
- printf("** SDR_CONFIG retuns unknown value, using 32M\n");
+ printf("** SDR_CONFIG returns unknown value, using 32M\n");
size = 32 * 1024 * 1024;
}
Index: src/sys/arch/evbarm/integrator/integrator_machdep.c
diff -u src/sys/arch/evbarm/integrator/integrator_machdep.c:1.81 src/sys/arch/evbarm/integrator/integrator_machdep.c:1.82
--- src/sys/arch/evbarm/integrator/integrator_machdep.c:1.81 Thu Apr 20 08:28:04 2023
+++ src/sys/arch/evbarm/integrator/integrator_machdep.c Sat Jun 24 05:43:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: integrator_machdep.c,v 1.81 2023/04/20 08:28:04 skrll Exp $ */
+/* $NetBSD: integrator_machdep.c,v 1.82 2023/06/24 05:43:26 msaitoh Exp $ */
/*
* Copyright (c) 2001,2002 ARM Ltd
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.81 2023/04/20 08:28:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.82 2023/06/24 05:43:26 msaitoh Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -464,7 +464,7 @@ integrator_sdram_bounds(paddr_t *memstar
*memsize = 256 * 1024 * 1024 - *memstart;
break;
default:
- printf("CM_SDRAM retuns unknown value, using 16M\n");
+ printf("CM_SDRAM returns unknown value, using 16M\n");
*memsize = 16 * 1024 * 1024;
break;
}
Index: src/sys/arch/evbarm/stand/board/integrator_mem.c
diff -u src/sys/arch/evbarm/stand/board/integrator_mem.c:1.4 src/sys/arch/evbarm/stand/board/integrator_mem.c:1.5
--- src/sys/arch/evbarm/stand/board/integrator_mem.c:1.4 Mon Jan 16 19:34:53 2006
+++ src/sys/arch/evbarm/stand/board/integrator_mem.c Sat Jun 24 05:43:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: integrator_mem.c,v 1.4 2006/01/16 19:34:53 he Exp $ */
+/* $NetBSD: integrator_mem.c,v 1.5 2023/06/24 05:43:26 msaitoh Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@ mem_init(void)
break;
default:
- printf("** CM_SDRAM retuns unknown value, using 16M\n");
+ printf("** CM_SDRAM returns unknown value, using 16M\n");
size = 16 * 1024 * 1024;
break;
}
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:43:26 UTC 2023 Modified Files: src/sys/arch/arm/xscale: ixp425_mem.c src/sys/arch/evbarm/integrator: integrator_machdep.c src/sys/arch/evbarm/stand/board: integrator_mem.c Log Message: Fix typo in error message. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xscale/ixp425_mem.c cvs rdiff -u -r1.81 -r1.82 \ src/sys/arch/evbarm/integrator/integrator_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/stand/board/integrator_mem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:35:00 UTC 2023
Modified Files:
src/sys/dev/gpio: gpiopps.c
src/sys/dev/ic: lancereg.h
src/sys/dev/pci: if_iwmreg.h
src/sys/netinet: sctp_structs.h
Log Message:
Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/gpio/gpiopps.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/lancereg.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_iwmreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_structs.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/gpio/gpiopps.c
diff -u src/sys/dev/gpio/gpiopps.c:1.4 src/sys/dev/gpio/gpiopps.c:1.5
--- src/sys/dev/gpio/gpiopps.c:1.4 Thu Mar 31 19:30:16 2022
+++ src/sys/dev/gpio/gpiopps.c Sat Jun 24 05:34:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiopps.c,v 1.4 2022/03/31 19:30:16 pgoyette Exp $ */
+/* $NetBSD: gpiopps.c,v 1.5 2023/06/24 05:34:59 msaitoh Exp $ */
/*
* Copyright (c) 2016 Brad Spencer
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gpiopps.c,v 1.4 2022/03/31 19:30:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpiopps.c,v 1.5 2023/06/24 05:34:59 msaitoh Exp $");
/*
* GPIO interface to the pps subsystem for ntp support.
@@ -132,7 +132,7 @@ gpiopps_attach(device_t parent, device_t
sc->sc_gpio = ga->ga_gpio;
sc->sc_map.pm_map = sc->_map;
- /* Determine our pin configuation. */
+ /* Determine our pin configuration. */
npins = gpio_npins(mask);
if (npins == 0) {
npins = 1;
Index: src/sys/dev/ic/lancereg.h
diff -u src/sys/dev/ic/lancereg.h:1.15 src/sys/dev/ic/lancereg.h:1.16
--- src/sys/dev/ic/lancereg.h:1.15 Sun May 22 11:27:35 2022
+++ src/sys/dev/ic/lancereg.h Sat Jun 24 05:35:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lancereg.h,v 1.15 2022/05/22 11:27:35 andvar Exp $ */
+/* $NetBSD: lancereg.h,v 1.16 2023/06/24 05:35:00 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
#define LE_CSR36 0x0024 /* Next Next Rx Desc addr lower */
#define LE_CSR37 0x0025 /* Next Next Rx Desc addr upper */
#define LE_CSR38 0x0026 /* Next Next Tx Desc addr lower */
-#define LE_CSR39 0x0027 /* Next Next Tx Desc adddr upper */
+#define LE_CSR39 0x0027 /* Next Next Tx Desc addr upper */
#define LE_CSR40 0x0028 /* Current Rx Byte Count */
#define LE_CSR41 0x0029 /* Current Rx Status */
#define LE_CSR42 0x002a /* Current Tx Byte Count */
Index: src/sys/dev/pci/if_iwmreg.h
diff -u src/sys/dev/pci/if_iwmreg.h:1.12 src/sys/dev/pci/if_iwmreg.h:1.13
--- src/sys/dev/pci/if_iwmreg.h:1.12 Sun Dec 5 04:37:12 2021
+++ src/sys/dev/pci/if_iwmreg.h Sat Jun 24 05:35:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwmreg.h,v 1.12 2021/12/05 04:37:12 msaitoh Exp $ */
+/* $NetBSD: if_iwmreg.h,v 1.13 2023/06/24 05:35:00 msaitoh Exp $ */
/* OpenBSD: if_iwmreg.h,v 1.19 2016/09/20 11:46:09 stsp Exp */
/*-
@@ -5372,7 +5372,7 @@ enum iwm_scan_offload_channel_flags {
* @type: bitmap - see enum iwm_scan_offload_channel_flags.
* 0: passive (0) or active (1) scan.
* 1-20: directed scan to i'th ssid.
- * 22: channel width configuation - 1 for narrow.
+ * 22: channel width configuration - 1 for narrow.
* 24: full scan.
* 25: partial scan.
* @channel_number: channel number 1-13 etc.
Index: src/sys/netinet/sctp_structs.h
diff -u src/sys/netinet/sctp_structs.h:1.2 src/sys/netinet/sctp_structs.h:1.3
--- src/sys/netinet/sctp_structs.h:1.2 Mon Apr 25 21:21:02 2016
+++ src/sys/netinet/sctp_structs.h Sat Jun 24 05:35:00 2023
@@ -1,5 +1,5 @@
/* $KAME: sctp_structs.h,v 1.13 2005/03/06 16:04:18 itojun Exp $ */
-/* $NetBSD: sctp_structs.h,v 1.2 2016/04/25 21:21:02 rjs Exp $ */
+/* $NetBSD: sctp_structs.h,v 1.3 2023/06/24 05:35:00 msaitoh Exp $ */
#ifndef __SCTP_STRUCTS_H__
#define __SCTP_STRUCTS_H__
@@ -390,7 +390,7 @@ struct sctp_association {
* The tag to be used. if assoc is
* re-initited by remote end, and
* I have unlocked this will be
- * regenrated to a new random value.
+ * regenerated to a new random value.
*/
u_int32_t peer_vtag; /* The peers last tag */
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:35:00 UTC 2023 Modified Files: src/sys/dev/gpio: gpiopps.c src/sys/dev/ic: lancereg.h src/sys/dev/pci: if_iwmreg.h src/sys/netinet: sctp_structs.h Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/gpio/gpiopps.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/lancereg.h cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_iwmreg.h cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/sctp_structs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ipf/dist
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:31:51 UTC 2023 Modified Files: src/external/bsd/ipf/dist: ip_fil.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ipf/dist/ip_fil.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/ip_fil.c diff -u src/external/bsd/ipf/dist/ip_fil.c:1.5 src/external/bsd/ipf/dist/ip_fil.c:1.6 --- src/external/bsd/ipf/dist/ip_fil.c:1.5 Sun Feb 4 08:19:42 2018 +++ src/external/bsd/ipf/dist/ip_fil.c Sat Jun 24 05:31:51 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil.c,v 1.5 2018/02/04 08:19:42 mrg Exp $ */ +/* $NetBSD: ip_fil.c,v 1.6 2023/06/24 05:31:51 msaitoh Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -610,7 +610,7 @@ ipf_newisn(fin) /* */ /* Function:ipf_nextipid*/ -/* Returns: int - 0 == success, -1 == error (packet should be droppped) */ +/* Returns: int - 0 == success, -1 == error (packet should be dropped) */ /* Parameters: fin(I) - pointer to packet information */ /* */ /* Returns the next IPv4 ID to use for this packet. */
CVS commit: src/external/bsd/ipf/dist
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:31:51 UTC 2023 Modified Files: src/external/bsd/ipf/dist: ip_fil.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ipf/dist/ip_fil.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
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:31:05 UTC 2023
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/amiga/dev: if_esreg.h
src/sys/arch/atari/dev: fd.c
src/sys/arch/i386/stand/efiboot/bootx64: startprog64.S
src/sys/arch/m68k/060sp/dist: fpsp.s
src/sys/arch/mips/mips: locore.S
src/sys/arch/newsmips/dev: scsi_1185.c
src/sys/arch/powerpc/ibm4xx/dev: pcicreg.h
src/sys/arch/powerpc/powerpc: ofwreal.S
src/sys/arch/sgimips/sgimips: arcemu.h
src/sys/arch/sun3/include: mon.h
src/sys/arch/sun68k/include: mon.h
Log Message:
Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/dev/if_esreg.h
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/i386/stand/efiboot/bootx64/startprog64.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/060sp/dist/fpsp.s
cvs rdiff -u -r1.230 -r1.231 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/newsmips/dev/scsi_1185.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/ibm4xx/dev/pcicreg.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/powerpc/ofwreal.S
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/sgimips/arcemu.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sun3/include/mon.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sun68k/include/mon.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/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.221 src/sys/arch/amd64/amd64/locore.S:1.222
--- src/sys/arch/amd64/amd64/locore.S:1.221 Sun May 14 09:05:39 2023
+++ src/sys/arch/amd64/amd64/locore.S Sat Jun 24 05:31:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.221 2023/05/14 09:05:39 riastradh Exp $ */
+/* $NetBSD: locore.S,v 1.222 2023/06/24 05:31:04 msaitoh Exp $ */
/*
* Copyright-o-rama!
@@ -1771,7 +1771,7 @@ LABEL(nomds_leave_end)
#ifdef SELFRELOC
/*
- * selfreloc(loadddr edi)
+ * selfreloc(loadaddr edi)
* This is adapted from sys/arch/i386/i386/locore.S
*/
.code32
Index: src/sys/arch/amiga/dev/if_esreg.h
diff -u src/sys/arch/amiga/dev/if_esreg.h:1.9 src/sys/arch/amiga/dev/if_esreg.h:1.10
--- src/sys/arch/amiga/dev/if_esreg.h:1.9 Sun Feb 19 21:35:07 2023
+++ src/sys/arch/amiga/dev/if_esreg.h Sat Jun 24 05:31:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_esreg.h,v 1.9 2023/02/19 21:35:07 andvar Exp $ */
+/* $NetBSD: if_esreg.h,v 1.10 2023/06/24 05:31:04 msaitoh Exp $ */
/*
* Copyright (c) 1995 Michael L. Hitch
@@ -148,7 +148,7 @@ union smcregs {
#define IST_TX 0x02 /* TX complete */
#define IST_RX 0x01 /* RX complete */
-/* Interrupt Acknowlege Register */
+/* Interrupt Acknowledge Register */
#define ACK_RX_OVRN IST_RX_OVRN
#define ACK_TX_EMPTY IST_TX_EMPTY
#define ACK_TX IST_TX
Index: src/sys/arch/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.95 src/sys/arch/atari/dev/fd.c:1.96
--- src/sys/arch/atari/dev/fd.c:1.95 Fri Jan 6 10:28:28 2023
+++ src/sys/arch/atari/dev/fd.c Sat Jun 24 05:31:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.95 2023/01/06 10:28:28 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.96 2023/06/24 05:31:04 msaitoh Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.95 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.96 2023/06/24 05:31:04 msaitoh Exp $");
#include
#include
@@ -618,7 +618,7 @@ fdstrategy(struct buf *bp)
bp->b_error = EINVAL;
goto done;
}
- /* Trucate it */
+ /* Truncate it */
if (bp->b_flags & B_RAW)
bp->b_bcount = sz << DEV_BSHIFT;
else
Index: src/sys/arch/i386/stand/efiboot/bootx64/startprog64.S
diff -u src/sys/arch/i386/stand/efiboot/bootx64/startprog64.S:1.4 src/sys/arch/i386/stand/efiboot/bootx64/startprog64.S:1.5
--- src/sys/arch/i386/stand/efiboot/bootx64/startprog64.S:1.4 Thu Apr 20 00:42:24 2023
+++ src/sys/arch/i386/stand/efiboot/bootx64/startprog64.S Sat Jun 24 05:31:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: startprog64.S,v 1.4 2023/04/20 00:42:24 manu Exp $ */
+/* $NetBSD: startprog64.S,v 1.5 2023/06/24 05:31:04 msaitoh Exp $ */
/* NetBSD: startprog.S,v 1.3 2003/02/01 14:48:18 dsl Exp */
/* starts program in protected mode / flat space
@@ -78,7 +78,7 @@ _C_LABEL(startprog64_size):
.p2align 4,,15
/*
- * startprog64(loadddr,entry,stack,kern_load,kern_start,kern_size)
+ * startprog64(loaddr,entry,stack,kern_load,kern_start,kern_size)
*/
ENTRY(startprog64_start)
start:
Index: src/sys/arch/m68k/060sp/dist/fpsp.s
diff -u src/sys/arch/m68k/060sp/dist/fpsp.s:1.6 src/sys/arch/m68k/060sp/dist/fpsp.s:1.7
--- src/sys/arch/m68k/060sp/dist/fpsp.s:1.6 Wed Nov 10 16:47:41 2021
+++ src/sys/arch/m68k/060sp/dist/fpsp.s Sat Jun 24 05:31:04 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD:
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:31:05 UTC 2023 Modified Files: src/sys/arch/amd64/amd64: locore.S src/sys/arch/amiga/dev: if_esreg.h src/sys/arch/atari/dev: fd.c src/sys/arch/i386/stand/efiboot/bootx64: startprog64.S src/sys/arch/m68k/060sp/dist: fpsp.s src/sys/arch/mips/mips: locore.S src/sys/arch/newsmips/dev: scsi_1185.c src/sys/arch/powerpc/ibm4xx/dev: pcicreg.h src/sys/arch/powerpc/powerpc: ofwreal.S src/sys/arch/sgimips/sgimips: arcemu.h src/sys/arch/sun3/include: mon.h src/sys/arch/sun68k/include: mon.h Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.221 -r1.222 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/dev/if_esreg.h cvs rdiff -u -r1.95 -r1.96 src/sys/arch/atari/dev/fd.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/arch/i386/stand/efiboot/bootx64/startprog64.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/060sp/dist/fpsp.s cvs rdiff -u -r1.230 -r1.231 src/sys/arch/mips/mips/locore.S cvs rdiff -u -r1.23 -r1.24 src/sys/arch/newsmips/dev/scsi_1185.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/ibm4xx/dev/pcicreg.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/powerpc/ofwreal.S cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/sgimips/arcemu.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sun3/include/mon.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sun68k/include/mon.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/dev/audio
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:27:14 UTC 2023
Modified Files:
src/tests/dev/audio: audiotest.c
Log Message:
Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/tests/dev/audio/audiotest.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/dev/audio/audiotest.c
diff -u src/tests/dev/audio/audiotest.c:1.29 src/tests/dev/audio/audiotest.c:1.30
--- src/tests/dev/audio/audiotest.c:1.29 Sun Apr 23 16:49:38 2023
+++ src/tests/dev/audio/audiotest.c Sat Jun 24 05:27:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: audiotest.c,v 1.29 2023/04/23 16:49:38 mlelstv Exp $ */
+/* $NetBSD: audiotest.c,v 1.30 2023/06/24 05:27:13 msaitoh Exp $ */
/*
* Copyright (C) 2019 Tetsuya Isaki. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__RCSID("$NetBSD: audiotest.c,v 1.29 2023/04/23 16:49:38 mlelstv Exp $");
+__RCSID("$NetBSD: audiotest.c,v 1.30 2023/06/24 05:27:13 msaitoh Exp $");
#include
#include
@@ -4655,7 +4655,7 @@ DEF(AUDIO_SETFD_RDWR)
XP_SYS_EQ(0, r);
}
- /* When obtains it, it retuns half/full-duplex as is */
+ /* When obtains it, it returns half/full-duplex as is */
n = 0;
r = IOCTL(fd, AUDIO_GETFD, , "");
XP_SYS_EQ(0, r);
CVS commit: src/tests/dev/audio
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:27:14 UTC 2023 Modified Files: src/tests/dev/audio: audiotest.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/tests/dev/audio/audiotest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:26:41 UTC 2023 Modified Files: src/doc: CHANGES.prev Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 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/doc
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:26:41 UTC 2023 Modified Files: src/doc: CHANGES.prev Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 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.170 src/doc/CHANGES.prev:1.171 --- src/doc/CHANGES.prev:1.170 Sat May 13 12:51:28 2023 +++ src/doc/CHANGES.prev Sat Jun 24 05:26:40 2023 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.170 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.171 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -3789,7 +3789,7 @@ Changes from NetBSD 1.2 to NetBSD 1.3: [sakamoto 19971014] arm32: major restructure of the kernel arm32 source files to remove lots of RiscPC/IOMD/VIDC inter-dependancies, making it easier - to port to mutliple ARM hardware architectures [mark 19971014] + to port to multiple ARM hardware architectures [mark 19971014] ethernet: Split NE2000 support out of the ISA "ed" driver, and create an "ne" driver to handle multiple attachments for NE2000 compatible cards. Add front-ends for ISA and PCI.
CVS commit: src/usr.sbin
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:26:01 UTC 2023
Modified Files:
src/usr.sbin/bta2dpd/bta2dpd: bta2dpd.c
src/usr.sbin/ipwctl: ipwctl.c
Log Message:
Fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/ipwctl/ipwctl.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/bta2dpd/bta2dpd/bta2dpd.c
diff -u src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.8 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.9
--- src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.8 Sun Mar 7 13:09:43 2021
+++ src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c Sat Jun 24 05:26:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bta2dpd.c,v 1.8 2021/03/07 13:09:43 nat Exp $ */
+/* $NetBSD: bta2dpd.c,v 1.9 2023/06/24 05:26:01 msaitoh Exp $ */
/*-
* Copyright (c) 2015 - 2016 Nathanial Sloss
@@ -625,7 +625,7 @@ usage(void)
"\t\tS Signal to Noise Ratio (SNR) bit allocation\n"
"\t\tL Loudness bit allocation (this is the default)\n"
"\n"
- "\tWithout specifiying any mode rate enoding and allocation\n"
+ "\tWithout specifying any mode rate enoding and allocation\n"
"\tthe channel the default is stereo, 16 blocks, 8 subbands,\n"
"\tloudness bit allocation, 441000 Hz.\n"
, getprogname(), getprogname(), getprogname());
Index: src/usr.sbin/ipwctl/ipwctl.c
diff -u src/usr.sbin/ipwctl/ipwctl.c:1.9 src/usr.sbin/ipwctl/ipwctl.c:1.10
--- src/usr.sbin/ipwctl/ipwctl.c:1.9 Sat Dec 15 19:44:55 2007
+++ src/usr.sbin/ipwctl/ipwctl.c Sat Jun 24 05:26:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ipwctl.c,v 1.9 2007/12/15 19:44:55 perry Exp $ */
+/* $NetBSD: ipwctl.c,v 1.10 2023/06/24 05:26:01 msaitoh Exp $ */
/* Id: ipwctl.c,v 1.1.2.1 2004/08/19 16:24:50 damien Exp */
/*-
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: ipwctl.c,v 1.9 2007/12/15 19:44:55 perry Exp $");
+__RCSID("$NetBSD: ipwctl.c,v 1.10 2023/06/24 05:26:01 msaitoh Exp $");
#include
#include
@@ -184,7 +184,7 @@ static const struct statistic tbl[] = {
{ 27, "Number of reassociation requests transmitted", INT },
{ 28, "Number of reassociation responses transmitted", INT },
{ 29, "Number of probe requests transmitted", INT },
- { 30, "Number of probe reponses transmitted", INT },
+ { 30, "Number of probe responses transmitted", INT },
{ 31, "Number of beacons transmitted", INT },
{ 32, "Number of ATIM frames transmitted", INT },
{ 33, "Number of disassociation requests transmitted", INT },
@@ -232,7 +232,7 @@ static const struct statistic tbl[] = {
{ 89, "Number of reassociation requests received", INT },
{ 90, "Number of reassociation responses received", INT },
{ 91, "Number of probe requests received", INT },
- { 92, "Number of probe reponses received", INT },
+ { 92, "Number of probe responses received", INT },
{ 93, "Number of beacons received", INT },
{ 94, "Number of ATIM frames received", INT },
{ 95, "Number of disassociation requests received", INT },
CVS commit: src/usr.sbin
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:26:01 UTC 2023 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: bta2dpd.c src/usr.sbin/ipwctl: ipwctl.c Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/ipwctl/ipwctl.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/sysinst
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:25:04 UTC 2023 Modified Files: src/usr.sbin/sysinst: disks.c util.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/usr.sbin/sysinst/disks.c cvs rdiff -u -r1.71 -r1.72 src/usr.sbin/sysinst/util.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/sysinst/disks.c diff -u src/usr.sbin/sysinst/disks.c:1.94 src/usr.sbin/sysinst/disks.c:1.95 --- src/usr.sbin/sysinst/disks.c:1.94 Sat Dec 10 20:58:37 2022 +++ src/usr.sbin/sysinst/disks.c Sat Jun 24 05:25:04 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.94 2022/12/10 20:58:37 reinoud Exp $ */ +/* $NetBSD: disks.c,v 1.95 2023/06/24 05:25:04 msaitoh Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -129,7 +129,7 @@ getfslabelname(uint f, uint f_version) } /* - * Decide wether we want to mount a tmpfs on /var/shm: we do this always + * Decide whether we want to mount a tmpfs on /var/shm: we do this always * when the machine has more than 16 MB of user memory. On smaller machines, * shm_open() and friends will not perform well anyway. */ Index: src/usr.sbin/sysinst/util.c diff -u src/usr.sbin/sysinst/util.c:1.71 src/usr.sbin/sysinst/util.c:1.72 --- src/usr.sbin/sysinst/util.c:1.71 Thu Dec 15 20:34:46 2022 +++ src/usr.sbin/sysinst/util.c Sat Jun 24 05:25:04 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.71 2022/12/15 20:34:46 martin Exp $ */ +/* $NetBSD: util.c,v 1.72 2023/06/24 05:25:04 msaitoh Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -2130,7 +2130,7 @@ set_menu_select(menudesc *m, void *arg) } /* - * check wether a binary is available somewhere in PATH, + * check whether a binary is available somewhere in PATH, * return 1 if found, 0 if not. */ static int
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:25:04 UTC 2023 Modified Files: src/usr.sbin/sysinst: disks.c util.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/usr.sbin/sysinst/disks.c cvs rdiff -u -r1.71 -r1.72 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:18:13 UTC 2023
Modified Files:
src/lib/libbluetooth: bt_dev.c
src/lib/libcrypt: crypt.c
src/lib/libcurses: refresh.c
src/lib/libperfuse: ops.c
Log Message:
Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libbluetooth/bt_dev.c
cvs rdiff -u -r1.38 -r1.39 src/lib/libcrypt/crypt.c
cvs rdiff -u -r1.127 -r1.128 src/lib/libcurses/refresh.c
cvs rdiff -u -r1.91 -r1.92 src/lib/libperfuse/ops.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/libbluetooth/bt_dev.c
diff -u src/lib/libbluetooth/bt_dev.c:1.4 src/lib/libbluetooth/bt_dev.c:1.5
--- src/lib/libbluetooth/bt_dev.c:1.4 Thu Oct 3 17:10:16 2019
+++ src/lib/libbluetooth/bt_dev.c Sat Jun 24 05:18:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_dev.c,v 1.4 2019/10/03 17:10:16 christos Exp $ */
+/* $NetBSD: bt_dev.c,v 1.5 2023/06/24 05:18:12 msaitoh Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -59,7 +59,7 @@
*/
#include
-__RCSID("$NetBSD: bt_dev.c,v 1.4 2019/10/03 17:10:16 christos Exp $");
+__RCSID("$NetBSD: bt_dev.c,v 1.5 2023/06/24 05:18:12 msaitoh Exp $");
#include
#include
@@ -614,7 +614,7 @@ bt_devinquiry(const char *name, time_t t
}
/*
- * silently adjust number of reponses to fit in uint8_t
+ * silently adjust number of responses to fit in uint8_t
*/
if (max_rsp < 1)
max_rsp = 8;
Index: src/lib/libcrypt/crypt.c
diff -u src/lib/libcrypt/crypt.c:1.38 src/lib/libcrypt/crypt.c:1.39
--- src/lib/libcrypt/crypt.c:1.38 Sat Feb 22 10:29:17 2020
+++ src/lib/libcrypt/crypt.c Sat Jun 24 05:18:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: crypt.c,v 1.38 2020/02/22 10:29:17 kamil Exp $ */
+/* $NetBSD: crypt.c,v 1.39 2023/06/24 05:18:12 msaitoh Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)crypt.c 8.1.1.1 (Berkeley) 8/18/93";
#else
-__RCSID("$NetBSD: crypt.c,v 1.38 2020/02/22 10:29:17 kamil Exp $");
+__RCSID("$NetBSD: crypt.c,v 1.39 2023/06/24 05:18:12 msaitoh Exp $");
#endif
#endif /* not lint */
@@ -503,7 +503,7 @@ ascii_is_unsafe(char ch)
* full scheme name comparison
* Updated to reflect alc suggestion(s)
*
- * retuns boolean 0 on failure, 1 on success,
+ * returns boolean 0 on failure, 1 on success,
*/
static int
nondes_scheme_substr(const char * setting,char * scheme, unsigned int len)
Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.127 src/lib/libcurses/refresh.c:1.128
--- src/lib/libcurses/refresh.c:1.127 Fri Apr 28 07:12:39 2023
+++ src/lib/libcurses/refresh.c Sat Jun 24 05:18:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.127 2023/04/28 07:12:39 blymn Exp $ */
+/* $NetBSD: refresh.c,v 1.128 2023/06/24 05:18:13 msaitoh Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94";
#else
-__RCSID("$NetBSD: refresh.c,v 1.127 2023/04/28 07:12:39 blymn Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.128 2023/06/24 05:18:13 msaitoh Exp $");
#endif
#endif/* not lint */
@@ -694,7 +694,7 @@ doupdate(void)
*wlp->firstchp, *wlp->lastchp);
/*
* We have just cleared so don't force an update
- * otherwise we spray neeedless blanks to a cleared
+ * otherwise we spray needless blanks to a cleared
* screen. That is, unless, we are using color,
* in this case we need to force the background
* color to default.
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.91 src/lib/libperfuse/ops.c:1.92
--- src/lib/libperfuse/ops.c:1.91 Wed Jul 6 12:33:41 2022
+++ src/lib/libperfuse/ops.c Sat Jun 24 05:18:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.91 2022/07/06 12:33:41 andvar Exp $ */
+/* $NetBSD: ops.c,v 1.92 2023/06/24 05:18:13 msaitoh Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -1230,7 +1230,7 @@ perfuse_node_create(struct puffs_usermou
len = sizeof(*feo) + sizeof(*foo);
if ((error = xchg_msg(pu, opc, pm, len, wait_reply)) != 0) {
/*
- * create is unimplmented, remember it for later,
+ * create is unimplemented, remember it for later,
* and start over using mknod and open instead.
*/
if (error == ENOSYS) {
CVS commit: src/lib
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:18:13 UTC 2023 Modified Files: src/lib/libbluetooth: bt_dev.c src/lib/libcrypt: crypt.c src/lib/libcurses: refresh.c src/lib/libperfuse: ops.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libbluetooth/bt_dev.c cvs rdiff -u -r1.38 -r1.39 src/lib/libcrypt/crypt.c cvs rdiff -u -r1.127 -r1.128 src/lib/libcurses/refresh.c cvs rdiff -u -r1.91 -r1.92 src/lib/libperfuse/ops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:17:02 UTC 2023
Modified Files:
src/bin/sh: eval.c
Log Message:
Fix typo in a debug message.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/bin/sh/eval.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.189 src/bin/sh/eval.c:1.190
--- src/bin/sh/eval.c:1.189 Fri Apr 7 10:34:13 2023
+++ src/bin/sh/eval.c Sat Jun 24 05:17:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.189 2023/04/07 10:34:13 kre Exp $ */
+/* $NetBSD: eval.c,v 1.190 2023/06/24 05:17:02 msaitoh Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.189 2023/04/07 10:34:13 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.190 2023/06/24 05:17:02 msaitoh Exp $");
#endif
#endif /* not lint */
@@ -1002,7 +1002,7 @@ evalcommand(union node *cmd, int flgs, s
*/
cmdentry.cmdtype = CMDBUILTIN;
cmdentry.u.bltin = bltincmd;
- VTRACE(DBG_CMDS, ("No command name, assume \"comamnd\"\n"));
+ VTRACE(DBG_CMDS, ("No command name, assume \"command\"\n"));
} else {
static const char PATH[] = "PATH=";
CVS commit: src/bin/sh
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:17:02 UTC 2023 Modified Files: src/bin/sh: eval.c Log Message: Fix typo in a debug message. To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 src/bin/sh/eval.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:16:15 UTC 2023 Modified Files: src/sys/external/bsd/ipf/netinet: fil.c ip_fil_netbsd.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/external/bsd/ipf/netinet/fil.c cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.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/external/bsd/ipf/netinet/fil.c diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.36 src/sys/external/bsd/ipf/netinet/fil.c:1.37 --- src/sys/external/bsd/ipf/netinet/fil.c:1.36 Fri Feb 3 19:01:08 2023 +++ src/sys/external/bsd/ipf/netinet/fil.c Sat Jun 24 05:16:15 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: fil.c,v 1.36 2023/02/03 19:01:08 christos Exp $ */ +/* $NetBSD: fil.c,v 1.37 2023/06/24 05:16:15 msaitoh Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -141,7 +141,7 @@ extern struct timeout ipf_slowtimer_ch; #if !defined(lint) #if defined(__NetBSD__) #include -__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.36 2023/02/03 19:01:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.37 2023/06/24 05:16:15 msaitoh Exp $"); #else static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $"; @@ -5943,7 +5943,7 @@ ipf_movequeue(u_long ticks, ipftqent_t * /* */ /* Function:ipf_updateipid */ -/* Returns: int - 0 == success, -1 == error (packet should be droppped) */ +/* Returns: int - 0 == success, -1 == error (packet should be dropped) */ /* Parameters: fin(I) - pointer to packet information */ /* */ /* When we are doing NAT, change the IP of every packet to represent a */ Index: src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.37 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.38 --- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.37 Mon Mar 28 12:33:21 2022 +++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Sat Jun 24 05:16:15 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.37 2022/03/28 12:33:21 riastradh Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.38 2023/06/24 05:16:15 msaitoh Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include -__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.37 2022/03/28 12:33:21 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.38 2023/06/24 05:16:15 msaitoh Exp $"); #else static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp"; @@ -1680,8 +1680,8 @@ ipf_newisn(fr_info_t *fin) /* */ -/* Function:ipf_nextipid */ -/* Returns: int - 0 == success, -1 == error (packet should be droppped) */ +/* Function:ipf_nextipid*/ +/* Returns: int - 0 == success, -1 == error (packet should be dropped) */ /* Parameters: fin(I) - pointer to packet information */ /* */ /* Returns the next IPv4 ID to use for this packet. */
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:16:15 UTC 2023 Modified Files: src/sys/external/bsd/ipf/netinet: fil.c ip_fil_netbsd.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/external/bsd/ipf/netinet/fil.c cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.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
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:15:42 UTC 2023 Modified Files: src/usr.sbin/lpr/lpr: lpr.c src/usr.sbin/makemandb: run_query.3 src/usr.sbin/mld6query: mld6.c src/usr.sbin/moused: moused.c Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/lpr/lpr/lpr.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/makemandb/run_query.3 cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mld6query/mld6.c cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/moused/moused.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
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:15:42 UTC 2023
Modified Files:
src/usr.sbin/lpr/lpr: lpr.c
src/usr.sbin/makemandb: run_query.3
src/usr.sbin/mld6query: mld6.c
src/usr.sbin/moused: moused.c
Log Message:
Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/lpr/lpr/lpr.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/makemandb/run_query.3
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mld6query/mld6.c
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/moused/moused.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/lpr/lpr/lpr.c
diff -u src/usr.sbin/lpr/lpr/lpr.c:1.46 src/usr.sbin/lpr/lpr/lpr.c:1.47
--- src/usr.sbin/lpr/lpr/lpr.c:1.46 Sat Jun 2 03:32:53 2012
+++ src/usr.sbin/lpr/lpr/lpr.c Sat Jun 24 05:15:42 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lpr.c,v 1.46 2012/06/02 03:32:53 jnemeth Exp $ */
+/* $NetBSD: lpr.c,v 1.47 2023/06/24 05:15:42 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: lpr.c,v 1.46 2012/06/02 03:32:53 jnemeth Exp $");
+__RCSID("$NetBSD: lpr.c,v 1.47 2023/06/24 05:15:42 msaitoh Exp $");
#endif
#endif /* not lint */
@@ -176,7 +176,7 @@ main(int argc, char *argv[])
jobname = optarg;
break;
- case 'P': /* specifiy printer name */
+ case 'P': /* specify printer name */
printer = optarg;
break;
Index: src/usr.sbin/makemandb/run_query.3
diff -u src/usr.sbin/makemandb/run_query.3:1.5 src/usr.sbin/makemandb/run_query.3:1.6
--- src/usr.sbin/makemandb/run_query.3:1.5 Sun Sep 11 20:32:37 2022
+++ src/usr.sbin/makemandb/run_query.3 Sat Jun 24 05:15:42 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: run_query.3,v 1.5 2022/09/11 20:32:37 gutteridge Exp $
+.\" $NetBSD: run_query.3,v 1.6 2023/06/24 05:15:42 msaitoh Exp $
.\"
.\" Copyright (c) 2011 Abhinav Upadhyay
.\" All rights reserved.
@@ -95,7 +95,7 @@ Alternatively pass
as to search in all the sections.
.It Li int nrec
This specifies the number of matching rows to fetch from the database.
-Specifiy a negative value to fetch all the matching rows.
+Specify a negative value to fetch all the matching rows.
.It Li int offset
This specifies the offset within the result-set.
Use it to specify the position
Index: src/usr.sbin/mld6query/mld6.c
diff -u src/usr.sbin/mld6query/mld6.c:1.15 src/usr.sbin/mld6query/mld6.c:1.16
--- src/usr.sbin/mld6query/mld6.c:1.15 Wed Jul 20 23:19:18 2016
+++ src/usr.sbin/mld6query/mld6.c Sat Jun 24 05:15:42 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.15 2016/07/20 23:19:18 christos Exp $ */
+/* $NetBSD: mld6.c,v 1.16 2023/06/24 05:15:42 msaitoh Exp $ */
/* $KAME: mld6.c,v 1.9 2000/12/04 06:29:37 itojun Exp $ */
/*
@@ -216,7 +216,7 @@ make_msg(int idx, struct in6_addr *addr,
pi = (struct in6_pktinfo *)CMSG_DATA(cmsgp);
pi->ipi6_ifindex = idx;
memset(>ipi6_addr, 0, sizeof(pi->ipi6_addr));
- /* specifiy to insert router alert option in a hop-by-hop opt hdr. */
+ /* specify to insert router alert option in a hop-by-hop opt hdr. */
cmsgp = CMSG_NXTHDR(, cmsgp);
#ifdef USE_RFC2292BIS
cmsgp->cmsg_len = CMSG_LEN(hbhlen);
Index: src/usr.sbin/moused/moused.c
diff -u src/usr.sbin/moused/moused.c:1.29 src/usr.sbin/moused/moused.c:1.30
--- src/usr.sbin/moused/moused.c:1.29 Wed May 11 14:58:01 2022
+++ src/usr.sbin/moused/moused.c Sat Jun 24 05:15:42 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: moused.c,v 1.29 2022/05/11 14:58:01 andvar Exp $ */
+/* $NetBSD: moused.c,v 1.30 2023/06/24 05:15:42 msaitoh Exp $ */
/**
** Copyright (c) 1995 Michael Smith, All rights reserved.
**
@@ -48,7 +48,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: moused.c,v 1.29 2022/05/11 14:58:01 andvar Exp $");
+__RCSID("$NetBSD: moused.c,v 1.30 2023/06/24 05:15:42 msaitoh Exp $");
#endif /* not lint */
#include
@@ -2629,7 +2629,7 @@ pnpparse(pnpid_t *id, char *buf, int len
}
/*
* PnP COM spec prior to v0.96 allowed '*' in this field,
- * it's not allowed now; just igore it.
+ * it's not allowed now; just ignore it.
*/
if (buf[j] == '*')
++j;
CVS commit: src/sys/net80211
Module Name:src
Committed By: msaitoh
Date: Sat Jun 24 05:12:03 UTC 2023
Modified Files:
src/sys/net80211: ieee80211_crypto_ccmp.c ieee80211_crypto_tkip.c
ieee80211_crypto_wep.c ieee80211_node.c ieee80211_var.h
Log Message:
Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/net80211/ieee80211_crypto_ccmp.c
cvs rdiff -u -r1.17 -r1.18 src/sys/net80211/ieee80211_crypto_tkip.c
cvs rdiff -u -r1.13 -r1.14 src/sys/net80211/ieee80211_crypto_wep.c
cvs rdiff -u -r1.82 -r1.83 src/sys/net80211/ieee80211_node.c
cvs rdiff -u -r1.34 -r1.35 src/sys/net80211/ieee80211_var.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/net80211/ieee80211_crypto_ccmp.c
diff -u src/sys/net80211/ieee80211_crypto_ccmp.c:1.19 src/sys/net80211/ieee80211_crypto_ccmp.c:1.20
--- src/sys/net80211/ieee80211_crypto_ccmp.c:1.19 Tue Nov 3 15:06:50 2020
+++ src/sys/net80211/ieee80211_crypto_ccmp.c Sat Jun 24 05:12:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_crypto_ccmp.c,v 1.19 2020/11/03 15:06:50 mlelstv Exp $ */
+/* $NetBSD: ieee80211_crypto_ccmp.c,v 1.20 2023/06/24 05:12:03 msaitoh Exp $ */
/*
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_ccmp.c,v 1.7 2005/07/11 03:06:23 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_ccmp.c,v 1.19 2020/11/03 15:06:50 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_ccmp.c,v 1.20 2023/06/24 05:12:03 msaitoh Exp $");
#endif
/*
@@ -164,7 +164,7 @@ ccmp_encap(struct ieee80211_key *k, stru
ivp[7] = k->wk_keytsc >> 40; /* PN5 */
/*
- * Finally, do software encrypt if neeed.
+ * Finally, do software encrypt if need.
*/
if ((k->wk_flags & IEEE80211_KEY_SWCRYPT) &&
!ccmp_encrypt(k, m, hdrlen))
Index: src/sys/net80211/ieee80211_crypto_tkip.c
diff -u src/sys/net80211/ieee80211_crypto_tkip.c:1.17 src/sys/net80211/ieee80211_crypto_tkip.c:1.18
--- src/sys/net80211/ieee80211_crypto_tkip.c:1.17 Tue Nov 3 15:06:50 2020
+++ src/sys/net80211/ieee80211_crypto_tkip.c Sat Jun 24 05:12:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_crypto_tkip.c,v 1.17 2020/11/03 15:06:50 mlelstv Exp $ */
+/* $NetBSD: ieee80211_crypto_tkip.c,v 1.18 2023/06/24 05:12:03 msaitoh Exp $ */
/*
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_tkip.c,v 1.10 2005/08/08 18:46:35 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_tkip.c,v 1.17 2020/11/03 15:06:50 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_tkip.c,v 1.18 2023/06/24 05:12:03 msaitoh Exp $");
#endif
/*
@@ -191,7 +191,7 @@ tkip_encap(struct ieee80211_key *k, stru
ivp[7] = k->wk_keytsc >> 40; /* TSC5 */
/*
- * Finally, do software encrypt if neeed.
+ * Finally, do software encrypt if need.
*/
if (k->wk_flags & IEEE80211_KEY_SWCRYPT) {
if (!tkip_encrypt(ctx, k, m, hdrlen))
Index: src/sys/net80211/ieee80211_crypto_wep.c
diff -u src/sys/net80211/ieee80211_crypto_wep.c:1.13 src/sys/net80211/ieee80211_crypto_wep.c:1.14
--- src/sys/net80211/ieee80211_crypto_wep.c:1.13 Tue Nov 3 15:06:50 2020
+++ src/sys/net80211/ieee80211_crypto_wep.c Sat Jun 24 05:12:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_crypto_wep.c,v 1.13 2020/11/03 15:06:50 mlelstv Exp $ */
+/* $NetBSD: ieee80211_crypto_wep.c,v 1.14 2023/06/24 05:12:03 msaitoh Exp $ */
/*
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_wep.c,v 1.7 2005/06/10 16:11:24 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_wep.c,v 1.13 2020/11/03 15:06:50 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_wep.c,v 1.14 2023/06/24 05:12:03 msaitoh Exp $");
#endif
/*
@@ -178,7 +178,7 @@ wep_encap(struct ieee80211_key *k, struc
ivp[3] = keyid;
/*
- * Finally, do software encrypt if neeed.
+ * Finally, do software encrypt if need.
*/
if ((k->wk_flags & IEEE80211_KEY_SWCRYPT) &&
!wep_encrypt(k, m, hdrlen))
Index: src/sys/net80211/ieee80211_node.c
diff -u src/sys/net80211/ieee80211_node.c:1.82 src/sys/net80211/ieee80211_node.c:1.83
--- src/sys/net80211/ieee80211_node.c:1.82 Sun Sep 19 10:34:09 2021
+++ src/sys/net80211/ieee80211_node.c Sat Jun 24 05:12:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_node.c,v 1.82 2021/09/19 10:34:09 andvar Exp $ */
+/* $NetBSD: ieee80211_node.c,v 1.83 2023/06/24 05:12:03 msaitoh Exp $ */
/*
* Copyright (c) 2001 Atsushi Onoe
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.65 2005/08/13 17:50:21 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.82 2021/09/19 10:34:09 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD:
CVS commit: src/sys/net80211
Module Name:src Committed By: msaitoh Date: Sat Jun 24 05:12:03 UTC 2023 Modified Files: src/sys/net80211: ieee80211_crypto_ccmp.c ieee80211_crypto_tkip.c ieee80211_crypto_wep.c ieee80211_node.c ieee80211_var.h Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/net80211/ieee80211_crypto_ccmp.c cvs rdiff -u -r1.17 -r1.18 src/sys/net80211/ieee80211_crypto_tkip.c cvs rdiff -u -r1.13 -r1.14 src/sys/net80211/ieee80211_crypto_wep.c cvs rdiff -u -r1.82 -r1.83 src/sys/net80211/ieee80211_node.c cvs rdiff -u -r1.34 -r1.35 src/sys/net80211/ieee80211_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Fri Jun 23 22:49:38 UTC 2023
Modified Files:
src/sys/kern: kern_synch.c
Log Message:
tsleep: Comment out kernel lock assertion for now.
Breaks tpm(4) which breaks boot on a lot of systems. tpm(4)
shouldn't be using tsleep; it doesn't appear to even have an
interrupt handler for wakeups, so it could get by with kpause. If it
ever did sprout an interrupt handler it should use condvar(9) anyway.
But for now I don't have time to fix it tonight.
To generate a diff of this commit:
cvs rdiff -u -r1.355 -r1.356 src/sys/kern/kern_synch.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_synch.c
diff -u src/sys/kern/kern_synch.c:1.355 src/sys/kern/kern_synch.c:1.356
--- src/sys/kern/kern_synch.c:1.355 Fri Jun 23 21:19:03 2023
+++ src/sys/kern/kern_synch.c Fri Jun 23 22:49:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.355 2023/06/23 21:19:03 riastradh Exp $ */
+/* $NetBSD: kern_synch.c,v 1.356 2023/06/23 22:49:38 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019, 2020
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.355 2023/06/23 21:19:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.356 2023/06/23 22:49:38 riastradh Exp $");
#include "opt_kstack.h"
#include "opt_dtrace.h"
@@ -178,7 +178,7 @@ tsleep(wchan_t ident, pri_t priority, co
KASSERT((l->l_pflag & LP_INTR) == 0);
KASSERT(ident != );
- KASSERT(KERNEL_LOCKED_P());
+ //KASSERT(KERNEL_LOCKED_P());
if (sleepq_dontsleep(l)) {
(void)sleepq_abort(NULL, 0);
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Fri Jun 23 22:49:38 UTC 2023 Modified Files: src/sys/kern: kern_synch.c Log Message: tsleep: Comment out kernel lock assertion for now. Breaks tpm(4) which breaks boot on a lot of systems. tpm(4) shouldn't be using tsleep; it doesn't appear to even have an interrupt handler for wakeups, so it could get by with kpause. If it ever did sprout an interrupt handler it should use condvar(9) anyway. But for now I don't have time to fix it tonight. To generate a diff of this commit: cvs rdiff -u -r1.355 -r1.356 src/sys/kern/kern_synch.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
Module Name:src
Committed By: riastradh
Date: Fri Jun 23 21:19:03 UTC 2023
Modified Files:
src/sys/kern: kern_synch.c
Log Message:
tsleep(9): Assert kernel lock held.
This is never safe to use without the kernel lock. It should only
appear in legacy subsystems that still run with the kernel lock.
To generate a diff of this commit:
cvs rdiff -u -r1.354 -r1.355 src/sys/kern/kern_synch.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_synch.c
diff -u src/sys/kern/kern_synch.c:1.354 src/sys/kern/kern_synch.c:1.355
--- src/sys/kern/kern_synch.c:1.354 Sun Apr 9 12:16:42 2023
+++ src/sys/kern/kern_synch.c Fri Jun 23 21:19:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.354 2023/04/09 12:16:42 riastradh Exp $ */
+/* $NetBSD: kern_synch.c,v 1.355 2023/06/23 21:19:03 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019, 2020
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.354 2023/04/09 12:16:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.355 2023/06/23 21:19:03 riastradh Exp $");
#include "opt_kstack.h"
#include "opt_dtrace.h"
@@ -178,6 +178,7 @@ tsleep(wchan_t ident, pri_t priority, co
KASSERT((l->l_pflag & LP_INTR) == 0);
KASSERT(ident != );
+ KASSERT(KERNEL_LOCKED_P());
if (sleepq_dontsleep(l)) {
(void)sleepq_abort(NULL, 0);
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Fri Jun 23 21:19:03 UTC 2023 Modified Files: src/sys/kern: kern_synch.c Log Message: tsleep(9): Assert kernel lock held. This is never safe to use without the kernel lock. It should only appear in legacy subsystems that still run with the kernel lock. To generate a diff of this commit: cvs rdiff -u -r1.354 -r1.355 src/sys/kern/kern_synch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: riastradh
Date: Fri Jun 23 21:09:45 UTC 2023
Modified Files:
src/sys/rump/librump/rumpkern: klock.c
Log Message:
rump: KASSERT(x && y) -> KASSERT(x); KASSERT(y)
Add some KASSERTMSG while here.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/klock.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/rump/librump/rumpkern/klock.c
diff -u src/sys/rump/librump/rumpkern/klock.c:1.10 src/sys/rump/librump/rumpkern/klock.c:1.11
--- src/sys/rump/librump/rumpkern/klock.c:1.10 Thu Jul 7 06:55:44 2016
+++ src/sys/rump/librump/rumpkern/klock.c Fri Jun 23 21:09:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: klock.c,v 1.10 2016/07/07 06:55:44 msaitoh Exp $ */
+/* $NetBSD: klock.c,v 1.11 2023/06/23 21:09:44 riastradh Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: klock.c,v 1.10 2016/07/07 06:55:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: klock.c,v 1.11 2023/06/23 21:09:44 riastradh Exp $");
#include
#include
@@ -67,7 +67,9 @@ void
rump_kernel_bigwrap(int *nlocks)
{
- KASSERT(giantcnt > 0 && curlwp == giantowner);
+ KASSERTMSG(giantcnt > 0, "giantcnt=%d", giantcnt);
+ KASSERTMSG(curlwp == giantowner, "curlwp=%p giantowner=%p",
+ curlwp, giantowner);
giantowner = NULL;
*nlocks = giantcnt;
giantcnt = 0;
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: riastradh Date: Fri Jun 23 21:09:45 UTC 2023 Modified Files: src/sys/rump/librump/rumpkern: klock.c Log Message: rump: KASSERT(x && y) -> KASSERT(x); KASSERT(y) Add some KASSERTMSG while here. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/klock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Fri Jun 23 20:59:04 UTC 2023
Modified Files:
src/tests/usr.bin/indent: lsym_comment.c
src/usr.bin/indent: pr_comment.c
Log Message:
indent: fix scanning of no-wrap comments (since 2021.11.07.10.34.03)
The "refactoring" back then tried to be too clever.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tests/usr.bin/indent/lsym_comment.c
cvs rdiff -u -r1.170 -r1.171 src/usr.bin/indent/pr_comment.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/indent/lsym_comment.c
diff -u src/tests/usr.bin/indent/lsym_comment.c:1.23 src/tests/usr.bin/indent/lsym_comment.c:1.24
--- src/tests/usr.bin/indent/lsym_comment.c:1.23 Sun Jun 18 07:10:24 2023
+++ src/tests/usr.bin/indent/lsym_comment.c Fri Jun 23 20:59:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lsym_comment.c,v 1.23 2023/06/18 07:10:24 rillig Exp $ */
+/* $NetBSD: lsym_comment.c,v 1.24 2023/06/23 20:59:04 rillig Exp $ */
/*
* Tests for the token lsym_comment, which starts a comment.
@@ -1131,6 +1131,7 @@ int block; /* comment line 1 comment l
//indent end
+// Ensure that '/*/' is not interpreted as a complete comment.
//indent input
/*/ comment? or:not; /* */
//indent end
@@ -1139,10 +1140,7 @@ int block; /* comment line 1 comment l
/* / comment? or:not; /* */
//indent end
-//indent run -nfc1
-// $ FIXME: It's a comment, not code.
-/*/ comment ? or : not; /* */
-//indent end
+//indent run-equals-input -nfc1
/*
Index: src/usr.bin/indent/pr_comment.c
diff -u src/usr.bin/indent/pr_comment.c:1.170 src/usr.bin/indent/pr_comment.c:1.171
--- src/usr.bin/indent/pr_comment.c:1.170 Sun Jun 18 07:32:33 2023
+++ src/usr.bin/indent/pr_comment.c Fri Jun 23 20:59:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pr_comment.c,v 1.170 2023/06/18 07:32:33 rillig Exp $ */
+/* $NetBSD: pr_comment.c,v 1.171 2023/06/23 20:59:04 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include
-__RCSID("$NetBSD: pr_comment.c,v 1.170 2023/06/18 07:32:33 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.171 2023/06/23 20:59:04 rillig Exp $");
#include
@@ -325,12 +325,13 @@ copy_comment_nowrap(void)
continue;
}
- com_add_char(*inp_p++);
- if (com.len >= 2
- && com.s[com.len - 2] == '*'
- && com.s[com.len - 1] == '/'
- && kind == '*')
+ if (kind == '*' && inp_p[0] == '*' && inp_p[1] == '/') {
+ com_add_char(*inp_p++);
+ com_add_char(*inp_p++);
return;
+ }
+
+ com_add_char(*inp_p++);
}
}
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Jun 23 20:59:04 UTC 2023 Modified Files: src/tests/usr.bin/indent: lsym_comment.c src/usr.bin/indent: pr_comment.c Log Message: indent: fix scanning of no-wrap comments (since 2021.11.07.10.34.03) The "refactoring" back then tried to be too clever. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/tests/usr.bin/indent/lsym_comment.c cvs rdiff -u -r1.170 -r1.171 src/usr.bin/indent/pr_comment.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/indent
Module Name:src
Committed By: rillig
Date: Fri Jun 23 20:44:51 UTC 2023
Modified Files:
src/tests/usr.bin/indent: fmt_else_comment.c opt_bap.c
psym_switch_expr.c
Log Message:
tests/indent: fix comments
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/indent/fmt_else_comment.c \
src/tests/usr.bin/indent/psym_switch_expr.c
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/indent/opt_bap.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/indent/fmt_else_comment.c
diff -u src/tests/usr.bin/indent/fmt_else_comment.c:1.5 src/tests/usr.bin/indent/fmt_else_comment.c:1.6
--- src/tests/usr.bin/indent/fmt_else_comment.c:1.5 Thu May 11 09:28:53 2023
+++ src/tests/usr.bin/indent/fmt_else_comment.c Fri Jun 23 20:44:51 2023
@@ -1,10 +1,11 @@
-/* $NetBSD: fmt_else_comment.c,v 1.5 2023/05/11 09:28:53 rillig Exp $ */
+/* $NetBSD: fmt_else_comment.c,v 1.6 2023/06/23 20:44:51 rillig Exp $ */
/*
- * Tests for comments after 'if (expr)' and 'else'. If the option '-br' is
- * given (or rather, if '-bl' is not given), indent looks ahead to the
- * following significant token to see whether it is a '{', it then moves the
- * comments after the '{'.
+ * Tests for comments after 'if (expr)' and 'else'. Before 2023-05-11, if the
+ * option '-br' was given (or rather, if '-bl' was not given), indent looked
+ * ahead to the following significant token to see whether it was a '{', it
+ * then moved the comments after the '{'. This token swapping was error-prone
+ * and thus removed.
*
* See also:
* FreeBSD r303484
@@ -12,8 +13,8 @@
*/
/*
- * The two 'if' statements below exercise two different code paths, even
- * though they look very similar.
+ * Before 2023-05-11, the two 'if' statements below exercised two different
+ * code paths, even though they look very similar.
*/
//indent input
void t(void) {
@@ -52,6 +53,7 @@ void t(void) {
/* Old indent would remove the 3 blank lines above, awaiting "else". */
+ // $ 'Old' means something before 2019.
if (1) {
int a;
@@ -68,6 +70,7 @@ void t(void) {
if (1)
;
else /* Old indent would get very confused here */
+ // $ 'Old' means something before 2019.
/* We also mustn't assume that there's only one comment */
/* before the left brace. */
{
Index: src/tests/usr.bin/indent/psym_switch_expr.c
diff -u src/tests/usr.bin/indent/psym_switch_expr.c:1.5 src/tests/usr.bin/indent/psym_switch_expr.c:1.6
--- src/tests/usr.bin/indent/psym_switch_expr.c:1.5 Tue Jun 6 04:37:27 2023
+++ src/tests/usr.bin/indent/psym_switch_expr.c Fri Jun 23 20:44:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: psym_switch_expr.c,v 1.5 2023/06/06 04:37:27 rillig Exp $ */
+/* $NetBSD: psym_switch_expr.c,v 1.6 2023/06/23 20:44:51 rillig Exp $ */
/*
* Tests for the parser symbol psym_switch_expr, which represents the keyword
@@ -12,7 +12,7 @@
/*
* In all practical cases, a 'switch (expr)' is followed by a block, but the
* C syntax allows an arbitrary statement. Unless such a statement has a
- * label, it is unreachable.
+ * label or is a loop, its beginning is unreachable.
*/
//indent input
void
Index: src/tests/usr.bin/indent/opt_bap.c
diff -u src/tests/usr.bin/indent/opt_bap.c:1.10 src/tests/usr.bin/indent/opt_bap.c:1.11
--- src/tests/usr.bin/indent/opt_bap.c:1.10 Fri Jun 16 11:48:32 2023
+++ src/tests/usr.bin/indent/opt_bap.c Fri Jun 23 20:44:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_bap.c,v 1.10 2023/06/16 11:48:32 rillig Exp $ */
+/* $NetBSD: opt_bap.c,v 1.11 2023/06/23 20:44:51 rillig Exp $ */
/*
* Tests for the options '-bap' and '-nbap' ("blank line after procedure
@@ -115,7 +115,7 @@ example(void)
/*
* A preprocessing line after the end of a function body does not force a blank
- * line, as these lines are not a different syntactic layer.
+ * line, as these lines are from a different syntactic layer.
*/
//indent input
#if 0
CVS commit: src/tests/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Jun 23 20:44:51 UTC 2023 Modified Files: src/tests/usr.bin/indent: fmt_else_comment.c opt_bap.c psym_switch_expr.c Log Message: tests/indent: fix comments To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/indent/fmt_else_comment.c \ src/tests/usr.bin/indent/psym_switch_expr.c cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/indent/opt_bap.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/indent
Module Name:src
Committed By: rillig
Date: Fri Jun 23 20:43:21 UTC 2023
Modified Files:
src/usr.bin/indent: debug.c indent.c indent.h
Log Message:
indent: properly store parser state in debug mode
The stacks in the parser state are allocated now and need to be copied
individually.
The test whether two paren stacks are equal was broken since 2023-06-14
14:11:28.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/indent/debug.c
cvs rdiff -u -r1.381 -r1.382 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.202 -r1.203 src/usr.bin/indent/indent.h
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/indent/debug.c
diff -u src/usr.bin/indent/debug.c:1.67 src/usr.bin/indent/debug.c:1.68
--- src/usr.bin/indent/debug.c:1.67 Sat Jun 17 22:28:49 2023
+++ src/usr.bin/indent/debug.c Fri Jun 23 20:43:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.67 2023/06/17 22:28:49 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.68 2023/06/23 20:43:21 rillig Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: debug.c,v 1.67 2023/06/17 22:28:49 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.68 2023/06/23 20:43:21 rillig Exp $");
#include
#include
@@ -263,8 +263,8 @@ paren_stack_equal(const struct paren_sta
for (size_t i = 0, n = a->len; i < n; i++)
if (a->item[i].indent != b->item[i].indent
|| a->item[i].cast != b->item[i].cast)
- return true;
- return false;
+ return false;
+ return true;
}
static void
@@ -375,7 +375,8 @@ debug_parser_state(void)
state.heading = NULL;
debug_blank_line();
- state.prev_ps = ps;
+ parser_state_free(_ps);
+ parser_state_back_up(_ps);
state.ps_first = false;
}
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.381 src/usr.bin/indent/indent.c:1.382
--- src/usr.bin/indent/indent.c:1.381 Sun Jun 18 07:10:24 2023
+++ src/usr.bin/indent/indent.c Fri Jun 23 20:43:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.381 2023/06/18 07:10:24 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.382 2023/06/23 20:43:21 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include
-__RCSID("$NetBSD: indent.c,v 1.381 2023/06/18 07:10:24 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.382 2023/06/23 20:43:21 rillig Exp $");
#include
#include
@@ -464,7 +464,7 @@ dup_mem(const void *src, size_t size)
#define copy_array(dst, src, len) \
memcpy((dst), (src), sizeof((dst)[0]) * (len))
-static void
+static_unless_debug void
parser_state_back_up(struct parser_state *dst)
{
*dst = ps;
@@ -496,7 +496,7 @@ parser_state_restore(const struct parser
copy_array(ps.psyms.ind_level, src->psyms.ind_level, src->psyms.len);
}
-static void
+static_unless_debug void
parser_state_free(struct parser_state *pst)
{
free(pst->paren.item);
Index: src/usr.bin/indent/indent.h
diff -u src/usr.bin/indent/indent.h:1.202 src/usr.bin/indent/indent.h:1.203
--- src/usr.bin/indent/indent.h:1.202 Fri Jun 16 23:51:32 2023
+++ src/usr.bin/indent/indent.h Fri Jun 23 20:43:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.h,v 1.202 2023/06/16 23:51:32 rillig Exp $ */
+/* $NetBSD: indent.h,v 1.203 2023/06/23 20:43:21 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -442,10 +442,13 @@ void debug_parser_state(void);
void debug_psyms_stack(const char *);
void debug_print_buf(const char *, const struct buffer *);
void debug_buffers(void);
+void parser_state_back_up(struct parser_state *);
+void parser_state_free(struct parser_state *);
extern const char *const lsym_name[];
extern const char *const psym_name[];
extern const char *const paren_level_cast_name[];
extern const char *const line_kind_name[];
+#define static_unless_debug /* nothing */
#else
#define debug_noop() do { } while (false)
#define debug_printf(fmt, ...) debug_noop()
@@ -456,6 +459,7 @@ extern const char *const line_kind_name[
#define debug_psyms_stack(situation) debug_noop()
#define debug_print_buf(name, buf) debug_noop()
#define debug_buffers() debug_noop()
+#define static_unless_debug static
#endif
void register_typename(const char *);
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Jun 23 20:43:21 UTC 2023 Modified Files: src/usr.bin/indent: debug.c indent.c indent.h Log Message: indent: properly store parser state in debug mode The stacks in the parser state are allocated now and need to be copied individually. The test whether two paren stacks are equal was broken since 2023-06-14 14:11:28. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/usr.bin/indent/debug.c cvs rdiff -u -r1.381 -r1.382 src/usr.bin/indent/indent.c cvs rdiff -u -r1.202 -r1.203 src/usr.bin/indent/indent.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
Module Name:src
Committed By: rillig
Date: Fri Jun 23 20:37:02 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: debug.c
Log Message:
lint: remove redundant printflike declarations from debugging code
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/xlint/lint1/debug.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/debug.c
diff -u src/usr.bin/xlint/lint1/debug.c:1.33 src/usr.bin/xlint/lint1/debug.c:1.34
--- src/usr.bin/xlint/lint1/debug.c:1.33 Sat Jun 3 20:58:00 2023
+++ src/usr.bin/xlint/lint1/debug.c Fri Jun 23 20:37:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.33 2023/06/03 20:58:00 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.34 2023/06/23 20:37:02 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: debug.c,v 1.33 2023/06/03 20:58:00 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.34 2023/06/23 20:37:02 rillig Exp $");
#endif
#include
@@ -62,7 +62,7 @@ debug_file(void)
return stdout;
}
-void __printflike(1, 2)
+void
debug_printf(const char *fmt, ...)
{
va_list va;
@@ -100,7 +100,7 @@ debug_enter_func(const char *func)
fprintf(debug_file(), "%*s+ %s\n", 2 * debug_indentation++, "", func);
}
-void __printflike(1, 2)
+void
debug_step(const char *fmt, ...)
{
va_list va;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Fri Jun 23 20:37:02 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: debug.c Log Message: lint: remove redundant printflike declarations from debugging code To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/usr.bin/xlint/lint1/debug.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
Module Name:src
Committed By: skrll
Date: Fri Jun 23 12:11:22 UTC 2023
Modified Files:
src/sys/arch/riscv/include: frame.h
Log Message:
Pad the trapframe so it's a multiple of 16 bytes so that when a trapframe
is created on the stack SP remains 16-byte aligned as per the ABI
requirements.
Patch from Rin with some updates from me.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/frame.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/frame.h
diff -u src/sys/arch/riscv/include/frame.h:1.5 src/sys/arch/riscv/include/frame.h:1.6
--- src/sys/arch/riscv/include/frame.h:1.5 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/include/frame.h Fri Jun 23 12:11:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.5 2023/05/07 12:41:48 skrll Exp $ */
+/* $NetBSD: frame.h,v 1.6 2023/06/23 12:11:22 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@ struct trapframe {
register_t tf_tval; // supervisor trap value
register_t tf_cause; // supervisor cause register
register_t tf_sr; // supervisor status register
+ register_t tf_pad; // For 16-byte alignment
#define tf_reg tf_regs.r_reg
#define tf_pc tf_regs.r_pc
#define tf_ra tf_reg[_X_RA]
@@ -74,6 +75,12 @@ struct trapframe {
#define tf_t6 tf_reg[_X_T6]
};
+/*
+ * Ensure the trapframe is a multiple of 16bytes so that stack
+ * alignment is preserved.
+ */
+__CTASSERT((sizeof(struct trapframe) & (16 - 1)) == 0);
+
#ifdef _LP64
// For COMPAT_NETBSD32 coredumps
struct trapframe32 {
@@ -81,11 +88,11 @@ struct trapframe32 {
register32_t tf_tval;
register32_t tf_cause;
register32_t tf_sr;
+ register32_t tf_pad;
};
#endif
-
#define lwp_trapframe(l) ((l)->l_md.md_utf)
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: skrll Date: Fri Jun 23 12:11:22 UTC 2023 Modified Files: src/sys/arch/riscv/include: frame.h Log Message: Pad the trapframe so it's a multiple of 16 bytes so that when a trapframe is created on the stack SP remains 16-byte aligned as per the ABI requirements. Patch from Rin with some updates from me. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/frame.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/paxctl
Module Name:src Committed By: uwe Date: Fri Jun 23 10:27:12 UTC 2023 Modified Files: src/usr.sbin/paxctl: paxctl.8 Log Message: paxctl(8): brush up Tell the user how to list flags right away, not at the very end. Do not repeat "for the program" 6 times for each flag letter, it's a noise by itself already and the italics of .Ar program exacerbates it. Make the list of flags compact but manually add breaks between the pairs of enable/disable flags. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/paxctl/paxctl.8 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/paxctl/paxctl.8 diff -u src/usr.sbin/paxctl/paxctl.8:1.19 src/usr.sbin/paxctl/paxctl.8:1.20 --- src/usr.sbin/paxctl/paxctl.8:1.19 Fri Jun 23 10:12:33 2023 +++ src/usr.sbin/paxctl/paxctl.8 Fri Jun 23 10:27:12 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: paxctl.8,v 1.19 2023/06/23 10:12:33 uwe Exp $ +.\" $NetBSD: paxctl.8,v 1.20 2023/06/23 10:27:12 uwe Exp $ .\" .\" Copyright 2006 Elad Efrat .\" Copyright 2008 Christos Zoulas @@ -44,9 +44,17 @@ can be found in the .Xr security 7 manpage. .Pp +To view existing flags on a +.Ar program , +execute +.Nm +without any flags. +.Pp If .Fl 0 -option is specified, all PaX flags (including reserved bits) are cleared. +option is specified, all PaX flags +.Pq including reserved bits +are cleared. Otherwise, each flag can be prefixed either with a .Sq Cm + or a @@ -54,38 +62,27 @@ or a sign to add or remove the flag, respectively. .Pp The following flags are available: -.Bl -tag -width Fl +.Pp +.Bl -tag -width Ds -compact .It Cm a -Explicitly disable PaX ASLR (Address Space Layout Randomization) for -.Ar program . +Explicitly disable PaX ASLR (Address Space Layout Randomization). .It Cm A -Explicitly enable PaX ASLR for -.Ar program . +Explicitly enable PaX ASLR. +.Pp .It Cm g -Explicitly disable PaX Segvguard for -.Ar program . +Explicitly disable PaX Segvguard. .It Cm G -Explicitly enable PaX Segvguard for -.Ar program . +Explicitly enable PaX Segvguard. +.Pp .It Cm m Explicitly disable PaX MPROTECT .Po Xr mprotect 2 restrictions -.Pc -for -.Ar program . +.Pc . .It Cm M -Explicitly enable PaX MPROTECT -.Po Xr mprotect 2 -restrictions -.Pc -for -.Ar program . +Explicitly enable PaX MPROTECT. .El -.Pp -To view existing flags on a file, execute -.Nm -without any flags. +. .Sh SEE ALSO .Xr mprotect 2 , .Xr sysctl 3 ,
CVS commit: src/usr.sbin/paxctl
Module Name:src Committed By: uwe Date: Fri Jun 23 10:27:12 UTC 2023 Modified Files: src/usr.sbin/paxctl: paxctl.8 Log Message: paxctl(8): brush up Tell the user how to list flags right away, not at the very end. Do not repeat "for the program" 6 times for each flag letter, it's a noise by itself already and the italics of .Ar program exacerbates it. Make the list of flags compact but manually add breaks between the pairs of enable/disable flags. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/paxctl/paxctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/paxctl
Module Name:src Committed By: uwe Date: Fri Jun 23 10:12:33 UTC 2023 Modified Files: src/usr.sbin/paxctl: paxctl.8 Log Message: paxctl(8): fix markup To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/paxctl/paxctl.8 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/paxctl/paxctl.8 diff -u src/usr.sbin/paxctl/paxctl.8:1.18 src/usr.sbin/paxctl/paxctl.8:1.19 --- src/usr.sbin/paxctl/paxctl.8:1.18 Fri Jun 23 06:32:27 2023 +++ src/usr.sbin/paxctl/paxctl.8 Fri Jun 23 10:12:33 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: paxctl.8,v 1.18 2023/06/23 06:32:27 wiz Exp $ +.\" $NetBSD: paxctl.8,v 1.19 2023/06/23 10:12:33 uwe Exp $ .\" .\" Copyright 2006 Elad Efrat .\" Copyright 2008 Christos Zoulas @@ -31,7 +31,7 @@ .Nd list and modify PaX flags associated with an ELF program .Sh SYNOPSIS .Nm -.Op Fl 0 | Cm flags +.Op Fl 0 | Ar flags .Ar program ... .Sh DESCRIPTION The @@ -48,33 +48,33 @@ If .Fl 0 option is specified, all PaX flags (including reserved bits) are cleared. Otherwise, each flag can be prefixed either with a -.Dq + +.Sq Cm + or a -.Dq - +.Sq Fl sign to add or remove the flag, respectively. .Pp The following flags are available: -.Bl -tag -width flag -.It a +.Bl -tag -width Fl +.It Cm a Explicitly disable PaX ASLR (Address Space Layout Randomization) for .Ar program . -.It A +.It Cm A Explicitly enable PaX ASLR for .Ar program . -.It g +.It Cm g Explicitly disable PaX Segvguard for .Ar program . -.It G +.It Cm G Explicitly enable PaX Segvguard for .Ar program . -.It m +.It Cm m Explicitly disable PaX MPROTECT .Po Xr mprotect 2 restrictions .Pc for .Ar program . -.It M +.It Cm M Explicitly enable PaX MPROTECT .Po Xr mprotect 2 restrictions @@ -112,11 +112,12 @@ The .Nm utility currently uses .Xr elf 5 -.Dq note -sections to mark executables as having PaX flags enabled. +note sections to mark executables as having PaX flags enabled. This will be done using .Xr fileassoc 9 in the future so that we can control who does the marking and not altering the binary file signature. -(Note this also means that -at present any flags set do not survive binary file upgrades.) +.Po +Note this also means that +at present any flags set do not survive binary file upgrades +.Pc .
CVS commit: src/usr.sbin/paxctl
Module Name:src Committed By: uwe Date: Fri Jun 23 10:12:33 UTC 2023 Modified Files: src/usr.sbin/paxctl: paxctl.8 Log Message: paxctl(8): fix markup To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/paxctl/paxctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/paxctl
Module Name:src Committed By: wiz Date: Fri Jun 23 06:32:28 UTC 2023 Modified Files: src/usr.sbin/paxctl: paxctl.8 Log Message: Use Fl for options. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/paxctl/paxctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/paxctl
Module Name:src Committed By: wiz Date: Fri Jun 23 06:32:28 UTC 2023 Modified Files: src/usr.sbin/paxctl: paxctl.8 Log Message: Use Fl for options. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/paxctl/paxctl.8 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/paxctl/paxctl.8 diff -u src/usr.sbin/paxctl/paxctl.8:1.17 src/usr.sbin/paxctl/paxctl.8:1.18 --- src/usr.sbin/paxctl/paxctl.8:1.17 Fri Jun 23 01:56:21 2023 +++ src/usr.sbin/paxctl/paxctl.8 Fri Jun 23 06:32:27 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: paxctl.8,v 1.17 2023/06/23 01:56:21 rin Exp $ +.\" $NetBSD: paxctl.8,v 1.18 2023/06/23 06:32:27 wiz Exp $ .\" .\" Copyright 2006 Elad Efrat .\" Copyright 2008 Christos Zoulas @@ -31,7 +31,7 @@ .Nd list and modify PaX flags associated with an ELF program .Sh SYNOPSIS .Nm -.Op -0 | flags +.Op Fl 0 | Cm flags .Ar program ... .Sh DESCRIPTION The
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Fri Jun 23 06:11:06 UTC 2023
Modified Files:
src/usr.bin/make/unit-tests: directive-for-escape.exp
directive-for-escape.mk
Log Message:
tests/make: explain and extend tests for expansion in .for loops
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/usr.bin/make/unit-tests/directive-for-escape.exp
cvs rdiff -u -r1.20 -r1.21 \
src/usr.bin/make/unit-tests/directive-for-escape.mk
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/make/unit-tests/directive-for-escape.exp
diff -u src/usr.bin/make/unit-tests/directive-for-escape.exp:1.21 src/usr.bin/make/unit-tests/directive-for-escape.exp:1.22
--- src/usr.bin/make/unit-tests/directive-for-escape.exp:1.21 Thu Jun 1 20:56:35 2023
+++ src/usr.bin/make/unit-tests/directive-for-escape.exp Fri Jun 23 06:11:06 2023
@@ -25,6 +25,22 @@ For: loop body with i = $(V:=-with-modif
. info ${:U$(V:=-with-modifier)}
make: "directive-for-escape.mk" line 45: value-with-modifier
For: end for 1
+For: loop body with i = $:
+. info ${:U\$}
+make: "directive-for-escape.mk" line 60: $
+For: loop body with i = ${V}:
+. info ${:U${V}}
+make: "directive-for-escape.mk" line 60: value
+For: loop body with i = ${V:=-with-modifier}:
+. info ${:U${V:=-with-modifier}}
+make: "directive-for-escape.mk" line 60: value-with-modifier
+For: loop body with i = $(V):
+. info ${:U$(V)}
+make: "directive-for-escape.mk" line 60: value
+For: loop body with i = $(V:=-with-modifier):
+. info ${:U$(V:=-with-modifier)}
+make: "directive-for-escape.mk" line 60: value-with-modifier
+For: end for 1
For: loop body with i = ${UNDEF:U\$\$:
# ${:U\${UNDEF\:U\\$\\$}
For: loop body with i = {{}}:
@@ -34,24 +50,24 @@ For: loop body with i = end}:
For: end for 1
For: loop body with i = ${UNDEF:U\$\$:
. info ${:U\${UNDEF\:U\\$\\$}
-make: "directive-for-escape.mk" line 99: ${UNDEF:U\backslash$
+make: "directive-for-escape.mk" line 115: ${UNDEF:U\backslash$
For: loop body with i = {{}}:
. info ${:U{{\}\}}
-make: "directive-for-escape.mk" line 99: {{}}
+make: "directive-for-escape.mk" line 115: {{}}
For: loop body with i = end}:
. info ${:Uend\}}
-make: "directive-for-escape.mk" line 99: end}
+make: "directive-for-escape.mk" line 115: end}
For: end for 1
For: loop body with i = begin<${UNDEF:Ufallback:N{{{>end:
. info ${:Ubegin<${UNDEF:Ufallback:N{{{>end}
-make: "directive-for-escape.mk" line 120: beginend
+make: "directive-for-escape.mk" line 136: beginend
For: end for 1
For: loop body with i = $:
. info ${:U\$}
-make: "directive-for-escape.mk" line 129: $
-make: "directive-for-escape.mk" line 138: invalid character ':' in .for loop variable name
+make: "directive-for-escape.mk" line 145: $
+make: "directive-for-escape.mk" line 154: invalid character ':' in .for loop variable name
For: end for 1
-make: "directive-for-escape.mk" line 148: invalid character '}' in .for loop variable name
+make: "directive-for-escape.mk" line 164: invalid character '}' in .for loop variable name
For: end for 1
For: end for 1
For: loop body with i = inner:
@@ -65,45 +81,45 @@ For: loop body with i = inner:
. info . $${i2}: ${i2}
. info . $${i,}: ${i,}
. info . adjacent: ${:Uinner}${:Uinner}${:Uinner:M*}${:Uinner}
-make: "directive-for-escape.mk" line 157: .$i: inner
-make: "directive-for-escape.mk" line 158: . ${i}: inner
-make: "directive-for-escape.mk" line 159: . ${i:M*}: inner
-make: "directive-for-escape.mk" line 160: . $(i): inner
-make: "directive-for-escape.mk" line 161: . $(i:M*): inner
-make: "directive-for-escape.mk" line 162: . ${i${:U}}: outer
-make: "directive-for-escape.mk" line 163: .${i\}}: inner}
-make: "directive-for-escape.mk" line 164: . ${i2}: two
-make: "directive-for-escape.mk" line 165: . ${i,}: comma
-make: "directive-for-escape.mk" line 166: . adjacent: innerinnerinnerinner
-make: "directive-for-escape.mk" line 185: invalid character '$' in .for loop variable name
+make: "directive-for-escape.mk" line 173: .$i: inner
+make: "directive-for-escape.mk" line 174: . ${i}: inner
+make: "directive-for-escape.mk" line 175: . ${i:M*}: inner
+make: "directive-for-escape.mk" line 176: . $(i): inner
+make: "directive-for-escape.mk" line 177: . $(i:M*): inner
+make: "directive-for-escape.mk" line 178: . ${i${:U}}: outer
+make: "directive-for-escape.mk" line 179: .${i\}}: inner}
+make: "directive-for-escape.mk" line 180: . ${i2}: two
+make: "directive-for-escape.mk" line 181: . ${i,}: comma
+make: "directive-for-escape.mk" line 182: . adjacent: innerinnerinnerinner
+make: "directive-for-escape.mk" line 201: invalid character '$' in .for loop variable name
For: end for 1
-make: "directive-for-escape.mk" line 197: eight and no cents.
+make: "directive-for-escape.mk" line 213: eight and no cents.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Fri Jun 23 06:11:06 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: directive-for-escape.exp directive-for-escape.mk Log Message: tests/make: explain and extend tests for expansion in .for loops To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 \ src/usr.bin/make/unit-tests/directive-for-escape.exp cvs rdiff -u -r1.20 -r1.21 \ src/usr.bin/make/unit-tests/directive-for-escape.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Fri Jun 23 06:08:56 UTC 2023 Modified Files: src/usr.bin/make: parse.c Log Message: make: sync a comment with reality No binary change. To generate a diff of this commit: cvs rdiff -u -r1.703 -r1.704 src/usr.bin/make/parse.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/make
Module Name:src
Committed By: rillig
Date: Fri Jun 23 06:08:56 UTC 2023
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make: sync a comment with reality
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.703 -r1.704 src/usr.bin/make/parse.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/make/parse.c
diff -u src/usr.bin/make/parse.c:1.703 src/usr.bin/make/parse.c:1.704
--- src/usr.bin/make/parse.c:1.703 Wed Jun 21 14:33:36 2023
+++ src/usr.bin/make/parse.c Fri Jun 23 06:08:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.703 2023/06/21 14:33:36 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.704 2023/06/23 06:08:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.703 2023/06/21 14:33:36 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.704 2023/06/23 06:08:56 rillig Exp $");
/* Detects a multiple-inclusion guard in a makefile. */
typedef enum {
@@ -133,7 +133,7 @@ typedef struct IncludedFile {
Buffer buf; /* the file's content or the body of the .for
* loop; either empty or ends with '\n' */
- char *buf_ptr; /* next char to be read */
+ char *buf_ptr; /* next char to be read from buf */
char *buf_end; /* buf_end[-1] == '\n' */
GuardState guardState;
@@ -426,8 +426,8 @@ IsEscaped(const char *line, const char *
}
/*
- * Add the filename and lineno to the GNode so that we remember where it
- * was first defined.
+ * Add the filename and lineno to the GNode so that we remember where its
+ * last command was added or where it was mentioned in a .depend file.
*/
static void
RememberLocation(GNode *gn)
