CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 6 21:35:48 UTC 2024
Modified Files:
src/usr.bin/make: main.c
Log Message:
make: clean up condition when printing an error
To generate a diff of this commit:
cvs rdiff -u -r1.627 -r1.628 src/usr.bin/make/main.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/main.c
diff -u src/usr.bin/make/main.c:1.627 src/usr.bin/make/main.c:1.628
--- src/usr.bin/make/main.c:1.627 Fri Jul 5 05:11:25 2024
+++ src/usr.bin/make/main.c Sat Jul 6 21:35:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.627 2024/07/05 05:11:25 rillig Exp $ */
+/* $NetBSD: main.c,v 1.628 2024/07/06 21:35:48 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.627 2024/07/05 05:11:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.628 2024/07/06 21:35:48 rillig Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -2084,8 +2084,7 @@ PrintOnError(GNode *gn, const char *msg)
printf("%s", (const char *)ln->datum);
for (ln = ln->next; ln != NULL; ln = ln->next)
printf(" %s", (const char *)ln->datum);
- }
- if (opts.create.first == NULL && mainNode != NULL)
+ } else
printf("%s", mainNode->name);
printf("\"");
}
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat Jul 6 21:35:48 UTC 2024 Modified Files: src/usr.bin/make: main.c Log Message: make: clean up condition when printing an error To generate a diff of this commit: cvs rdiff -u -r1.627 -r1.628 src/usr.bin/make/main.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: Sat Jul 6 21:21:10 UTC 2024 Modified Files: src/usr.bin/make: cond.c src/usr.bin/make/unit-tests: cond-func.exp cond-func.mk cond-op-and.exp cond-op-and.mk cond-op-or.exp cond-op-or.mk Log Message: make: error out on conditions containing the operators '&' and '|' These abbreviated variants of the '&&' and '||' operators were never documented, so error out in non-lint mode as well. To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.366 src/usr.bin/make/cond.c cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/cond-func.exp \ src/usr.bin/make/unit-tests/cond-op-and.mk cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/cond-func.mk cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cond-op-and.exp cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cond-op-or.exp cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/cond-op-or.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/unit-tests
Module Name:src
Committed By: rillig
Date: Sat Jul 6 11:09:17 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: varmod-edge.mk
Log Message:
tests/make: sync a comment with reality
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/make/unit-tests/varmod-edge.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/varmod-edge.mk
diff -u src/usr.bin/make/unit-tests/varmod-edge.mk:1.27 src/usr.bin/make/unit-tests/varmod-edge.mk:1.28
--- src/usr.bin/make/unit-tests/varmod-edge.mk:1.27 Sat Jul 6 10:36:23 2024
+++ src/usr.bin/make/unit-tests/varmod-edge.mk Sat Jul 6 11:09:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-edge.mk,v 1.27 2024/07/06 10:36:23 rillig Exp $
+# $NetBSD: varmod-edge.mk,v 1.28 2024/07/06 11:09:17 rillig Exp $
#
# Tests for edge cases in variable modifiers.
#
@@ -74,8 +74,8 @@ EXP= [
. warning expected "${EXP}", got "${MOD}"
.endif
+
# The pattern in the nested variable has an unclosed character class.
-# No error is reported though, and the pattern is closed implicitly.
#
# Before str.c 1.104 from 2024-07-06, no error was reported.
#
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sat Jul 6 11:09:17 UTC 2024 Modified Files: src/usr.bin/make/unit-tests: varmod-edge.mk Log Message: tests/make: sync a comment with reality To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/make/unit-tests/varmod-edge.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: andvar Date: Sat Jul 6 10:37:33 UTC 2024 Modified Files: src/sys/dev/scsipi: if_dse.c Log Message: s/occurence/occurrence/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/scsipi/if_dse.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/scsipi/if_dse.c diff -u src/sys/dev/scsipi/if_dse.c:1.5 src/sys/dev/scsipi/if_dse.c:1.6 --- src/sys/dev/scsipi/if_dse.c:1.5 Mon Jan 1 22:29:48 2024 +++ src/sys/dev/scsipi/if_dse.c Sat Jul 6 10:37:33 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_dse.c,v 1.5 2024/01/01 22:29:48 gutteridge Exp $ */ +/* $NetBSD: if_dse.c,v 1.6 2024/07/06 10:37:33 andvar Exp $ */ /* * Driver for DaynaPORT SCSI/Link SCSI-Ethernet @@ -1364,7 +1364,7 @@ dseopen(dev_t dev, int flag, int fmt, st /* * close the device.. only called if we are the LAST - * occurence of an open device + * occurrence of an open device */ int dseclose(dev_t dev, int flag, int fmt, struct lwp *l)
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: andvar Date: Sat Jul 6 10:37:33 UTC 2024 Modified Files: src/sys/dev/scsipi: if_dse.c Log Message: s/occurence/occurrence/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/scsipi/if_dse.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: Sat Jul 6 10:36:23 UTC 2024 Modified Files: src/usr.bin/make: str.c src/usr.bin/make/unit-tests: varmod-edge.exp varmod-edge.mk Log Message: make: error out on a matching malformed matching pattern '[[' To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/usr.bin/make/str.c cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/unit-tests/varmod-edge.exp cvs rdiff -u -r1.26 -r1.27 src/usr.bin/make/unit-tests/varmod-edge.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: Sat Jul 6 10:36:23 UTC 2024
Modified Files:
src/usr.bin/make: str.c
src/usr.bin/make/unit-tests: varmod-edge.exp varmod-edge.mk
Log Message:
make: error out on a matching malformed matching pattern '[['
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/usr.bin/make/str.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/unit-tests/varmod-edge.exp
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/make/unit-tests/varmod-edge.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/str.c
diff -u src/usr.bin/make/str.c:1.103 src/usr.bin/make/str.c:1.104
--- src/usr.bin/make/str.c:1.103 Sun Apr 14 15:21:20 2024
+++ src/usr.bin/make/str.c Sat Jul 6 10:36:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.103 2024/04/14 15:21:20 rillig Exp $ */
+/* $NetBSD: str.c,v 1.104 2024/07/06 10:36:23 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -71,7 +71,7 @@
#include "make.h"
/* "@(#)str.c 5.8 (Berkeley) 6/1/90" */
-MAKE_RCSID("$NetBSD: str.c,v 1.103 2024/04/14 15:21:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: str.c,v 1.104 2024/07/06 10:36:23 rillig Exp $");
static HashTable interned_strings;
@@ -356,8 +356,10 @@ match_fixed_length:
goto no_match;
while (*pat != ']' && *pat != '\0')
pat++;
- if (*pat == '\0')
+ if (*pat == '\0') {
+res.error = "Unfinished character list";
pat--;
+ }
continue;
}
Index: src/usr.bin/make/unit-tests/varmod-edge.exp
diff -u src/usr.bin/make/unit-tests/varmod-edge.exp:1.24 src/usr.bin/make/unit-tests/varmod-edge.exp:1.25
--- src/usr.bin/make/unit-tests/varmod-edge.exp:1.24 Sat Jul 6 10:14:35 2024
+++ src/usr.bin/make/unit-tests/varmod-edge.exp Sat Jul 6 10:36:23 2024
@@ -1,4 +1,5 @@
make: "varmod-edge.mk" line 60: while evaluating variable "MOD" with value "${INP:M${:U*)}}": while evaluating variable "INP" with value "(parentheses)": while evaluating "${:U*)" with value "*)": Unclosed expression, expecting '}' for modifier "U*)"
+make: "varmod-edge.mk" line 88: warning: while evaluating variable "MOD" with value "${INP:M${:U[[}}": while evaluating variable "INP" with value "[ [[ [[[": Unfinished character list in pattern '[[' of modifier ':M'
make: "varmod-edge.mk" line 178: while evaluating variable "MOD" with value "${INP:a\=b}": while evaluating variable "INP" with value "file.c file...": Unfinished modifier ('=' missing)
make: "varmod-edge.mk" line 194: while evaluating variable "MOD" with value "${INP}": while evaluating variable "INP" with value "value": Unknown modifier ":"
make: "varmod-edge.mk" line 194: while evaluating variable "MOD" with value "${INP}": while evaluating variable "INP" with value "": Unknown modifier ":"
Index: src/usr.bin/make/unit-tests/varmod-edge.mk
diff -u src/usr.bin/make/unit-tests/varmod-edge.mk:1.26 src/usr.bin/make/unit-tests/varmod-edge.mk:1.27
--- src/usr.bin/make/unit-tests/varmod-edge.mk:1.26 Sat Jul 6 10:14:35 2024
+++ src/usr.bin/make/unit-tests/varmod-edge.mk Sat Jul 6 10:36:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-edge.mk,v 1.26 2024/07/06 10:14:35 rillig Exp $
+# $NetBSD: varmod-edge.mk,v 1.27 2024/07/06 10:36:23 rillig Exp $
#
# Tests for edge cases in variable modifiers.
#
@@ -77,14 +77,14 @@ EXP= [
# The pattern in the nested variable has an unclosed character class.
# No error is reported though, and the pattern is closed implicitly.
#
-# XXX: It is unexpected that no error is reported.
-# See str.c, function Str_Match.
+# Before str.c 1.104 from 2024-07-06, no error was reported.
#
# Before 2019-12-02, this test case triggered an out-of-bounds read
# in Str_Match.
INP= [ [[ [[[
MOD= ${INP:M${:U[[}}
EXP= [
+# expect+1: warning: while evaluating variable "MOD" with value "${INP:M${:U[[}}": while evaluating variable "INP" with value "[ [[ [[[": Unfinished character list in pattern '[[' of modifier ':M'
.if ${MOD} != ${EXP}
. warning expected "${EXP}", got "${MOD}"
.endif
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sat Jul 6 10:14:35 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: deptgt.exp deptgt.mk
directive-for-errors.exp directive-for-errors.mk
directive-for-escape.exp directive-for-escape.mk directive-for.exp
directive-for.mk varmod-edge.exp varmod-edge.mk
Log Message:
tests/make: clean up tests
Prefer "expect+X" directives to be above the code generating them,
instead of "expect-X" directives below the code.
In varmod-edge.mk, separate the tests, as the common loop does not pull
its weight.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/deptgt.exp
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/deptgt.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/directive-for-errors.exp
cvs rdiff -u -r1.12 -r1.13 \
src/usr.bin/make/unit-tests/directive-for-errors.mk
cvs rdiff -u -r1.28 -r1.29 \
src/usr.bin/make/unit-tests/directive-for-escape.exp
cvs rdiff -u -r1.26 -r1.27 \
src/usr.bin/make/unit-tests/directive-for-escape.mk \
src/usr.bin/make/unit-tests/directive-for.mk
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/unit-tests/directive-for.exp
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/make/unit-tests/varmod-edge.exp
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/unit-tests/varmod-edge.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/deptgt.exp
diff -u src/usr.bin/make/unit-tests/deptgt.exp:1.16 src/usr.bin/make/unit-tests/deptgt.exp:1.17
--- src/usr.bin/make/unit-tests/deptgt.exp:1.16 Fri Jul 5 20:01:52 2024
+++ src/usr.bin/make/unit-tests/deptgt.exp Sat Jul 6 10:14:35 2024
@@ -8,6 +8,7 @@ ParseDependency(: empty-source)
Parsing line 39: : command for empty targets list
Parsing line 40: .MAKEFLAGS: -d0
ParseDependency(.MAKEFLAGS: -d0)
+make: "deptgt.mk" line 45: while evaluating "${:U:Z}:" with value "": Unknown modifier "Z"
make: "deptgt.mk" line 49: while parsing "${:U:Z}:": Unknown modifier "Z"
make: "deptgt.mk" line 52: warning: Extra target 'ordinary' ignored
make: "deptgt.mk" line 55: warning: Extra target (ordinary) ignored
Index: src/usr.bin/make/unit-tests/deptgt.mk
diff -u src/usr.bin/make/unit-tests/deptgt.mk:1.19 src/usr.bin/make/unit-tests/deptgt.mk:1.20
--- src/usr.bin/make/unit-tests/deptgt.mk:1.19 Fri Jul 5 20:01:52 2024
+++ src/usr.bin/make/unit-tests/deptgt.mk Sat Jul 6 10:14:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: deptgt.mk,v 1.19 2024/07/05 20:01:52 rillig Exp $
+# $NetBSD: deptgt.mk,v 1.20 2024/07/06 10:14:35 rillig Exp $
#
# Tests for special targets like .BEGIN or .SUFFIXES in dependency
# declarations.
@@ -39,14 +39,14 @@ ${:U}: empty-source
: command for empty targets list
.MAKEFLAGS: -d0
-# Just to show that a malformed expression is only expanded once in
-# ParseDependencyTargetWord. The only way to produce an expression that
-# is well-formed on the first expansion and ill-formed on the second
-# expansion would be to use the variable modifier '::=' to modify the
-# targets. This in turn would be such an extreme and unreliable edge case
-# that nobody uses it.
+# In a dependency declaration, the whole line is expanded before interpreting
+# the line.
+# expect+1: while evaluating "${:U:Z}:" with value "": Unknown modifier "Z"
+${:U:Z}:
+# After expanding the line as a whole, each target is parsed but not
+# evaluated, separately, in ParseDependencyTargetWord.
# expect+1: while parsing "${:U:Z}:": Unknown modifier "Z"
-{:U:Z}:
+$${:U:Z}:
# expect+1: warning: Extra target 'ordinary' ignored
.END ordinary:
@@ -56,6 +56,3 @@ {:U:Z}:
# expect+1: warning: Special and mundane targets don't mix. Mundane ones ignored
ordinary .PATH:
-
-all:
- @:;
Index: src/usr.bin/make/unit-tests/directive-for-errors.exp
diff -u src/usr.bin/make/unit-tests/directive-for-errors.exp:1.7 src/usr.bin/make/unit-tests/directive-for-errors.exp:1.8
--- src/usr.bin/make/unit-tests/directive-for-errors.exp:1.7 Fri Jul 5 19:47:22 2024
+++ src/usr.bin/make/unit-tests/directive-for-errors.exp Sat Jul 6 10:14:35 2024
@@ -1,17 +1,17 @@
make: "directive-for-errors.mk" line 9: Unknown directive "fori"
-make: "directive-for-errors.mk" line 10: warning: <>
-make: "directive-for-errors.mk" line 11: for-less endfor
+make: "directive-for-errors.mk" line 11: warning: <>
+make: "directive-for-errors.mk" line 13: for-less endfor
make: "directive-for-errors.mk" line 25: Unknown directive "for"
-make: "directive-for-errors.mk" line 26: warning: <>
-make: "directive-for-errors.mk" line 27: for-less endfor
+make: "directive-for-errors.mk" line 27: warning: <>
+make: "directive-for-errors.mk" line 29: for-less endfor
make: "directive-for-errors.mk" line 44: invalid character '$' in .for loop variable name
make: "directive-for-errors.mk" line 52: no iteration variables in for
make: "directive-for-errors.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sat Jul 6 10:14:35 UTC 2024 Modified Files: src/usr.bin/make/unit-tests: deptgt.exp deptgt.mk directive-for-errors.exp directive-for-errors.mk directive-for-escape.exp directive-for-escape.mk directive-for.exp directive-for.mk varmod-edge.exp varmod-edge.mk Log Message: tests/make: clean up tests Prefer "expect+X" directives to be above the code generating them, instead of "expect-X" directives below the code. In varmod-edge.mk, separate the tests, as the common loop does not pull its weight. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/deptgt.exp cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/deptgt.mk cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/directive-for-errors.exp cvs rdiff -u -r1.12 -r1.13 \ src/usr.bin/make/unit-tests/directive-for-errors.mk cvs rdiff -u -r1.28 -r1.29 \ src/usr.bin/make/unit-tests/directive-for-escape.exp cvs rdiff -u -r1.26 -r1.27 \ src/usr.bin/make/unit-tests/directive-for-escape.mk \ src/usr.bin/make/unit-tests/directive-for.mk cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/unit-tests/directive-for.exp cvs rdiff -u -r1.23 -r1.24 src/usr.bin/make/unit-tests/varmod-edge.exp cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/unit-tests/varmod-edge.mk 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: andvar
Date: Sat Jul 6 10:09:15 UTC 2024
Modified Files:
src/sys/arch/atari/dev: zs.c
src/sys/dev/i2o: dptivar.h
src/sys/dev/ic: hd64570reg.h
src/sys/dev/pci: if_ntwoc_pcireg.h
src/sys/netinet6: sctp6_usrreq.c
Log Message:
Fix various typos in comments:
s/defininitions/definitions/
s/ininitialise/initialise/
s/collasped/collapsed/
s/optionaly/optionally/
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/atari/dev/zs.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2o/dptivar.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/hd64570reg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_ntwoc_pcireg.h
cvs rdiff -u -r1.25 -r1.26 src/sys/netinet6/sctp6_usrreq.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/atari/dev/zs.c
diff -u src/sys/arch/atari/dev/zs.c:1.81 src/sys/arch/atari/dev/zs.c:1.82
--- src/sys/arch/atari/dev/zs.c:1.81 Fri Jan 6 10:28:28 2023
+++ src/sys/arch/atari/dev/zs.c Sat Jul 6 10:09:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.81 2023/01/06 10:28:28 tsutsui Exp $ */
+/* $NetBSD: zs.c,v 1.82 2024/07/06 10:09:15 andvar Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.81 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.82 2024/07/06 10:09:15 andvar Exp $");
#include
#include
@@ -330,7 +330,7 @@ zsattach(device_t parent, device_t self,
if (machineid & ATARI_TT) {
/*
- * ininitialise TT-MFP timer C: 307200Hz
+ * initialise TT-MFP timer C: 307200Hz
* timer C and D share one control register:
* bits 0-2 control timer D
* bits 4-6 control timer C
Index: src/sys/dev/i2o/dptivar.h
diff -u src/sys/dev/i2o/dptivar.h:1.10 src/sys/dev/i2o/dptivar.h:1.11
--- src/sys/dev/i2o/dptivar.h:1.10 Mon Nov 1 21:28:03 2021
+++ src/sys/dev/i2o/dptivar.h Sat Jul 6 10:09:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dptivar.h,v 1.10 2021/11/01 21:28:03 andvar Exp $ */
+/* $NetBSD: dptivar.h,v 1.11 2024/07/06 10:09:15 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -217,7 +217,7 @@ struct dpt_sysinfo {
u_int8_t osMinorVersion; /* The OS version */
u_int8_t osRevision;
u_int8_t osSubRevision;
- u_int8_t busType;/* See defininitions above */
+ u_int8_t busType;/* See definitions above */
u_int8_t pad[3]; /* For alignment */
struct dpt_dparam drives[16]; /* SmartROM Logical Drives */
};
Index: src/sys/dev/ic/hd64570reg.h
diff -u src/sys/dev/ic/hd64570reg.h:1.12 src/sys/dev/ic/hd64570reg.h:1.13
--- src/sys/dev/ic/hd64570reg.h:1.12 Tue May 14 19:00:44 2024
+++ src/sys/dev/ic/hd64570reg.h Sat Jul 6 10:09:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570reg.h,v 1.12 2024/05/14 19:00:44 andvar Exp $ */
+/* $NetBSD: hd64570reg.h,v 1.13 2024/07/06 10:09:15 andvar Exp $ */
/*
* Copyright (c) 1998 Vixie Enterprises
@@ -79,7 +79,7 @@ struct hdlc_llc_header {
};
/*
- * Hitachi HD64570 defininitions
+ * Hitachi HD64570 definitions
*/
/* SCA Control Registers */
Index: src/sys/dev/pci/if_ntwoc_pcireg.h
diff -u src/sys/dev/pci/if_ntwoc_pcireg.h:1.5 src/sys/dev/pci/if_ntwoc_pcireg.h:1.6
--- src/sys/dev/pci/if_ntwoc_pcireg.h:1.5 Sun Dec 11 12:22:49 2005
+++ src/sys/dev/pci/if_ntwoc_pcireg.h Sat Jul 6 10:09:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_pcireg.h,v 1.5 2005/12/11 12:22:49 christos Exp $ */
+/* $NetBSD: if_ntwoc_pcireg.h,v 1.6 2024/07/06 10:09:15 andvar Exp $ */
/*
* Copyright (c) 1998 Vixie Enterprises
@@ -117,7 +117,7 @@
#define NTWOC_FE_ID_NONE 0x07 /* empty, no card present */
/*
- * ASIC Control defininitions
+ * ASIC Control definitions
*/
/* Front End (Modem,etc) Control Register */
Index: src/sys/netinet6/sctp6_usrreq.c
diff -u src/sys/netinet6/sctp6_usrreq.c:1.25 src/sys/netinet6/sctp6_usrreq.c:1.26
--- src/sys/netinet6/sctp6_usrreq.c:1.25 Fri Jul 5 04:31:54 2024
+++ src/sys/netinet6/sctp6_usrreq.c Sat Jul 6 10:09:15 2024
@@ -1,5 +1,5 @@
/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
-/* $NetBSD: sctp6_usrreq.c,v 1.25 2024/07/05 04:31:54 rin Exp $ */
+/* $NetBSD: sctp6_usrreq.c,v 1.26 2024/07/06 10:09:15 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.25 2024/07/05 04:31:54 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.26 2024/07/06 10:09:15 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -495,7 +495,7 @@ sctp6_ctlinput(int cmd, const struct soc
}
/*
- * this routine can probably be collasped into the one in sctp_userreq.c
+ * this routine can probably be collapsed into the one in sctp_userreq.c
* since they do the same thing and now we lookup with a sockaddr
*/
#ifdef __FreeBSD__
@@
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Sat Jul 6 10:09:15 UTC 2024 Modified Files: src/sys/arch/atari/dev: zs.c src/sys/dev/i2o: dptivar.h src/sys/dev/ic: hd64570reg.h src/sys/dev/pci: if_ntwoc_pcireg.h src/sys/netinet6: sctp6_usrreq.c Log Message: Fix various typos in comments: s/defininitions/definitions/ s/ininitialise/initialise/ s/collasped/collapsed/ s/optionaly/optionally/ To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/arch/atari/dev/zs.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2o/dptivar.h cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/hd64570reg.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_ntwoc_pcireg.h cvs rdiff -u -r1.25 -r1.26 src/sys/netinet6/sctp6_usrreq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/examples/executor
Module Name:src
Committed By: andvar
Date: Sat Jul 6 09:53:19 UTC 2024
Modified Files:
src/sys/modules/examples/executor: executor.c
Log Message:
s/elasped/elapsed/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/executor/executor.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/modules/examples/executor/executor.c
diff -u src/sys/modules/examples/executor/executor.c:1.2 src/sys/modules/examples/executor/executor.c:1.3
--- src/sys/modules/examples/executor/executor.c:1.2 Sat Dec 14 15:36:08 2019
+++ src/sys/modules/examples/executor/executor.c Sat Jul 6 09:53:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: executor.c,v 1.2 2019/12/14 15:36:08 ad Exp $ */
+/* $NetBSD: executor.c,v 1.3 2024/07/06 09:53:19 andvar Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: executor.c,v 1.2 2019/12/14 15:36:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: executor.c,v 1.3 2024/07/06 09:53:19 andvar Exp $");
#include
#include
@@ -68,7 +68,7 @@ runonce_example(void) {
/*
* callout_example : This function should get executed every second.
* It calls runonce_example each time.
- * It prints the seconds elasped after the module was loaded.
+ * It prints the seconds elapsed after the module was loaded.
* It reschedules the callout to the next second using callout_schedule
*/
CVS commit: src/sys/modules/examples/executor
Module Name:src Committed By: andvar Date: Sat Jul 6 09:53:19 UTC 2024 Modified Files: src/sys/modules/examples/executor: executor.c Log Message: s/elasped/elapsed/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/executor/executor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/getty
Module Name:src Committed By: simonb Date: Sat Jul 6 07:24:02 UTC 2024 Modified Files: src/libexec/getty: ttys.5 Log Message: Use the more BSDish "kill -HUP" rather than alien^Wposix style "kill -s HUP". To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/libexec/getty/ttys.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/getty
Module Name:src Committed By: simonb Date: Sat Jul 6 07:24:02 UTC 2024 Modified Files: src/libexec/getty: ttys.5 Log Message: Use the more BSDish "kill -HUP" rather than alien^Wposix style "kill -s HUP". To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/libexec/getty/ttys.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/getty/ttys.5 diff -u src/libexec/getty/ttys.5:1.23 src/libexec/getty/ttys.5:1.24 --- src/libexec/getty/ttys.5:1.23 Thu Jul 4 15:50:22 2024 +++ src/libexec/getty/ttys.5 Sat Jul 6 07:24:01 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: ttys.5,v 1.23 2024/07/04 15:50:22 uwe Exp $ +.\" $NetBSD: ttys.5,v 1.24 2024/07/06 07:24:01 simonb Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)ttys.5 8.1 (Berkeley) 6/4/93 .\" -.Dd April 5, 2012 +.Dd July 6, 2024 .Dt TTYS 5 .Os .Sh NAME @@ -187,7 +187,7 @@ signal can be sent to .Xr init 8 with the command .Pp -.Dl kill -s HUP 1 +.Dl kill -HUP 1 .Pp On receipt of this signal, .Xr init 8
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mlelstv Date: Sat Jul 6 07:09:22 UTC 2024 Modified Files: src/sys/dev/usb: if_cdce.c Log Message: There is no link state for CDCE. Pretend that the link is always up so that programs like dhcpcd will handle the interface. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/dev/usb/if_cdce.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mlelstv Date: Sat Jul 6 07:09:22 UTC 2024 Modified Files: src/sys/dev/usb: if_cdce.c Log Message: There is no link state for CDCE. Pretend that the link is always up so that programs like dhcpcd will handle the interface. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/dev/usb/if_cdce.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/usb/if_cdce.c diff -u src/sys/dev/usb/if_cdce.c:1.81 src/sys/dev/usb/if_cdce.c:1.82 --- src/sys/dev/usb/if_cdce.c:1.81 Thu Mar 3 05:56:28 2022 +++ src/sys/dev/usb/if_cdce.c Sat Jul 6 07:09:22 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cdce.c,v 1.81 2022/03/03 05:56:28 riastradh Exp $ */ +/* $NetBSD: if_cdce.c,v 1.82 2024/07/06 07:09:22 mlelstv Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.81 2022/03/03 05:56:28 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.82 2024/07/06 07:09:22 mlelstv Exp $"); #include @@ -251,6 +251,9 @@ cdce_attach(device_t parent, device_t se usbnet_attach(un); usbnet_attach_ifp(un, IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST, 0, NULL); + + /* XXX There is no link state, pretend we are always on */ + if_link_state_change(usbnet_ifp(un), LINK_STATE_UP); } static void
