CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: skrll Date: Sun Jul 5 05:16:51 UTC 2020 Modified Files: src/sys/arch/arm/sunxi: sunxi_nand.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/sunxi/sunxi_nand.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/sunxi/sunxi_nand.c diff -u src/sys/arch/arm/sunxi/sunxi_nand.c:1.6 src/sys/arch/arm/sunxi/sunxi_nand.c:1.7 --- src/sys/arch/arm/sunxi/sunxi_nand.c:1.6 Mon Sep 3 16:29:24 2018 +++ src/sys/arch/arm/sunxi/sunxi_nand.c Sun Jul 5 05:16:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_nand.c,v 1.6 2018/09/03 16:29:24 riastradh Exp $ */ +/* $NetBSD: sunxi_nand.c,v 1.7 2020/07/05 05:16:50 skrll Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sunxi_nand.c,v 1.6 2018/09/03 16:29:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_nand.c,v 1.7 2020/07/05 05:16:50 skrll Exp $"); #include #include @@ -688,7 +688,7 @@ sunxi_nand_attach(device_t parent, devic sunxi_nand_attach_chip(sc, >sc_chip, child); } - + CFATTACH_DECL_NEW(sunxi_nand, sizeof(struct sunxi_nand_softc), sunxi_nand_match, sunxi_nand_attach, NULL, NULL);
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Sun Jul 5 03:44:13 UTC 2020 Modified Files: src/share/man/man4: speaker.4 Log Message: Fix the include file name in the synopsis. While here, drop the device path from synopsis, its place is in the files section. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/share/man/man4/speaker.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/speaker.4 diff -u src/share/man/man4/speaker.4:1.29 src/share/man/man4/speaker.4:1.30 --- src/share/man/man4/speaker.4:1.29 Sun Jul 5 01:05:01 2020 +++ src/share/man/man4/speaker.4 Sun Jul 5 03:44:13 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: speaker.4,v 1.29 2020/07/05 01:05:01 uwe Exp $ +.\" $NetBSD: speaker.4,v 1.30 2020/07/05 03:44:13 uwe Exp $ .\" .\" Copyright (c) 2016 Nathanial Sloss .\" All rights reserved. @@ -45,8 +45,7 @@ .Cd "spkr* at pcppi?" .Cd "spkr* at audio?" .Pp -.In machine/spkr.h -.Pa /dev/speaker +.In dev/spkrio.h .Sh DESCRIPTION The speaker device driver allows applications to control the console speaker on machines with a PC-like 8253 timer implementation or a synthesized
CVS commit: src/doc
Module Name:src Committed By: pgoyette Date: Sun Jul 5 02:04:25 UTC 2020 Modified Files: src/doc: TODO.modules Log Message: Note that the xen vs non-xen issue has been resolved by recent commit from Chuck Silvers. (Also add xref to PR port-xen/53130 for history.) To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/doc/TODO.modules Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.modules diff -u src/doc/TODO.modules:1.21 src/doc/TODO.modules:1.22 --- src/doc/TODO.modules:1.21 Sun Dec 8 15:51:49 2019 +++ src/doc/TODO.modules Sun Jul 5 02:04:25 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: TODO.modules,v 1.21 2019/12/08 15:51:49 pgoyette Exp $ */ +/* $NetBSD: TODO.modules,v 1.22 2020/07/05 02:04:25 pgoyette Exp $ */ Some notes on the limitations of our current (as of 7.99.35) module subsystem. This list was triggered by an Email exchange between @@ -233,6 +233,9 @@ christos and pgoyette. building xen-variant modules (on amd4, and likely i386). In some cases, wrong headers are included (because a XEN-related #define is missing), but even if you add the definition some headers get -included in the wrong order. On particular fallout from this is +included in the wrong order. One particular fallout from this is the inability to have a compat version of x86_64 cpu-microcode -module. +module. PR port-xen/53130 + +This is likely to be fixed by Chuck Silvers on 2020-07-04 which +removed the differences between the xen and non-xen module ABIs.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: christos Date: Sun Jul 5 01:09:48 UTC 2020 Modified Files: src/lib/libc/gen: Makefile.inc endutxent.3 Log Message: revert previous; utmpxname is already documented in getlastlogx.3. Should probably be moved. To generate a diff of this commit: cvs rdiff -u -r1.204 -r1.205 src/lib/libc/gen/Makefile.inc cvs rdiff -u -r1.6 -r1.7 src/lib/libc/gen/endutxent.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/Makefile.inc diff -u src/lib/libc/gen/Makefile.inc:1.204 src/lib/libc/gen/Makefile.inc:1.205 --- src/lib/libc/gen/Makefile.inc:1.204 Sat Jul 4 21:05:50 2020 +++ src/lib/libc/gen/Makefile.inc Sat Jul 4 21:09:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.204 2020/07/05 01:05:50 christos Exp $ +# $NetBSD: Makefile.inc,v 1.205 2020/07/05 01:09:48 christos Exp $ # from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 # gen sources @@ -97,7 +97,7 @@ MLINKS+=directory.3 closedir.3 directory directory.3 fdopendir.3 MLINKS+=endutxent.3 getutxent.3 endutxent.3 getutxid.3 \ endutxent.3 getutxline.3 endutxent.3 pututxline.3 \ - endutxent.3 setutxent.3 endutmpx.3 utmpxname.3 + endutxent.3 setutxent.3 MLINKS+=err.3 verr.3 err.3 errx.3 err.3 verrx.3 err.3 warn.3 err.3 vwarn.3 \ err.3 warnx.3 err.3 vwarnx.3 err.3 errc.3 err.3 verrc.3 err.3 warnc.3 \ err.3 vwarnc.3 Index: src/lib/libc/gen/endutxent.3 diff -u src/lib/libc/gen/endutxent.3:1.6 src/lib/libc/gen/endutxent.3:1.7 --- src/lib/libc/gen/endutxent.3:1.6 Sat Jul 4 21:05:50 2020 +++ src/lib/libc/gen/endutxent.3 Sat Jul 4 21:09:48 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: endutxent.3,v 1.6 2020/07/05 01:05:50 christos Exp $ +.\" $NetBSD: endutxent.3,v 1.7 2020/07/05 01:09:48 christos Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 4, 2020 +.Dd September 26, 2002 .Dt ENDUTXENT 3 .Os .Sh NAME @@ -36,8 +36,7 @@ .Nm getutxid , .Nm getutxline , .Nm pututxline , -.Nm setutxent , -.Nm utxname +.Nm setutxent .Nd user accounting database functions .Sh LIBRARY .Lb libc @@ -48,15 +47,13 @@ .Ft struct utmpx * .Fn getutxent void .Ft struct utmpx * -.Fn getutxid "const struct utmpx *ut" +.Fn getutxid "const struct utmpx *" .Ft struct utmpx * -.Fn getutxline "const struct utmpx *ut" +.Fn getutxline "const struct utmpx *" .Ft struct utmpx * -.Fn pututxline "const struct utmpx *ut" +.Fn pututxline "const struct utmpx *" .Ft void .Fn setutxent void -.Ft void -.Fn utmpxname "const char *fname" .Sh DESCRIPTION These functions provide access to the .Xr utmpx 5 @@ -94,10 +91,6 @@ adds the argument .Xr utmpx 5 entry line to the accounting database, replacing a previous entry for the same user if it exists. -.Pp -.Fn utmpxname -set sets the database file to -.Fa fname . .Ss The utmpx structure The .Nm utmpx @@ -162,12 +155,6 @@ if no match was found. .Fn pututxline returns the structure that was successfully written, or .Dv NULL . -.Fn utmpxname -returns -.Dv 1 -on success and -.Dv 0 -on failure. .Sh SEE ALSO .Xr logwtmpx 3 , .Xr utmpx 5 @@ -179,15 +166,10 @@ The .Fn getutxline , .Fn pututxline , .Fn setutxent -functions all conform to +all conform to .St -p1003.1-2001 (XSI extension), and previously to .St -xpg4.2 . -The -.Fn utxname -functions is a -.Nx -externsion. The fields .Fa ut_user , .Fa ut_id ,
CVS commit: src/lib/libc/gen
Module Name:src Committed By: christos Date: Sun Jul 5 01:05:50 UTC 2020 Modified Files: src/lib/libc/gen: Makefile.inc endutxent.3 Log Message: document utmpxname(3) To generate a diff of this commit: cvs rdiff -u -r1.203 -r1.204 src/lib/libc/gen/Makefile.inc cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gen/endutxent.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/Makefile.inc diff -u src/lib/libc/gen/Makefile.inc:1.203 src/lib/libc/gen/Makefile.inc:1.204 --- src/lib/libc/gen/Makefile.inc:1.203 Sun May 10 15:36:49 2020 +++ src/lib/libc/gen/Makefile.inc Sat Jul 4 21:05:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.203 2020/05/10 19:36:49 maya Exp $ +# $NetBSD: Makefile.inc,v 1.204 2020/07/05 01:05:50 christos Exp $ # from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 # gen sources @@ -97,7 +97,7 @@ MLINKS+=directory.3 closedir.3 directory directory.3 fdopendir.3 MLINKS+=endutxent.3 getutxent.3 endutxent.3 getutxid.3 \ endutxent.3 getutxline.3 endutxent.3 pututxline.3 \ - endutxent.3 setutxent.3 + endutxent.3 setutxent.3 endutmpx.3 utmpxname.3 MLINKS+=err.3 verr.3 err.3 errx.3 err.3 verrx.3 err.3 warn.3 err.3 vwarn.3 \ err.3 warnx.3 err.3 vwarnx.3 err.3 errc.3 err.3 verrc.3 err.3 warnc.3 \ err.3 vwarnc.3 Index: src/lib/libc/gen/endutxent.3 diff -u src/lib/libc/gen/endutxent.3:1.5 src/lib/libc/gen/endutxent.3:1.6 --- src/lib/libc/gen/endutxent.3:1.5 Wed Apr 30 09:10:50 2008 +++ src/lib/libc/gen/endutxent.3 Sat Jul 4 21:05:50 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: endutxent.3,v 1.5 2008/04/30 13:10:50 martin Exp $ +.\" $NetBSD: endutxent.3,v 1.6 2020/07/05 01:05:50 christos Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 26, 2002 +.Dd July 4, 2020 .Dt ENDUTXENT 3 .Os .Sh NAME @@ -36,7 +36,8 @@ .Nm getutxid , .Nm getutxline , .Nm pututxline , -.Nm setutxent +.Nm setutxent , +.Nm utxname .Nd user accounting database functions .Sh LIBRARY .Lb libc @@ -47,13 +48,15 @@ .Ft struct utmpx * .Fn getutxent void .Ft struct utmpx * -.Fn getutxid "const struct utmpx *" +.Fn getutxid "const struct utmpx *ut" .Ft struct utmpx * -.Fn getutxline "const struct utmpx *" +.Fn getutxline "const struct utmpx *ut" .Ft struct utmpx * -.Fn pututxline "const struct utmpx *" +.Fn pututxline "const struct utmpx *ut" .Ft void .Fn setutxent void +.Ft void +.Fn utmpxname "const char *fname" .Sh DESCRIPTION These functions provide access to the .Xr utmpx 5 @@ -91,6 +94,10 @@ adds the argument .Xr utmpx 5 entry line to the accounting database, replacing a previous entry for the same user if it exists. +.Pp +.Fn utmpxname +set sets the database file to +.Fa fname . .Ss The utmpx structure The .Nm utmpx @@ -155,6 +162,12 @@ if no match was found. .Fn pututxline returns the structure that was successfully written, or .Dv NULL . +.Fn utmpxname +returns +.Dv 1 +on success and +.Dv 0 +on failure. .Sh SEE ALSO .Xr logwtmpx 3 , .Xr utmpx 5 @@ -166,10 +179,15 @@ The .Fn getutxline , .Fn pututxline , .Fn setutxent -all conform to +functions all conform to .St -p1003.1-2001 (XSI extension), and previously to .St -xpg4.2 . +The +.Fn utxname +functions is a +.Nx +externsion. The fields .Fa ut_user , .Fa ut_id ,
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Sun Jul 5 01:05:01 UTC 2020 Modified Files: src/share/man/man4: speaker.4 Log Message: Clarify initial state some more. Mention that the initial current octave is 4. Drop filler verbiage that octaves are "from C to B". To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/speaker.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/speaker.4 diff -u src/share/man/man4/speaker.4:1.28 src/share/man/man4/speaker.4:1.29 --- src/share/man/man4/speaker.4:1.28 Sun Jul 5 00:38:23 2020 +++ src/share/man/man4/speaker.4 Sun Jul 5 01:05:01 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: speaker.4,v 1.28 2020/07/05 00:38:23 uwe Exp $ +.\" $NetBSD: speaker.4,v 1.29 2020/07/05 01:05:01 uwe Exp $ .\" .\" Copyright (c) 2016 Nathanial Sloss .\" All rights reserved. @@ -131,20 +131,24 @@ The .Ic MF and .Ic X -primitives of +commands of .Ic PLAY are not useful in a .Tn UNIX -environment and are omitted. +environment and are not implemented. The .Dq octave-tracking feature is also new. .Pp -There are 84 accessible notes numbered 1\(en84 in 7 octaves, each running from -C to B, numbered 0\(en6; the scale is equal-tempered A440 and octave\~2 starts -with middle C. -By default, the play function emits half-second notes with the -last 1/16th second being +There are 84 accessible notes numbered 1\(en84 in 7 octaves numbered 0\(en6; +octave\~2 starts with middle C. +The tuning is equal-tempered A440. +.Pp +In the initial state the current octave is 4, +the default note duration is quarter notes, +the tempo is 120 bpm, +and the articulation is non-legato or normal, +i.e. half-second notes with the last 1/16th second being .Dq rest time . .Pp Play strings are interpreted left to right as a series of play command groups.
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Sun Jul 5 00:38:23 UTC 2020 Modified Files: src/share/man/man4: speaker.4 Log Message: Clarify that whitespace is only ignored between groups. Actually everything that doesn't start a group is ignored. Whitespace is not allowed inside groups. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man4/speaker.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/speaker.4 diff -u src/share/man/man4/speaker.4:1.27 src/share/man/man4/speaker.4:1.28 --- src/share/man/man4/speaker.4:1.27 Sun Jul 5 00:33:18 2020 +++ src/share/man/man4/speaker.4 Sun Jul 5 00:38:23 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: speaker.4,v 1.27 2020/07/05 00:33:18 uwe Exp $ +.\" $NetBSD: speaker.4,v 1.28 2020/07/05 00:38:23 uwe Exp $ .\" .\" Copyright (c) 2016 Nathanial Sloss .\" All rights reserved. @@ -149,7 +149,8 @@ last 1/16th second being .Pp Play strings are interpreted left to right as a series of play command groups. Letter case is ignored. -Whitespace is ignored and may be used to separate melody sections. +Whitespace between groups is ignored +and may be used to separate melody sections. Play command groups are as follows: .Bl -tag -width Ic .It Ic C , D , E , F , G , A , B
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Sun Jul 5 00:33:18 UTC 2020 Modified Files: src/share/man/man4: speaker.4 Log Message: BUGS: note that meaning of sustain dots differs from the standard notation. >From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/share/man/man4/speaker.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/speaker.4 diff -u src/share/man/man4/speaker.4:1.26 src/share/man/man4/speaker.4:1.27 --- src/share/man/man4/speaker.4:1.26 Sat Jul 4 23:24:10 2020 +++ src/share/man/man4/speaker.4 Sun Jul 5 00:33:18 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: speaker.4,v 1.26 2020/07/04 23:24:10 uwe Exp $ +.\" $NetBSD: speaker.4,v 1.27 2020/07/05 00:33:18 uwe Exp $ .\" .\" Copyright (c) 2016 Nathanial Sloss .\" All rights reserved. @@ -302,6 +302,17 @@ nor timings will be mathematically exact .Pp There is no volume control. .Pp +The action of two or more sustain dots does not reflect standard musical +notation, in which each dot adds half the value of the previous dot +modifier, not half the value of the note as modified. +Thus, a note dotted +once is held for 3/2 of its undotted value; dotted twice, it is held 7/4, +and three times would give 15/8. +The multiply-by-3/2 interpretation, +however, is specified in the +.Tn IBM BASIC +manual and has been retained for compatibility. +.Pp In play strings which are very long (longer than your system's physical I/O blocks) note suffixes or numbers may occasionally be parsed incorrectly due to crossing a block boundary.
CVS commit: src/usr.bin/w
Module Name:src
Committed By: kim
Date: Sat Jul 4 23:30:32 UTC 2020
Modified Files:
src/usr.bin/w: w.c
Log Message:
Don't overwrite host_buf as x might be pointing to wanted data in it
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/w/w.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/w/w.c
diff -u src/usr.bin/w/w.c:1.86 src/usr.bin/w/w.c:1.87
--- src/usr.bin/w/w.c:1.86 Tue Jun 30 15:02:55 2020
+++ src/usr.bin/w/w.c Sat Jul 4 23:30:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: w.c,v 1.86 2020/06/30 15:02:55 kim Exp $ */
+/* $NetBSD: w.c,v 1.87 2020/07/04 23:30:31 kim Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)w.c 8.6 (Berkeley) 6/30/94";
#else
-__RCSID("$NetBSD: w.c,v 1.86 2020/06/30 15:02:55 kim Exp $");
+__RCSID("$NetBSD: w.c,v 1.87 2020/07/04 23:30:31 kim Exp $");
#endif
#endif /* not lint */
@@ -621,7 +621,7 @@ static void
fixhost(struct entry *ep)
{
char host_buf[sizeof(ep->host)];
- char *p, *x, *m;
+ char *p, *r, *x, *m;
struct hostent *hp;
union {
struct in_addr l4;
@@ -649,26 +649,28 @@ fixhost(struct entry *ep)
} else
x = NULL;
}
+
int af = m ? AF_INET6 : AF_INET;
size_t alen = m ? sizeof(l.l6) : sizeof(l.l4);
if (!nflag && inet_pton(af, p, ) &&
(hp = gethostbyaddr((char *), alen, af)))
- strlcpy(host_buf, hp->h_name, sizeof(host_buf));
+ r = hp->h_name;
+ else
+ r = host_buf;
if (domain[0] != '\0') {
- p = host_buf;
- p += strlen(host_buf);
+ p = r;
+ p += strlen(r);
p -= strlen(domain);
- if (p > host_buf &&
+ if (p > r &&
strcasecmp(p, domain) == 0)
*p = '\0';
}
if (x)
- (void)snprintf(ep->host, sizeof(ep->host), "%s:%s", host_buf,
- x);
+ (void)snprintf(ep->host, sizeof(ep->host), "%s:%s", r, x);
else
- strlcpy(ep->host, host_buf, sizeof(ep->host));
+ strlcpy(ep->host, r, sizeof(ep->host));
}
static void
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Sat Jul 4 23:24:10 UTC 2020 Modified Files: src/share/man/man4: speaker.4 Log Message: Middle C is in O2 (from RTFS). To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/share/man/man4/speaker.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/speaker.4 diff -u src/share/man/man4/speaker.4:1.25 src/share/man/man4/speaker.4:1.26 --- src/share/man/man4/speaker.4:1.25 Sat Jul 4 23:09:43 2020 +++ src/share/man/man4/speaker.4 Sat Jul 4 23:24:10 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: speaker.4,v 1.25 2020/07/04 23:09:43 uwe Exp $ +.\" $NetBSD: speaker.4,v 1.26 2020/07/04 23:24:10 uwe Exp $ .\" .\" Copyright (c) 2016 Nathanial Sloss .\" All rights reserved. @@ -141,7 +141,7 @@ The feature is also new. .Pp There are 84 accessible notes numbered 1\(en84 in 7 octaves, each running from -C to B, numbered 0\(en6; the scale is equal-tempered A440 and octave\~3 starts +C to B, numbered 0\(en6; the scale is equal-tempered A440 and octave\~2 starts with middle C. By default, the play function emits half-second notes with the last 1/16th second being
CVS commit: src/share/man/man4
Module Name:src
Committed By: uwe
Date: Sat Jul 4 23:09:43 UTC 2020
Modified Files:
src/share/man/man4: speaker.4
Log Message:
Add more markup. Edit for clarity.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/speaker.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/speaker.4
diff -u src/share/man/man4/speaker.4:1.24 src/share/man/man4/speaker.4:1.25
--- src/share/man/man4/speaker.4:1.24 Sat Jul 4 19:25:24 2020
+++ src/share/man/man4/speaker.4 Sat Jul 4 23:09:43 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: speaker.4,v 1.24 2020/07/04 19:25:24 uwe Exp $
+.\" $NetBSD: speaker.4,v 1.25 2020/07/04 23:09:43 uwe Exp $
.\"
.\" Copyright (c) 2016 Nathanial Sloss
.\" All rights reserved.
@@ -62,13 +62,18 @@ An attempt to
when another process has the device locked will return \-1 with an
.Er EBUSY
error indication.
-Writes to the device are interpreted as 'play strings' in a
-simple ASCII melody notation.
+Writes to the device are interpreted as
+.Dq play strings
+in a simple
+.Tn ASCII
+melody notation.
An
.Fn ioctl
for tone generation at arbitrary frequencies is also supported.
.Pp
-For the pcppi device sound-generation does
+For the
+.Xr pcppi 4
+device sound-generation does
.Em not
monopolize the processor; in fact, the driver
spends most of its time sleeping while the PC hardware is emitting
@@ -89,19 +94,22 @@ definitions for the
interface are in
.In dev/spkrio.h .
.Pp
-The tone_t structure is as follows:
-.Bd -literal
+The
+.Vt tone_t
+structure is as follows:
+.Bd -literal -offset indent
typedef struct {
int frequency; /* in hertz */
int duration; /* in 1/100ths of a second */
} tone_t;
.Ed
+.Pp
A frequency of zero is interpreted as a rest.
.Pp
At present there are four ioctls:
.Bl -tag -width Dv
.It Dv SPKRGETVOL
-Returns an integer, which is the current bell volume as a percentage (0-100).
+Returns an integer, which is the current bell volume as a percentage (0\(en100).
.It Dv SPKRSETVOL
Accepts an integer, which is the desired volume as a percentage.
.It Dv SPKRTONE
@@ -111,98 +119,164 @@ Accepts a pointer to the first of an arr
them in continuous sequence; this array must be terminated by a final member
with a zero duration.
.El
-.Pp
-The play-string language is modelled on the PLAY statement conventions of
-IBM BASIC 2.0.
-The MB, MF and X primitives of PLAY are not useful in a UNIX
+.\"
+.Ss Play string language
+.\"
+The play string language is modelled on the
+.Ic PLAY
+statement conventions of
+.Tn IBM BASIC No 2.0 .
+The
+.Ic MB ,
+.Ic MF
+and
+.Ic X
+primitives of
+.Ic PLAY
+are not useful in a
+.Tn UNIX
environment and are omitted.
-The `octave-tracking' feature is also new.
+The
+.Dq octave-tracking
+feature is also new.
.Pp
-There are 84 accessible notes numbered 1-84 in 7 octaves, each running from
-C to B, numbered 0-6; the scale is equal-tempered A440 and octave 3 starts
+There are 84 accessible notes numbered 1\(en84 in 7 octaves, each running from
+C to B, numbered 0\(en6; the scale is equal-tempered A440 and octave\~3 starts
with middle C.
By default, the play function emits half-second notes with the
-last 1/16th second being `rest time'.
+last 1/16th second being
+.Dq rest time .
.Pp
-Play strings are interpreted left to right as a series of play command groups;
-letter case is ignored.
+Play strings are interpreted left to right as a series of play command groups.
+Letter case is ignored.
+Whitespace is ignored and may be used to separate melody sections.
Play command groups are as follows:
-.Pp
-CDEFGAB -- letters A through G cause the corresponding note to be played in the
-current octave.
+.Bl -tag -width Ic
+.It Ic C , D , E , F , G , A , B
+Letters
+.Sq Ic A
+through
+.Sq Ic G
+cause the corresponding note to be played in the current octave.
A note letter may optionally be followed by an
.Em accidental sign ,
-one of # + or -; the first two of these cause it to be sharped one
+one of
+.Sq Ic
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sat Jul 4 22:17:09 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile modmisc.exp
Log Message:
make(1): ignore system-specific error message from regcomp in test
NetBSD 8 has: repetition-operator operand invalid
Ubuntu has: Invalid preceding regular expression
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/modmisc.exp
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/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.61 src/usr.bin/make/unit-tests/Makefile:1.62
--- src/usr.bin/make/unit-tests/Makefile:1.61 Sat Jul 4 22:01:10 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Jul 4 22:17:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2020/07/04 22:01:10 rillig Exp $
+# $NetBSD: Makefile,v 1.62 2020/07/04 22:17:09 rillig Exp $
#
# Unit tests for make(1)
#
@@ -77,6 +77,7 @@ FLAGS.doterror= # none
FLAGS.order= -j1
# Some tests need extra post-processing.
+SED_CMDS.modmisc+= -e 's,\(substitution error:\).*,\1 (details omitted),'
SED_CMDS.varshell+= -e 's,^[a-z]*sh: ,,'
SED_CMDS.varshell+= -e '/command/s,No such.*,not found,'
@@ -119,16 +120,17 @@ LANG= C
2>&1 ; echo $$? >${.TARGET:R}.status ; } > ${.TARGET}.tmp
@mv ${.TARGET}.tmp ${.TARGET}
+# Post-process the test output so that the results can be compared.
+#
+# always pretend .MAKE was called 'make'
_SED_CMDS+= -e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,'
_SED_CMDS+= -e 's,${TEST_MAKE:S,.,\\.,g},make,'
+# replace anything after 'stopped in' with unit-tests
_SED_CMDS+= -e '/stopped/s, /.*, unit-tests,'
+# strip ${.CURDIR}/ from the output
_SED_CMDS+= -e 's,${.CURDIR:S,.,\\.,g}/,,g'
_SED_CMDS+= -e 's,${UNIT_TESTS:S,.,\\.,g}/,,g'
-# We always pretend .MAKE was called 'make'
-# and strip ${.CURDIR}/ from the output
-# and replace anything after 'stopped in' with unit-tests
-# so the results can be compared.
.rawout.out:
@echo postprocess ${.TARGET}
@${TOOL_SED} ${_SED_CMDS} ${SED_CMDS.${.TARGET:R}} \
Index: src/usr.bin/make/unit-tests/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.13 src/usr.bin/make/unit-tests/modmisc.exp:1.14
--- src/usr.bin/make/unit-tests/modmisc.exp:1.13 Sat Jul 4 18:54:18 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp Sat Jul 4 22:17:09 2020
@@ -25,7 +25,7 @@ C:empty
:a b b c:
:a b b c:
: b c:
-make: RE substitution error: repetition-operator operand invalid
+make: RE substitution error: (details omitted)
make: Unclosed substitution for (, missing)
:C,word,,:Q}:
:a c:
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sat Jul 4 22:01:10 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile varshell.exp
Log Message:
make(1): add post-processing for tests
By defining SED_CMDS.${test}, a test can do additional post-processing
on its output, for example to normalize paths or error messages.
The Makefile for the tests now follows the common style to have all
relevant definitions at the top of the file, and all the implementation
details at the bottom.
By using the += instead of backslashed lists, it becomes easier to
comment out a single test, either temporarily or permanently (such as
the POSIX tests).
The :C modifier has been replaced with the simpler :S, some :S modifiers
have been replaced with simpler := modifiers.
The postprocessing commands have been extracted from the actual command.
This makes editing and commenting them easier.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varshell.exp
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/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.60 src/usr.bin/make/unit-tests/Makefile:1.61
--- src/usr.bin/make/unit-tests/Makefile:1.60 Sat Jul 4 21:04:25 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Jul 4 22:01:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2020/07/04 21:04:25 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2020/07/04 22:01:10 rillig Exp $
#
# Unit tests for make(1)
#
@@ -11,83 +11,90 @@
# accept:
# move generated output to expected results
#
+# Settable variables
+#
+# TEST_MAKE
+# The make program to be tested.
+#
#
# Adding a test case
#
# Each feature should get its own set of tests in its own suitably
# named makefile (*.mk), with its own set of expected results (*.exp),
-# and it should be added to the TESTNAMES list.
+# and it should be added to the TESTS list.
#
# Any added files must also be added to src/distrib/sets/lists/tests/mi.
-# Makefiles that are not added to TESTNAMES must be ignored in
+# Makefiles that are not added to TESTS must be ignored in
# src/tests/usr.bin/make/t_make.sh (example: include-sub).
#
+# Each test is in a sub-makefile.
+# Keep the list sorted.
+TESTS+= comment
+TESTS+= cond-late
+TESTS+= cond-short
+TESTS+= cond1
+TESTS+= cond2
+TESTS+= dollar
+TESTS+= doterror
+TESTS+= dotwait
+TESTS+= error
+TESTS+= # escape # broken by referting POSIX changes
+TESTS+= export
+TESTS+= export-all
+TESTS+= export-env
+TESTS+= forloop
+TESTS+= forsubst
+TESTS+= hash
+TESTS+= # impsrc # broken by referting POSIX changes
+TESTS+= include-main
+TESTS+= misc
+TESTS+= moderrs
+TESTS+= modmatch
+TESTS+= modmisc
+TESTS+= modorder
+TESTS+= modts
+TESTS+= modword
+TESTS+= order
+TESTS+= # phony-end # broken by referting POSIX changes
+TESTS+= posix
+TESTS+= # posix1 # broken by referting POSIX changes
+TESTS+= qequals
+TESTS+= # suffixes # broken by referting POSIX changes
+TESTS+= sunshcmd
+TESTS+= sysv
+TESTS+= ternary
+TESTS+= unexport
+TESTS+= unexport-env
+TESTS+= varcmd
+TESTS+= varmisc
+TESTS+= varmod-edge
+TESTS+= varquote
+TESTS+= varshell
+
+# Override make flags for certain tests; default is -k.
+FLAGS.doterror= # none
+FLAGS.order= -j1
+
+# Some tests need extra post-processing.
+SED_CMDS.varshell+= -e 's,^[a-z]*sh: ,,'
+SED_CMDS.varshell+= -e '/command/s,No such.*,not found,'
+
+# End of the configuration section.
+
.MAIN: all
-UNIT_TESTS:= ${.PARSEDIR}
+UNIT_TESTS:= ${.PARSEDIR}
.PATH: ${UNIT_TESTS}
-# Each test is in a sub-makefile.
-# Keep the list sorted.
-TESTNAMES= \
- comment \
- cond-late \
- cond-short \
- cond1 \
- cond2 \
- dollar \
- doterror \
- dotwait \
- error \
- export \
- export-all \
- export-env \
- forloop \
- forsubst \
- hash \
- include-main \
- misc \
- moderrs \
- modmatch \
- modmisc \
- modorder \
- modts \
- modword \
- order \
- posix \
- qequals \
- sunshcmd \
- sysv \
- ternary \
- unexport \
- unexport-env \
- varcmd \
- varmisc \
- varmod-edge \
- varquote \
- varshell
-
-# these tests were broken by referting POSIX chanegs
-STRICT_POSIX_TESTS = \
- escape \
- impsrc \
- phony-end \
- posix1 \
- suffixes
-
-# Override make flags for certain tests
-flags.doterror=
-flags.order=-j1
-
-OUTFILES= ${TESTNAMES:S/$/.out/}
+OUTFILES= ${TESTS:=.out}
all: ${OUTFILES}
-CLEANFILES += *.rawout *.out *.status *.tmp *.core *.tmp
-CLEANFILES += obj*.[och] lib*.a # posix1.mk
-CLEANFILES += issue* .[ab]* # suffixes.mk
-CLEANRECURSIVE += dir dummy # posix1.mk
+CLEANFILES+= *.rawout *.out *.status *.tmp *.core *.tmp
+CLEANFILES+= obj*.[och] lib*.a # posix1.mk
+CLEANFILES+= issue* .[ab]* # suffixes.mk
+CLEANRECURSIVE+= dir dummy # posix1.mk
clean:
rm -f ${CLEANFILES}
@@ -95,34 +102,36 @@ clean:
rm -rf ${CLEANRECURSIVE}
.endif
CVS commit: src/share/man/man9
Module Name:src Committed By: christos Date: Sat Jul 4 21:07:29 UTC 2020 Modified Files: src/share/man/man9: vfsops.9 Log Message: add missing arg To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/share/man/man9/vfsops.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/vfsops.9 diff -u src/share/man/man9/vfsops.9:1.49 src/share/man/man9/vfsops.9:1.50 --- src/share/man/man9/vfsops.9:1.49 Tue Jan 1 05:06:54 2019 +++ src/share/man/man9/vfsops.9 Sat Jul 4 17:07:29 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: vfsops.9,v 1.49 2019/01/01 10:06:54 hannken Exp $ +.\" $NetBSD: vfsops.9,v 1.50 2020/07/04 21:07:29 christos Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 1, 2019 +.Dd July 4, 2020 .Dt VFSOPS 9 .Os .Sh NAME @@ -360,7 +360,7 @@ The new key is returned in the address s .Fa new_key . .Pp Caller of this function assures no other thread will try to load this file. -.It Fn VFS_NEWVNODE "mp" "dvp" "vp" "vap" "cred" "key_len" "new_key" +.It Fn VFS_NEWVNODE "mp" "dvp" "vp" "vap" "cred" "extra" "key_len" "new_key" Initialise the vnode .Fa vp with a new file for the file system specified by the mount structure
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sat Jul 4 21:04:25 UTC 2020 Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: make(1): improve documentation about adding new tests To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.59 src/usr.bin/make/unit-tests/Makefile:1.60 --- src/usr.bin/make/unit-tests/Makefile:1.59 Sun Jun 28 09:42:40 2020 +++ src/usr.bin/make/unit-tests/Makefile Sat Jul 4 21:04:25 2020 @@ -1,17 +1,27 @@ -# $NetBSD: Makefile,v 1.59 2020/06/28 09:42:40 rillig Exp $ +# $NetBSD: Makefile,v 1.60 2020/07/04 21:04:25 rillig Exp $ # # Unit tests for make(1) +# # The main targets are: -# -# all: run all the tests -# test: run 'all', and compare to expected results -# accept: move generated output to expected results # -# Adding a test case. +# all: +# run all the tests +# test: +# run 'all', and compare to expected results +# accept: +# move generated output to expected results +# +# +# Adding a test case +# # Each feature should get its own set of tests in its own suitably # named makefile (*.mk), with its own set of expected results (*.exp), # and it should be added to the TESTNAMES list. -# +# +# Any added files must also be added to src/distrib/sets/lists/tests/mi. +# Makefiles that are not added to TESTNAMES must be ignored in +# src/tests/usr.bin/make/t_make.sh (example: include-sub). +# .MAIN: all
CVS commit: src/doc
Module Name:src Committed By: chs Date: Sat Jul 4 21:03:50 UTC 2020 Modified Files: src/doc: CHANGES Log Message: note x86 Xen kernel module change. To generate a diff of this commit: cvs rdiff -u -r1.2708 -r1.2709 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2708 src/doc/CHANGES:1.2709 --- src/doc/CHANGES:1.2708 Fri Jul 3 10:47:29 2020 +++ src/doc/CHANGES Sat Jul 4 21:03:50 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2708 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2709 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -241,3 +241,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: cgd(4): Add support for Adiantum cipher, providing much better software performance than AES-CBC or AES-XTS. [riastradh 20200629] dhcpcd: Import version 9.1.4 [roy 20200703] + x86: Xen kernels now use the same kernel modules as native kernels. + [chs 20200704]
CVS commit: src
Module Name:src
Committed By: chs
Date: Sat Jul 4 21:02:16 UTC 2020
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/share/mk: bsd.own.mk
src/sys/arch/x86/x86: x86_machdep.c
src/sys/modules/arch: archdirs.mk
Removed Files:
src/sys/modules/arch/x86/amd64-xen: Makefile bsd.amd64-xen.mk
src/sys/modules/arch/x86/i386pae-xen: Makefile bsd.i386pae-xen.mk
Log Message:
the x86 xen and non-xen modules are identical,
so remove the unneeded extra copies.
Xen kernels now use the same modules as native kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/modules/md.amd64 \
src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1199 -r1.1200 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/x86/x86/x86_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/arch/archdirs.mk
cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/x86/amd64-xen/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/x86/i386pae-xen/Makefile
cvs rdiff -u -r1.2 -r0 \
src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.86 src/distrib/sets/lists/modules/md.amd64:1.87
--- src/distrib/sets/lists/modules/md.amd64:1.86 Thu Mar 12 15:04:13 2020
+++ src/distrib/sets/lists/modules/md.amd64 Sat Jul 4 21:02:16 2020
@@ -1,7 +1,4 @@
-# $NetBSD: md.amd64,v 1.86 2020/03/12 15:04:13 pgoyette Exp $
-#
-# NOTE that there are two sets of files here:
-# @MODULEDIR@ and amd64-xen
+# $NetBSD: md.amd64,v 1.87 2020/07/04 21:02:16 chs Exp $
#
./@MODULEDIR@/acpiacadmodules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.86 src/distrib/sets/lists/modules/md.i386:1.87
--- src/distrib/sets/lists/modules/md.i386:1.86 Sat Feb 29 18:46:12 2020
+++ src/distrib/sets/lists/modules/md.i386 Sat Jul 4 21:02:16 2020
@@ -1,8 +1,5 @@
-# $NetBSD: md.i386,v 1.86 2020/02/29 18:46:12 skrll Exp $
+# $NetBSD: md.i386,v 1.87 2020/07/04 21:02:16 chs Exp $
#
-# NOTE that there are two sets of files here: @MODULEDIR@ and i386pae-xen
-#
-
./@MODULEDIR@/acpiacadmodules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
./@MODULEDIR@/acpibatmodules-base-kernel kmod
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1199 src/share/mk/bsd.own.mk:1.1200
--- src/share/mk/bsd.own.mk:1.1199 Sat Jun 6 22:06:42 2020
+++ src/share/mk/bsd.own.mk Sat Jul 4 21:02:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1199 2020/06/06 22:06:42 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.1200 2020/07/04 21:02:16 chs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1006,8 +1006,7 @@ MKCOMPATTESTS:= no
MKCOMPATX11:= no
.endif
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" \
-|| ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
+.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
|| (${MACHINE} == "evbppc" && ${MACHINE_ARCH} == "powerpc")
MKCOMPATMODULES?= yes
.else
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.143 src/sys/arch/x86/x86/x86_machdep.c:1.144
--- src/sys/arch/x86/x86/x86_machdep.c:1.143 Thu May 21 21:12:30 2020
+++ src/sys/arch/x86/x86/x86_machdep.c Sat Jul 4 21:02:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.143 2020/05/21 21:12:30 ad Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.144 2020/07/04 21:02:16 chs Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.143 2020/05/21 21:12:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.144 2020/07/04 21:02:16 chs Exp $");
#include "opt_modular.h"
#include "opt_physmem.h"
@@ -100,10 +100,6 @@ static char x86_cpu_idle_text[16];
#include
#include
#endif
-#ifdef XENPV
-char module_machine_amd64_xen[] = "amd64-xen";
-char module_machine_i386pae_xen[] = "i386pae-xen";
-#endif
#ifndef XENPV
void (*delay_func)(unsigned int) = i8254_delay;
@@ -224,15 +220,6 @@ module_init_md(void)
struct btinfo_modulelist *biml;
struct bi_modulelist_entry *bi, *bimax;
- /* setup module path for XEN kernels */
-#ifdef XENPV
-#ifdef __x86_64__
- module_machine = module_machine_amd64_xen;
-#else
- module_machine = module_machine_i386pae_xen;
-#endif
-#endif
-
biml = lookup_bootinfo(BTINFO_MODULELIST);
if (biml == NULL) {
aprint_debug("No module info at boot\n");
Index: src/sys/modules/arch/archdirs.mk
diff -u src/sys/modules/arch/archdirs.mk:1.5 src/sys/modules/arch/archdirs.mk:1.6
---
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Sat Jul 4 19:25:24 UTC 2020 Modified Files: src/share/man/man4: speaker.4 Log Message: Fix off by one in the range of note values (in one instance). >From xordspar0 at gmail. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/speaker.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/speaker.4 diff -u src/share/man/man4/speaker.4:1.23 src/share/man/man4/speaker.4:1.24 --- src/share/man/man4/speaker.4:1.23 Tue Jun 13 06:25:20 2017 +++ src/share/man/man4/speaker.4 Sat Jul 4 19:25:24 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: speaker.4,v 1.23 2017/06/13 06:25:20 nat Exp $ +.\" $NetBSD: speaker.4,v 1.24 2020/07/04 19:25:24 uwe Exp $ .\" .\" Copyright (c) 2016 Nathanial Sloss .\" All rights reserved. @@ -118,7 +118,7 @@ The MB, MF and X primitives of PLAY are environment and are omitted. The `octave-tracking' feature is also new. .Pp -There are 84 accessible notes numbered 1-83 in 7 octaves, each running from +There are 84 accessible notes numbered 1-84 in 7 octaves, each running from C to B, numbered 0-6; the scale is equal-tempered A440 and octave 3 starts with middle C. By default, the play function emits half-second notes with the
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sat Jul 4 18:54:18 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: modmisc.exp modmisc.mk
Log Message:
make(1): add tests for dollar characters in modifiers
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/modmisc.exp
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/modmisc.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/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.12 src/usr.bin/make/unit-tests/modmisc.exp:1.13
--- src/usr.bin/make/unit-tests/modmisc.exp:1.12 Sat Jul 4 17:41:04 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp Sat Jul 4 18:54:18 2020
@@ -32,4 +32,20 @@ make: Unclosed substitution for (, miss
:x__ 3 x__ 3:
:+one+ +two+ +three+:
mod-at-resolve:w1d2d3w w2i3w w1i2d3 2i${RES3}w w1d2d3 2i${RES3} 1i${RES2}w:
+mod-subst-dollar:$1:
+mod-subst-dollar:$2:
+mod-subst-dollar:$3:
+mod-subst-dollar:$4:
+mod-subst-dollar:$5:
+mod-subst-dollar:$6:
+mod-subst-dollar:$7:
+mod-subst-dollar:$8:
+mod-subst-dollar:U8:
+mod-subst-dollar::
+mod-loop-dollar:1:
+mod-loop-dollar:${word}:
+mod-loop-dollar:$3$:
+mod-loop-dollar:$${word}$:
+mod-loop-dollar:$$5$$:
+mod-loop-dollar:$$${word}$$:
exit status 0
Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.11 src/usr.bin/make/unit-tests/modmisc.mk:1.12
--- src/usr.bin/make/unit-tests/modmisc.mk:1.11 Sat Jul 4 17:41:04 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk Sat Jul 4 18:54:18 2020
@@ -1,4 +1,4 @@
-# $Id: modmisc.mk,v 1.11 2020/07/04 17:41:04 rillig Exp $
+# $Id: modmisc.mk,v 1.12 2020/07/04 18:54:18 rillig Exp $
#
# miscellaneous modifier tests
@@ -17,6 +17,7 @@ MOD_SEP=S,:, ,g
all: modvar modvarloop modsysv mod-HTE emptyvar undefvar
all: mod-S mod-C mod-at-varname mod-at-resolve
+all: mod-subst-dollar mod-loop-dollar
modsysv:
@echo "The answer is ${libfoo.a:L:libfoo.a=42}"
@@ -93,3 +94,34 @@ RES3= 3
mod-at-resolve:
@echo $@:${RESOLVE:@v@w${v}w@:Q}:
+
+# No matter how many dollar characters there are, they all get merged
+# into a single dollar by the :S modifier.
+mod-subst-dollar:
+ @echo $@:${:U1:S,^,$,:Q}:
+ @echo $@:${:U2:S,^,$$,:Q}:
+ @echo $@:${:U3:S,^,$$$,:Q}:
+ @echo $@:${:U4:S,^,,:Q}:
+ @echo $@:${:U5:S,^,$,:Q}:
+ @echo $@:${:U6:S,^,$$,:Q}:
+ @echo $@:${:U7:S,^,$$$,:Q}:
+ @echo $@:${:U8:S,^,,:Q}:
+# This generates no dollar at all:
+ @echo $@:${:UU8:S,^,${:U},:Q}:
+# Here is an alternative way to generate dollar characters.
+# It's unexpectedly complicated though.
+ @echo $@:${:U:range=5:ts\x24:C,[0-9],,g:Q}:
+
+# Demonstrate that it is possible to generate dollar characters using the
+# :@ modifier.
+#
+# These are edge cases that could have resulted in a parse error as well
+# since the $@ at the end could have been interpreted as a variable, which
+# would mean a missing closing @ delimiter.
+mod-loop-dollar:
+ @echo $@:${:U1:@word@${word}$@:Q}:
+ @echo $@:${:U2:@word@$${word}$$@:Q}:
+ @echo $@:${:U3:@word@$$${word}$$$@:Q}:
+ @echo $@:${:U4:@word@{word}@:Q}:
+ @echo $@:${:U5:@word@${word}$@:Q}:
+ @echo $@:${:U6:@word@$${word}$$@:Q}:
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: riastradh
Date: Sat Jul 4 18:07:31 UTC 2020
Modified Files:
src/sys/opencrypto: cryptosoft.c
Log Message:
Fix kmem_free size in recent malloc->kmem conversion.
Should address this bracket report that has my name all over it:
https://mail-index.netbsd.org/current-users/2020/07/04/msg039059.html
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/opencrypto/cryptosoft.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/opencrypto/cryptosoft.c
diff -u src/sys/opencrypto/cryptosoft.c:1.56 src/sys/opencrypto/cryptosoft.c:1.57
--- src/sys/opencrypto/cryptosoft.c:1.56 Mon Jun 29 23:34:48 2020
+++ src/sys/opencrypto/cryptosoft.c Sat Jul 4 18:07:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptosoft.c,v 1.56 2020/06/29 23:34:48 riastradh Exp $ */
+/* $NetBSD: cryptosoft.c,v 1.57 2020/07/04 18:07:31 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
@@ -24,7 +24,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.56 2020/06/29 23:34:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.57 2020/07/04 18:07:31 riastradh Exp $");
#include
#include
@@ -1096,7 +1096,7 @@ swcr_freesession(void *arg, u_int64_t ti
}
if (swd->sw_octx) {
explicit_memset(swd->sw_octx, 0, swd->sw_klen);
-kmem_free(swd->sw_octx, axf->ctxsize);
+kmem_free(swd->sw_octx, swd->sw_klen);
}
break;
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 4 17:41:04 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: modmisc.exp modmisc.mk
Log Message:
make(1): expand the test for variable expansion in the :@ modifier
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/usr.bin/make/var.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/modmisc.exp
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/modmisc.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/var.c
diff -u src/usr.bin/make/var.c:1.254 src/usr.bin/make/var.c:1.255
--- src/usr.bin/make/var.c:1.254 Sat Jul 4 17:10:33 2020
+++ src/usr.bin/make/var.c Sat Jul 4 17:41:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $ */
+/* $NetBSD: var.c,v 1.255 2020/07/04 17:41:04 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.255 2020/07/04 17:41:04 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.255 2020/07/04 17:41:04 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1737,6 +1737,11 @@ VarModify(GNode *ctx, Var_Parse_State *v
av = brk_string(str, , FALSE, );
}
+if (DEBUG(VAR)) {
+ fprintf(debug_file, "VarModify: split \"%s\" into %d words\n",
+ str, ac);
+}
+
for (i = 0; i < ac; i++)
addSpace = modProc(ctx, vpstate, av[i], addSpace, , datum);
Index: src/usr.bin/make/unit-tests/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.11 src/usr.bin/make/unit-tests/modmisc.exp:1.12
--- src/usr.bin/make/unit-tests/modmisc.exp:1.11 Sat Jul 4 17:10:33 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp Sat Jul 4 17:41:04 2020
@@ -31,5 +31,5 @@ make: Unclosed substitution for (, miss
:a c:
:x__ 3 x__ 3:
:+one+ +two+ +three+:
-mod-at-resolve:w1a2w w1b2w w1a2 1b${RES2}w:
+mod-at-resolve:w1d2d3w w2i3w w1i2d3 2i${RES3}w w1d2d3 2i${RES3} 1i${RES2}w:
exit status 0
Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.10 src/usr.bin/make/unit-tests/modmisc.mk:1.11
--- src/usr.bin/make/unit-tests/modmisc.mk:1.10 Sat Jul 4 17:10:33 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk Sat Jul 4 17:41:04 2020
@@ -1,4 +1,4 @@
-# $Id: modmisc.mk,v 1.10 2020/07/04 17:10:33 rillig Exp $
+# $Id: modmisc.mk,v 1.11 2020/07/04 17:41:04 rillig Exp $
#
# miscellaneous modifier tests
@@ -84,9 +84,12 @@ mod-at-varname:
# The :@ modifier resolves the variables a little more often than expected.
# In particular, it resolves _all_ variables from the context, and not only
# the loop variable (in this case v).
+#
+# The d means direct reference, the i means indirect reference.
RESOLVE= ${RES1} $${RES1}
-RES1= 1a${RES2} 1b$${RES2}
-RES2= 2
+RES1= 1d${RES2} 1i$${RES2}
+RES2= 2d${RES3} 2i$${RES3}
+RES3= 3
mod-at-resolve:
@echo $@:${RESOLVE:@v@w${v}w@:Q}:
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: rin
Date: Sat Jul 4 17:20:45 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c
Log Message:
Do not panic when splraise to IPL_NONE, which is required for
subr_cprng.c rev 1.36 and above:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/subr_cprng.c#rev1.36
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/powerpc/booke/e500_intr.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/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.40 src/sys/arch/powerpc/booke/e500_intr.c:1.41
--- src/sys/arch/powerpc/booke/e500_intr.c:1.40 Sun Dec 1 15:34:45 2019
+++ src/sys/arch/powerpc/booke/e500_intr.c Sat Jul 4 17:20:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.40 2019/12/01 15:34:45 ad Exp $ */
+/* $NetBSD: e500_intr.c,v 1.41 2020/07/04 17:20:45 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
#define __INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.40 2019/12/01 15:34:45 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.41 2020/07/04 17:20:45 rin Exp $");
#include
#include
@@ -599,15 +599,16 @@ e500_splraise(int ipl)
msr = 0;
#endif
wrtee(msr);
- } else if (ipl == IPL_NONE) {
+ }
+#if 0
+ else if (ipl == IPL_NONE) {
panic("%s: %p: cpl=%u: attempt to splraise(IPL_NONE)",
__func__, __builtin_return_address(0), old_ipl);
-#if 0
} else if (old_ipl > ipl) {
printf("%s: %p: cpl=%u: ignoring splraise(%u) to lower ipl\n",
__func__, __builtin_return_address(0), old_ipl, ipl);
-#endif
}
+#endif
return old_ipl;
}
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 4 17:10:34 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: modmisc.exp modmisc.mk
Log Message:
make(1): add debugging output for :@ modifier
The inner working of the :@ modifier is quite tricky. To understand what
really happens, it helps to look at each word as it is being modified.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/usr.bin/make/var.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/modmisc.exp
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/modmisc.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/var.c
diff -u src/usr.bin/make/var.c:1.253 src/usr.bin/make/var.c:1.254
--- src/usr.bin/make/var.c:1.253 Sat Jul 4 16:30:47 2020
+++ src/usr.bin/make/var.c Sat Jul 4 17:10:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.253 2020/07/04 16:30:47 rillig Exp $ */
+/* $NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.253 2020/07/04 16:30:47 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.253 2020/07/04 16:30:47 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.254 2020/07/04 17:10:33 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1567,6 +1567,12 @@ VarLoopExpand(GNode *ctx MAKE_ATTR_UNUSE
if (*word) {
Var_Set_with_flags(loop->tvar, word, loop->ctxt, VAR_NO_EXPORT);
s = Var_Subst(NULL, loop->str, loop->ctxt, loop->flags);
+ if (DEBUG(VAR)) {
+ fprintf(debug_file,
+ "VarLoopExpand: in \"%s\", replace \"%s\" with \"%s\" "
+ "to \"%s\"\n",
+ word, loop->tvar, loop->str, s ? s : "(null)");
+ }
if (s != NULL && *s != '\0') {
if (addSpace && *s != '\n')
Buf_AddByte(buf, ' ');
Index: src/usr.bin/make/unit-tests/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.10 src/usr.bin/make/unit-tests/modmisc.exp:1.11
--- src/usr.bin/make/unit-tests/modmisc.exp:1.10 Sat Jul 4 16:15:21 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp Sat Jul 4 17:10:33 2020
@@ -31,4 +31,5 @@ make: Unclosed substitution for (, miss
:a c:
:x__ 3 x__ 3:
:+one+ +two+ +three+:
+mod-at-resolve:w1a2w w1b2w w1a2 1b${RES2}w:
exit status 0
Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.9 src/usr.bin/make/unit-tests/modmisc.mk:1.10
--- src/usr.bin/make/unit-tests/modmisc.mk:1.9 Sat Jul 4 16:15:21 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk Sat Jul 4 17:10:33 2020
@@ -1,4 +1,4 @@
-# $Id: modmisc.mk,v 1.9 2020/07/04 16:15:21 rillig Exp $
+# $Id: modmisc.mk,v 1.10 2020/07/04 17:10:33 rillig Exp $
#
# miscellaneous modifier tests
@@ -16,7 +16,7 @@ MOD_OPT=@d@$${exists($$d):?$$d:$${d:S,/u
MOD_SEP=S,:, ,g
all: modvar modvarloop modsysv mod-HTE emptyvar undefvar
-all: mod-S mod-C mod-at-varname
+all: mod-S mod-C mod-at-varname mod-at-resolve
modsysv:
@echo "The answer is ${libfoo.a:L:libfoo.a=42}"
@@ -80,3 +80,13 @@ mod-C:
# will ever depend on this, but technically it's possible.
mod-at-varname:
@echo :${:Uone two three:@${:Ubar:S,b,v,}@+${var}+@:Q}:
+
+# The :@ modifier resolves the variables a little more often than expected.
+# In particular, it resolves _all_ variables from the context, and not only
+# the loop variable (in this case v).
+RESOLVE= ${RES1} $${RES1}
+RES1= 1a${RES2} 1b$${RES2}
+RES2= 2
+
+mod-at-resolve:
+ @echo $@:${RESOLVE:@v@w${v}w@:Q}:
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: rin
Date: Sat Jul 4 16:58:11 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
Log Message:
Use tlen for temporary length variable instead of l, which is usually
used for struct lwp *.
No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.82 src/sys/arch/aarch64/aarch64/pmap.c:1.83
--- src/sys/arch/aarch64/aarch64/pmap.c:1.82 Thu Jul 2 13:01:11 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c Sat Jul 4 16:58:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.82 2020/07/02 13:01:11 rin Exp $ */
+/* $NetBSD: pmap.c,v 1.83 2020/07/04 16:58:11 rin Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.82 2020/07/02 13:01:11 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.83 2020/07/04 16:58:11 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -951,15 +951,15 @@ pmap_procwr(struct proc *p, vaddr_t sva,
struct pmap *pm = p->p_vmspace->vm_map.pmap;
paddr_t pa;
vaddr_t va, eva;
- int l;
+ int tlen;
- for (va = sva; len > 0; va = eva, len -= l) {
+ for (va = sva; len > 0; va = eva, len -= tlen) {
eva = uimin(va + len, trunc_page(va + PAGE_SIZE));
- l = eva - va;
+ tlen = eva - va;
if (!pmap_extract(pm, va, ))
continue;
va = AARCH64_PA_TO_KVA(pa);
- cpu_icache_sync_range(va, l);
+ cpu_icache_sync_range(va, tlen);
}
}
}
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 4 16:30:47 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): constify VarModify parameter
Since var.c r1.238 and r1.239, the callbacks for the :H :T :E :R modifiers
don't modify the word anymore, and the others didn't modify it at all.
To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.252 src/usr.bin/make/var.c:1.253
--- src/usr.bin/make/var.c:1.252 Sat Jul 4 15:44:07 2020
+++ src/usr.bin/make/var.c Sat Jul 4 16:30:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.252 2020/07/04 15:44:07 rillig Exp $ */
+/* $NetBSD: var.c,v 1.253 2020/07/04 16:30:47 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.252 2020/07/04 15:44:07 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.253 2020/07/04 16:30:47 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.252 2020/07/04 15:44:07 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.253 2020/07/04 16:30:47 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1125,14 +1125,14 @@ Var_Value(const char *name, GNode *ctxt,
* It returns the addSpace value for the next call of this callback. Typical
* return values are the current addSpaces or TRUE. */
typedef Boolean (*VarModifyCallback)(GNode *ctxt, Var_Parse_State *vpstate,
-char *word, Boolean addSpace, Buffer *buf, void *data);
+const char *word, Boolean addSpace, Buffer *buf, void *data);
/* Callback function for VarModify to implement the :H modifier.
* Add the dirname of the given word to the buffer. */
static Boolean
VarHead(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate,
- char *word, Boolean addSpace, Buffer *buf,
+ const char *word, Boolean addSpace, Buffer *buf,
void *dummy MAKE_ATTR_UNUSED)
{
const char *slash = strrchr(word, '/');
@@ -1151,7 +1151,7 @@ VarHead(GNode *ctx MAKE_ATTR_UNUSED, Var
* Add the basename of the given word to the buffer. */
static Boolean
VarTail(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate,
- char *word, Boolean addSpace, Buffer *buf,
+ const char *word, Boolean addSpace, Buffer *buf,
void *dummy MAKE_ATTR_UNUSED)
{
const char *slash = strrchr(word, '/');
@@ -1167,7 +1167,7 @@ VarTail(GNode *ctx MAKE_ATTR_UNUSED, Var
* Add the filename suffix of the given word to the buffer, if it exists. */
static Boolean
VarSuffix(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate,
- char *word, Boolean addSpace, Buffer *buf,
+ const char *word, Boolean addSpace, Buffer *buf,
void *dummy MAKE_ATTR_UNUSED)
{
const char *dot = strrchr(word, '.');
@@ -1184,7 +1184,7 @@ VarSuffix(GNode *ctx MAKE_ATTR_UNUSED, V
* Add the filename basename of the given word to the buffer. */
static Boolean
VarRoot(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate,
- char *word, Boolean addSpace, Buffer *buf,
+ const char *word, Boolean addSpace, Buffer *buf,
void *dummy MAKE_ATTR_UNUSED)
{
char *dot = strrchr(word, '.');
@@ -1200,7 +1200,7 @@ VarRoot(GNode *ctx MAKE_ATTR_UNUSED, Var
* Place the word in the buffer if it matches the given pattern. */
static Boolean
VarMatch(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate,
- char *word, Boolean addSpace, Buffer *buf,
+ const char *word, Boolean addSpace, Buffer *buf,
void *data)
{
const char *pattern = data;
@@ -1218,7 +1218,7 @@ VarMatch(GNode *ctx MAKE_ATTR_UNUSED, Va
/* Callback function for VarModify to implement the :%.from=%.to modifier. */
static Boolean
VarSYSVMatch(GNode *ctx, Var_Parse_State *vpstate,
- char *word, Boolean addSpace, Buffer *buf,
+ const char *word, Boolean addSpace, Buffer *buf,
void *data)
{
size_t len;
@@ -1245,7 +1245,7 @@ VarSYSVMatch(GNode *ctx, Var_Parse_State
* Place the word in the buffer if it doesn't match the given pattern. */
static Boolean
VarNoMatch(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate,
- char *word, Boolean addSpace, Buffer *buf,
+ const char *word, Boolean addSpace, Buffer *buf,
void *data)
{
const char *pattern = data;
@@ -1261,11 +1261,11 @@ VarNoMatch(GNode *ctx MAKE_ATTR_UNUSED,
* Perform a string substitution on the given word. */
static Boolean
VarSubstitute(GNode *ctx MAKE_ATTR_UNUSED, Var_Parse_State *vpstate,
- char *word, Boolean addSpace, Buffer *buf,
+ const char *word, Boolean addSpace, Buffer *buf,
void *data)
{
int wordLen = strlen(word);
-char *cp; /* General pointer */
+const char *cp; /* General pointer */
VarPattern *pattern = data;
if ((pattern->flags &
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sat Jul 4 16:15:21 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: modmisc.exp modmisc.mk
Log Message:
make(1): add test for an obscure edge case of using the :@ modifier
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/modmisc.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/modmisc.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/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.9 src/usr.bin/make/unit-tests/modmisc.exp:1.10
--- src/usr.bin/make/unit-tests/modmisc.exp:1.9 Sat Jul 4 09:21:30 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp Sat Jul 4 16:15:21 2020
@@ -30,4 +30,5 @@ make: Unclosed substitution for (, miss
:C,word,,:Q}:
:a c:
:x__ 3 x__ 3:
+:+one+ +two+ +three+:
exit status 0
Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.8 src/usr.bin/make/unit-tests/modmisc.mk:1.9
--- src/usr.bin/make/unit-tests/modmisc.mk:1.8 Sat Jul 4 09:21:30 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk Sat Jul 4 16:15:21 2020
@@ -1,4 +1,4 @@
-# $Id: modmisc.mk,v 1.8 2020/07/04 09:21:30 rillig Exp $
+# $Id: modmisc.mk,v 1.9 2020/07/04 16:15:21 rillig Exp $
#
# miscellaneous modifier tests
@@ -16,7 +16,7 @@ MOD_OPT=@d@$${exists($$d):?$$d:$${d:S,/u
MOD_SEP=S,:, ,g
all: modvar modvarloop modsysv mod-HTE emptyvar undefvar
-all: mod-S mod-C
+all: mod-S mod-C mod-at-varname
modsysv:
@echo "The answer is ${libfoo.a:L:libfoo.a=42}"
@@ -74,3 +74,9 @@ mod-C:
@echo :${:Uword1 word2:C,,,g:C,word,,:Q}:
@echo :${:Ua b b c:C,b,,g:Q}:
@echo :${:U1 2 3 1 2 3:C,1 2,___,Wg:C,_,x,:Q}:
+
+# In the :@ modifier, the name of the loop variable can even be generated
+# dynamically. There's no practical use-case for this, and hopefully nobody
+# will ever depend on this, but technically it's possible.
+mod-at-varname:
+ @echo :${:Uone two three:@${:Ubar:S,b,v,}@+${var}+@:Q}:
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 4 15:44:07 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): fix :hash modifier on 16-bit platforms
On platforms where int has only 16 bits the shifts would have been in
16-bit arithmetic, which would invoke undefined behavior for "ustr[3] <<
24" as well as "ustr[2] << 16" (C99, 6.5.7p3).
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.251 src/usr.bin/make/var.c:1.252
--- src/usr.bin/make/var.c:1.251 Sat Jul 4 10:49:09 2020
+++ src/usr.bin/make/var.c Sat Jul 4 15:44:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.251 2020/07/04 10:49:09 rillig Exp $ */
+/* $NetBSD: var.c,v 1.252 2020/07/04 15:44:07 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.251 2020/07/04 10:49:09 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.252 2020/07/04 15:44:07 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.251 2020/07/04 10:49:09 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.252 2020/07/04 15:44:07 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -2104,12 +2104,12 @@ VarQuote(char *str, Boolean quoteDollar)
*---
*/
static char *
-VarHash(char *str)
+VarHash(const char *str)
{
static const charhexdigits[16] = "0123456789abcdef";
Buffer buf;
size_t len, len2;
-unsigned char *ustr = (unsigned char *)str;
+const unsigned char *ustr = (const unsigned char *)str;
uint32_t h, k, c1, c2;
h = 0x971e137bU;
@@ -2121,18 +2121,21 @@ VarHash(char *str)
k = 0;
switch (len) {
default:
- k = (ustr[3] << 24) | (ustr[2] << 16) | (ustr[1] << 8) | ustr[0];
+ k = ((uint32_t)ustr[3] << 24) |
+ ((uint32_t)ustr[2] << 16) |
+ ((uint32_t)ustr[1] << 8) |
+ (uint32_t)ustr[0];
len -= 4;
ustr += 4;
break;
case 3:
- k |= (ustr[2] << 16);
+ k |= (uint32_t)ustr[2] << 16;
/* FALLTHROUGH */
case 2:
- k |= (ustr[1] << 8);
+ k |= (uint32_t)ustr[1] << 8;
/* FALLTHROUGH */
case 1:
- k |= ustr[0];
+ k |= (uint32_t)ustr[0];
len = 0;
}
c1 = c1 * 5 + 0x7b7d159cU;
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Sat Jul 4 15:14:56 UTC 2020 Modified Files: src/sys/arch/evbarm/rpi: vcprop_subr.c Removed Files: src/sys/arch/evbarm/rpi: rpi.h Log Message: G/C To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/rpi/rpi.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/rpi/vcprop_subr.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/evbarm/rpi/vcprop_subr.c diff -u src/sys/arch/evbarm/rpi/vcprop_subr.c:1.5 src/sys/arch/evbarm/rpi/vcprop_subr.c:1.6 --- src/sys/arch/evbarm/rpi/vcprop_subr.c:1.5 Mon Jan 1 17:03:25 2018 +++ src/sys/arch/evbarm/rpi/vcprop_subr.c Sat Jul 4 15:14:56 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vcprop_subr.c,v 1.5 2018/01/01 17:03:25 skrll Exp $ */ +/* $NetBSD: vcprop_subr.c,v 1.6 2020/07/04 15:14:56 skrll Exp $ */ /* * Copyright (c) 2014 Michael Lorenz @@ -43,8 +43,6 @@ #include #include -#include - #include int
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sat Jul 4 14:55:18 UTC 2020 Modified Files: othersrc/usr.bin/tnftp: ChangeLog Log Message: ChangeLog: ftp and libedit imports To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 othersrc/usr.bin/tnftp/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/ChangeLog diff -u othersrc/usr.bin/tnftp/ChangeLog:1.69 othersrc/usr.bin/tnftp/ChangeLog:1.70 --- othersrc/usr.bin/tnftp/ChangeLog:1.69 Mon Feb 1 10:33:26 2016 +++ othersrc/usr.bin/tnftp/ChangeLog Sat Jul 4 14:55:18 2020 @@ -1,4 +1,58 @@ -$NetBSD: ChangeLog,v 1.69 2016/02/01 10:33:26 lukem Exp $ +$NetBSD: ChangeLog,v 1.70 2020/07/04 14:55:18 lukem Exp $ + +Sat Jul 4 14:51:41 UTC 2020 lukem + + * Merge NetBSD libedit from 20160131 to 20200704: + * Fix uninitialized memory access in libedit history. PR/54399 + * Fix out-of-bounds read in libedit c_delbefore. PR/54400 + * Avoid segmentation fault in bad history file. PR/53597 + * Fix crash in history saving. PR/52849 + * Fix crash in c_gets(). + * Fix crash in re_fastputc(). + * Fix crash with backspacing on a long line. + * Fix patbuf updating. + * Save and restore errno in signal handler. + * Fix cursor movement. PR/54654, PR/54329 + * Fix cursor after resize. PR/52359 + * Fix terminal restoration if piped. PR/50863 + * Fix memory leaks. + * Various UTF-8 fixes. + * Implementation improvements. + * Readline compatibility improvements (not used by ftp). + * and chartype portability improvements. + * Remove 4 clause BSD licenses. + * Default editrc is $EDITRC, falling back to $HOME/.editrc. + * Add literal escape sequence support, patterned after the + tcsh ones. + * Support pasting multiline buffers. + * Fix errno / el_errno handling. + * Improve directory completion in subdirs with only one match. + * Add support for escaping special characters when doing + filename completion. + * Only quote the completion matches if we are doing filename + completion. + * Don't escape strings with user-supplied completion functions. + * Grow the buffer for event search if there was not enough + space. + * Use strncpy() or strlcpy() instead of memcpy(). + * (Many fixes were from Ingo Schwarze.) + + * Merge NetBSD ftp from 20151003 to 20200608: + * Avoid crashes by exiting if lostpeer due to a signal + (e.g., remote server disconnection). + * Issue PWD commands to the server only when we actually + need the results, not speculatively, just in case we might. + Works around broken servers, and is quicker too. + * Fix error reporting when handling TLS connections. + * Use "anonymous" instead of the local username for anonymous + ftp. Avoids unnecesary information leak. + * Correct format of IPv6 endpoint reporting. + * Refactoring and build fixes. + * Support using CONNECT for https:// via proxy. + NetBSD PR/50438, PR/51043. + * Fix downloads of local files using file:// URLs + * Use the first name we requested the http/https URL for, + not any name we ended up with after random redirects. Mon Feb 1 10:29:47 UTC 2016 lukem
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sat Jul 4 14:51:16 UTC 2020 Modified Files: othersrc/usr.bin/tnftp: todo Log Message: TODO: autoconf option to use system libedit instead of internal To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/todo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/todo diff -u othersrc/usr.bin/tnftp/todo:1.13 othersrc/usr.bin/tnftp/todo:1.14 --- othersrc/usr.bin/tnftp/todo:1.13 Sun May 5 13:23:03 2013 +++ othersrc/usr.bin/tnftp/todo Sat Jul 4 14:51:15 2020 @@ -1,8 +1,10 @@ -$NetBSD: todo,v 1.13 2013/05/05 13:23:03 lukem Exp $ +$NetBSD: todo,v 1.14 2020/07/04 14:51:15 lukem Exp $ Current Items - +add autoconf control to use system libedit instead of internal libedit + autoconf test for HAVE_DECL_GETADDRINFO if providing getaddrinfo() override. (required for UnixWare 7.1.1)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jdolecek
Date: Sat Jul 4 14:49:24 UTC 2020
Modified Files:
src/sys/dev/pci: ciss_pci.c uhci_pci.c
Log Message:
switch to pci_intr_alloc() so this uses MSI/MSI-X if device supports it
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ciss_pci.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/uhci_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ciss_pci.c
diff -u src/sys/dev/pci/ciss_pci.c:1.15 src/sys/dev/pci/ciss_pci.c:1.16
--- src/sys/dev/pci/ciss_pci.c:1.15 Sun Dec 9 11:14:01 2018
+++ src/sys/dev/pci/ciss_pci.c Sat Jul 4 14:49:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss_pci.c,v 1.15 2018/12/09 11:14:01 jdolecek Exp $ */
+/* $NetBSD: ciss_pci.c,v 1.16 2020/07/04 14:49:24 jdolecek Exp $ */
/* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.15 2018/12/09 11:14:01 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.16 2020/07/04 14:49:24 jdolecek Exp $");
#include
#include
@@ -263,7 +263,7 @@ ciss_pci_attach(device_t parent, device_
struct ciss_softc *sc = device_private(self);
struct pci_attach_args *pa = aux;
bus_size_t size, cfgsz;
- pci_intr_handle_t ih;
+ pci_intr_handle_t *ih;
const char *intrstr;
int cfg_bar, memtype;
pcireg_t reg = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
@@ -339,16 +339,16 @@ ciss_pci_attach(device_t parent, device_
bus_space_read_4(sc->sc_iot, sc->sc_ioh, CISS_IMR) | sc->iem);
#endif
- if (pci_intr_map(pa, )) {
+ if (pci_intr_alloc(pa, , NULL, 0) != 0) {
aprint_error_dev(self, "can't map interrupt\n");
bus_space_unmap(sc->sc_iot, sc->sc_ioh, size);
if (cfg_bar != CISS_BAR)
bus_space_unmap(sc->sc_iot, sc->cfg_ioh, cfgsz);
return;
}
- intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, ciss_intr,
- sc, device_xname(self));
+ intrstr = pci_intr_string(pa->pa_pc, ih[0], intrbuf, sizeof(intrbuf));
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih[0], IPL_BIO,
+ ciss_intr, sc, device_xname(self));
if (!sc->sc_ih) {
aprint_error_dev(sc->sc_dev, "can't establish interrupt");
if (intrstr)
Index: src/sys/dev/pci/uhci_pci.c
diff -u src/sys/dev/pci/uhci_pci.c:1.63 src/sys/dev/pci/uhci_pci.c:1.64
--- src/sys/dev/pci/uhci_pci.c:1.63 Thu May 10 03:41:00 2018
+++ src/sys/dev/pci/uhci_pci.c Sat Jul 4 14:49:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.63 2018/05/10 03:41:00 msaitoh Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.64 2020/07/04 14:49:24 jdolecek Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.63 2018/05/10 03:41:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.64 2020/07/04 14:49:24 jdolecek Exp $");
#include "ehci.h"
@@ -91,7 +91,7 @@ uhci_pci_attach(device_t parent, device_
pci_chipset_tag_t pc = pa->pa_pc;
pcitag_t tag = pa->pa_tag;
char const *intrstr;
- pci_intr_handle_t ih;
+ pci_intr_handle_t *ih;
pcireg_t csr;
int s;
char intrbuf[PCI_INTRSTR_LEN];
@@ -126,12 +126,12 @@ uhci_pci_attach(device_t parent, device_
csr | PCI_COMMAND_MASTER_ENABLE);
/* Map and establish the interrupt. */
- if (pci_intr_map(pa, )) {
+ if (pci_intr_alloc(pa, , NULL, 0) != 0) {
aprint_error_dev(self, "couldn't map interrupt\n");
return;
}
- intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_USB, uhci_intr, sc,
+ intrstr = pci_intr_string(pc, ih[0], intrbuf, sizeof(intrbuf));
+ sc->sc_ih = pci_intr_establish_xname(pc, ih[0], IPL_USB, uhci_intr, sc,
device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sat Jul 4 14:47:35 UTC 2020 Modified Files: othersrc/usr.bin/tnftp: tnftp.h Log Message: tnftp.h: add __UNVOLATILE. reformat __UNCONST To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 othersrc/usr.bin/tnftp/tnftp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/tnftp.h diff -u othersrc/usr.bin/tnftp/tnftp.h:1.38 othersrc/usr.bin/tnftp/tnftp.h:1.39 --- othersrc/usr.bin/tnftp/tnftp.h:1.38 Sat Jul 4 14:31:04 2020 +++ othersrc/usr.bin/tnftp/tnftp.h Sat Jul 4 14:47:35 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: tnftp.h,v 1.38 2020/07/04 14:31:04 lukem Exp $ */ +/* $NetBSD: tnftp.h,v 1.39 2020/07/04 14:47:35 lukem Exp $ */ #ifndef TNFTP_H #define TNFTP_H 1 @@ -521,6 +521,11 @@ int vasprintf(char **, const char *, va_ #ifdef __UNCONST #undef __UNCONST #endif -#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) +#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) + +#ifdef __UNVOLATILE +#undef __UNVOLATILE +#endif +#define __UNVOLATILE(a) ((void *)(unsigned long)(volatile void *)(a)) #endif /* TNFTP_H */
CVS commit: othersrc/usr.bin/tnftp/libedit
Module Name:othersrc
Committed By: lukem
Date: Sat Jul 4 14:34:28 UTC 2020
Modified Files:
othersrc/usr.bin/tnftp/libedit: Makefile.am literal.c vi.c
Log Message:
fix libedit build after 20200704 merge
adapt the build of libedit for the changes in upstream;
- generate appropriate headers
- tnftp-ify literal.c and vi.c
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/libedit/Makefile.am
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/usr.bin/tnftp/libedit/literal.c
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/libedit/vi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/libedit/Makefile.am
diff -u othersrc/usr.bin/tnftp/libedit/Makefile.am:1.4 othersrc/usr.bin/tnftp/libedit/Makefile.am:1.5
--- othersrc/usr.bin/tnftp/libedit/Makefile.am:1.4 Sun Jan 31 22:18:35 2016
+++ othersrc/usr.bin/tnftp/libedit/Makefile.am Sat Jul 4 14:34:28 2020
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.4 2016/01/31 22:18:35 lukem Exp $
+## $NetBSD: Makefile.am,v 1.5 2020/07/04 14:34:28 lukem Exp $
noinst_LTLIBRARIES = libedit.la
@@ -7,19 +7,25 @@ libedit_la_SOURCES = \
chartype.c \
common.c \
el.c \
+ eln.c \
emacs.c \
+ filecomplete.c \
hist.c \
history.c \
+ historyn.c \
keymacro.c \
+ literal.c \
map.c \
parse.c \
prompt.c \
read.c \
+ readline.c \
refresh.c \
search.c \
sig.c \
terminal.c \
tokenizer.c \
+ tokenizern.c \
tty.c \
vi.c
@@ -36,9 +42,8 @@ libedit_la_LIBADD = \
generated_files = \
common.h \
emacs.h \
- fcns.c \
fcns.h \
- help.c \
+ func.h \
help.h\
vi.h
@@ -66,31 +71,30 @@ common.h: common.c
fcns.h: vi.h emacs.h common.h
$(AM_V_GEN)$(MAKELIST) -fh vi.h emacs.h common.h > $@
-fcns.c: vi.h emacs.h common.h fcns.h help.h
+func.h: vi.h emacs.h common.h
$(AM_V_GEN)$(MAKELIST) -fc vi.h emacs.h common.h > $@
-help.c: vi.c emacs.c common.c
- $(AM_V_GEN)$(MAKELIST) -bc $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
-
help.h: vi.c emacs.c common.c
$(AM_V_GEN)$(MAKELIST) -bh $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
EXTRA_DIST = \
+ TEST \
chared.h \
chartype.h \
+ config.h \
editline.3 \
+ editline.7 \
editrc.5 \
el.h \
- filecomplete.c \
filecomplete.h \
hist.h \
histedit.h \
keymacro.h \
+ literal.h \
map.h \
parse.h \
prompt.h \
read.h \
- readline.c \
readline/readline.h \
refresh.h \
search.h \
Index: othersrc/usr.bin/tnftp/libedit/literal.c
diff -u othersrc/usr.bin/tnftp/libedit/literal.c:1.1.1.1 othersrc/usr.bin/tnftp/libedit/literal.c:1.2
--- othersrc/usr.bin/tnftp/libedit/literal.c:1.1.1.1 Sat Jul 4 12:41:18 2020
+++ othersrc/usr.bin/tnftp/libedit/literal.c Sat Jul 4 14:34:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: literal.c,v 1.1.1.1 2020/07/04 12:41:18 lukem Exp $ */
+/* $NetBSD: literal.c,v 1.2 2020/07/04 14:34:28 lukem Exp $ */
/* from NetBSD: literal.c,v 1.5 2019/07/23 13:10:11 christos Exp */
/*-
@@ -31,17 +31,23 @@
*/
#include "config.h"
+
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
__RCSID(" NetBSD: literal.c,v 1.5 2019/07/23 13:10:11 christos Exp ");
#endif /* not lint && not SCCSID */
+#endif /* tnftp */
/*
* literal.c: Literal sequences handling.
*/
+#if 0 /* tnftp */
#include
#include
#include
#include
+#endif /* tnftp */
+
#include "el.h"
libedit_private void
Index: othersrc/usr.bin/tnftp/libedit/vi.c
diff -u othersrc/usr.bin/tnftp/libedit/vi.c:1.9 othersrc/usr.bin/tnftp/libedit/vi.c:1.10
--- othersrc/usr.bin/tnftp/libedit/vi.c:1.9 Sat Jul 4 13:43:21 2020
+++ othersrc/usr.bin/tnftp/libedit/vi.c Sat Jul 4 14:34:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.9 2020/07/04 13:43:21 lukem Exp $ */
+/* $NetBSD: vi.c,v 1.10 2020/07/04 14:34:28 lukem Exp $ */
/* from NetBSD: vi.c,v 1.63 2019/07/23 10:18:52 christos Exp */
/*-
@@ -35,6 +35,7 @@
#include "config.h"
+#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
#if 0
static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
@@ -42,6 +43,7 @@ static char sccsid[] = "@(#)vi.c 8.1 (Be
__RCSID(" NetBSD: vi.c,v 1.63 2019/07/23 10:18:52 christos Exp ");
#endif
#endif /* not lint && not SCCSID */
+#endif /* tnftp */
/*
* vi.c: Vi mode commands.
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sat Jul 4 14:31:04 UTC 2020 Modified Files: othersrc/usr.bin/tnftp: tnftp.h Log Message: tnftp.h: multiple-include protection To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 othersrc/usr.bin/tnftp/tnftp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/tnftp.h diff -u othersrc/usr.bin/tnftp/tnftp.h:1.37 othersrc/usr.bin/tnftp/tnftp.h:1.38 --- othersrc/usr.bin/tnftp/tnftp.h:1.37 Sun Jan 31 06:10:20 2016 +++ othersrc/usr.bin/tnftp/tnftp.h Sat Jul 4 14:31:04 2020 @@ -1,4 +1,7 @@ -/* $NetBSD: tnftp.h,v 1.37 2016/01/31 06:10:20 lukem Exp $ */ +/* $NetBSD: tnftp.h,v 1.38 2020/07/04 14:31:04 lukem Exp $ */ + +#ifndef TNFTP_H +#define TNFTP_H 1 #define FTP_PRODUCT PACKAGE_NAME #define FTP_VERSION PACKAGE_VERSION @@ -519,3 +522,5 @@ int vasprintf(char **, const char *, va_ #undef __UNCONST #endif #define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) + +#endif /* TNFTP_H */
CVS import: othersrc/usr.bin/tnftp/libedit
Module Name:othersrc Committed By: lukem Date: Sat Jul 4 12:52:56 UTC 2020 Update of /cvsroot/othersrc/usr.bin/tnftp/libedit In directory ivanova.netbsd.org:/tmp/cvs-serv19987 Log Message: Update libedit from NetBSD-current 20200704 Notable changes since import on 20160131: * Fix uninitialized memory access in libedit history. PR/54399 * Fix out-of-bounds read in libedit c_delbefore. PR/54400 * Avoid segmentation fault in bad history file. PR/53597 * Fix crash in history saving. PR/52849 * Fix crash in c_gets(). * Fix crash in re_fastputc(). * Fix crash with backspacing on a long line. * Fix patbuf updating. * Save and restore errno in signal handler. * Fix cursor movement. PR/54654, PR/54329 * Fix cursor after resize. PR/52359 * Fix terminal restoration if piped. PR/50863 * Fix memory leaks. * Various UTF-8 fixes. * Implementation improvements. * Readline compatibility improvements (not used by ftp). * and chartype portability improvements. * Remove 4 clause BSD licenses. * Default editrc is $EDITRC, falling back to $HOME/.editrc. * Add literal escape sequence support, patterned after the tcsh ones. * Support pasting multiline buffers. * Fix errno / el_errno handling. * Improve directory completion in subdirs with only one match. * Add support for escaping special characters when doing filename completion. * Only quote the completion matches if we are doing filename completion. * Don't escape strings with user-supplied completion functions. * Grow the buffer for event search if there was not enough space. * Use strncpy() or strlcpy() instead of memcpy(). * (Many fixes were from Ingo Schwarze.) Status: Vendor Tag: NetBSD Release Tags: NetBSD-libedit-20200704 C othersrc/usr.bin/tnftp/libedit/histedit.h C othersrc/usr.bin/tnftp/libedit/hist.h C othersrc/usr.bin/tnftp/libedit/sig.h C othersrc/usr.bin/tnftp/libedit/terminal.c U othersrc/usr.bin/tnftp/libedit/chartype.h C othersrc/usr.bin/tnftp/libedit/chared.h C othersrc/usr.bin/tnftp/libedit/parse.h U othersrc/usr.bin/tnftp/libedit/keymacro.h C othersrc/usr.bin/tnftp/libedit/editline.3 C othersrc/usr.bin/tnftp/libedit/prompt.c U othersrc/usr.bin/tnftp/libedit/shlib_version C othersrc/usr.bin/tnftp/libedit/filecomplete.c C othersrc/usr.bin/tnftp/libedit/read.c C othersrc/usr.bin/tnftp/libedit/emacs.c N othersrc/usr.bin/tnftp/libedit/literal.h U othersrc/usr.bin/tnftp/libedit/terminal.h C othersrc/usr.bin/tnftp/libedit/search.c C othersrc/usr.bin/tnftp/libedit/map.h C othersrc/usr.bin/tnftp/libedit/parse.c C othersrc/usr.bin/tnftp/libedit/read.h C othersrc/usr.bin/tnftp/libedit/vi.c C othersrc/usr.bin/tnftp/libedit/readline.c C othersrc/usr.bin/tnftp/libedit/el.c C othersrc/usr.bin/tnftp/libedit/filecomplete.h C othersrc/usr.bin/tnftp/libedit/makelist N othersrc/usr.bin/tnftp/libedit/tokenizern.c C othersrc/usr.bin/tnftp/libedit/prompt.h C othersrc/usr.bin/tnftp/libedit/common.c C othersrc/usr.bin/tnftp/libedit/hist.c C othersrc/usr.bin/tnftp/libedit/tty.h C othersrc/usr.bin/tnftp/libedit/tokenizer.c N othersrc/usr.bin/tnftp/libedit/historyn.c C othersrc/usr.bin/tnftp/libedit/editrc.5 C othersrc/usr.bin/tnftp/libedit/el.h N othersrc/usr.bin/tnftp/libedit/literal.c C othersrc/usr.bin/tnftp/libedit/map.c C othersrc/usr.bin/tnftp/libedit/history.c C othersrc/usr.bin/tnftp/libedit/search.h C othersrc/usr.bin/tnftp/libedit/keymacro.c C othersrc/usr.bin/tnftp/libedit/Makefile C othersrc/usr.bin/tnftp/libedit/chared.c C othersrc/usr.bin/tnftp/libedit/refresh.h C othersrc/usr.bin/tnftp/libedit/sig.c C othersrc/usr.bin/tnftp/libedit/refresh.c C othersrc/usr.bin/tnftp/libedit/sys.h C othersrc/usr.bin/tnftp/libedit/tty.c C othersrc/usr.bin/tnftp/libedit/config.h C othersrc/usr.bin/tnftp/libedit/chartype.c U othersrc/usr.bin/tnftp/libedit/eln.c N othersrc/usr.bin/tnftp/libedit/editline.7 C othersrc/usr.bin/tnftp/libedit/readline/readline.h C othersrc/usr.bin/tnftp/libedit/readline/Makefile N othersrc/usr.bin/tnftp/libedit/TEST/test_filecompletion.c U othersrc/usr.bin/tnftp/libedit/TEST/tc1.c U othersrc/usr.bin/tnftp/libedit/TEST/wtc1.c C othersrc/usr.bin/tnftp/libedit/TEST/Makefile U othersrc/usr.bin/tnftp/libedit/TEST/rl1.c 43 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/libedit
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: rin Date: Sat Jul 4 12:04:15 UTC 2020 Modified Files: src/sys/arch/macppc/conf: POWERMAC_G5_11_2 Log Message: Add missing TMPFS, PTYFS, WAPBL, INET6, and NFS_BOOT_DHCP. XXX Sync options with GENERIC. It should be better to introduce GENERIC.common in a similar manner to evbarm. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/macppc/conf/POWERMAC_G5_11_2 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/macppc/conf/POWERMAC_G5_11_2 diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.17 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.18 --- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.17 Sat Jul 4 12:00:15 2020 +++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2 Sat Jul 4 12:04:15 2020 @@ -51,14 +51,17 @@ include "conf/compat_netbsd30.config" # File systems file-system FFS # UFS file-system MFS # memory file system +file-system TMPFS # Efficient memory file-system file-system KERNFS # /kern file-system PROCFS # /proc file-system NFS # Network File System client +file-system PTYFS # /dev/pts/N support # File system options #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independent support +options WAPBL # File system journaling support #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental #options NFSSERVER # Network File System server #options FFS_NO_SNAPSHOT # ffs snapshots @@ -68,6 +71,7 @@ file-system NFS # Network File System # Networking options #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP +options INET6 # IPV6 # These options enable verbose messages for several subsystems. # Warning, these may compile large string tables into the kernel! @@ -85,7 +89,8 @@ options FONT_GALLANT12x22 # Kernel root file system and dump configuration. config netbsd root on ? type ? #config netbsd root on gem0 type nfs -#options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM +options NFS_BOOT_DHCP +#options NFS_BOOT_BOOTPARAM # # Device configuration
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: rin Date: Sat Jul 4 12:00:15 UTC 2020 Modified Files: src/sys/arch/macppc/conf: POWERMAC_G5_11_2 Log Message: Enable snapper(4) and friends. It works just fine. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/conf/POWERMAC_G5_11_2 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/macppc/conf/POWERMAC_G5_11_2 diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.16 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.17 --- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.16 Sat Apr 4 15:56:25 2020 +++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2 Sat Jul 4 12:00:15 2020 @@ -118,7 +118,7 @@ ppb* at pci? dev ? function ? # PCI-PCI obio0 at pci? dev ? function ? zsc* at obio? zstty* at zsc? channel ? -#snapper* at obio? +snapper* at obio? ki2c* at obio? # Keywest I2C iic* at ki2c? @@ -129,10 +129,10 @@ smusat* at iic? deq* at iic? # Audio support -#audio* at audiobus? +audio* at audiobus? -#spkr* at audio? # PC speaker (synthesized) -#wsbell* at spkr? +spkr* at audio? # PC speaker (synthesized) +wsbell* at spkr? bge* at pci? dev ? function ? # gmac ethernet brgphy* at mii? phy ? # Broadcom BCM5400 PHYs
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: rin
Date: Sat Jul 4 11:55:18 UTC 2020
Modified Files:
src/sys/arch/macppc/dev: smu.c
Log Message:
- Adjust location of \n in attach message.
- Convert to aprint_*(9).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/dev/smu.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/macppc/dev/smu.c
diff -u src/sys/arch/macppc/dev/smu.c:1.8 src/sys/arch/macppc/dev/smu.c:1.9
--- src/sys/arch/macppc/dev/smu.c:1.8 Sun Dec 22 23:23:30 2019
+++ src/sys/arch/macppc/dev/smu.c Sat Jul 4 11:55:18 2020
@@ -217,6 +217,8 @@ smu_attach(device_t parent, device_t sel
return;
}
+ aprint_normal("\n");
+
smu_setup_fans(sc);
smu_setup_iicbus(sc);
@@ -227,7 +229,6 @@ smu_attach(device_t parent, device_t sel
smu_setup_sme(sc);
- printf("\n");
smu_setup_zones(sc);
}
@@ -866,7 +867,8 @@ smu_setup_zones(struct smu_softc *sc)
z->nfans++;
}
}
- printf("using %d fans for CPU zone\n", z->nfans);
+ aprint_normal_dev(sc->sc_dev,
+ "using %d fans for CPU zone\n", z->nfans);
z->threshold = C_TO_uK(45);
z->duty = 150;
z->step = 3;
@@ -881,7 +883,8 @@ smu_setup_zones(struct smu_softc *sc)
z->nfans++;
}
}
- printf("using %d fans for drive bay zone\n", z->nfans);
+ aprint_normal_dev(sc->sc_dev,
+ "using %d fans for drive bay zone\n", z->nfans);
z->threshold = C_TO_uK(40);
z->duty = 150;
z->step = 2;
@@ -897,7 +900,8 @@ smu_setup_zones(struct smu_softc *sc)
z->nfans++;
}
}
- printf("using %d fans for expansion slots zone\n", z->nfans);
+ aprint_normal_dev(sc->sc_dev,
+ "using %d fans for expansion slots zone\n", z->nfans);
z->threshold = C_TO_uK(40);
z->duty = 150;
z->step = 2;
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 4 10:49:09 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): remove unnecessary _t suffix from VarLoop type
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.250 src/usr.bin/make/var.c:1.251
--- src/usr.bin/make/var.c:1.250 Sat Jul 4 10:46:31 2020
+++ src/usr.bin/make/var.c Sat Jul 4 10:49:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.250 2020/07/04 10:46:31 rillig Exp $ */
+/* $NetBSD: var.c,v 1.251 2020/07/04 10:49:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.250 2020/07/04 10:46:31 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.251 2020/07/04 10:49:09 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.250 2020/07/04 10:46:31 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.251 2020/07/04 10:49:09 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -278,7 +278,7 @@ typedef struct {
char *str; /* string to expand */
int strLen;
Varf_Flags flags;
-} VarLoop_t;
+} VarLoop;
#ifndef NO_REGEX
/* struct passed as 'void *' to VarRESubstitute() for ":C///" */
@@ -1560,7 +1560,7 @@ VarLoopExpand(GNode *ctx MAKE_ATTR_UNUSE
char *word, Boolean addSpace, Buffer *buf,
void *data)
{
-VarLoop_t *loop = data;
+VarLoop *loop = data;
char *s;
int slen;
@@ -2212,7 +2212,7 @@ typedef struct {
/* :@var@...${var}...@ */
static Boolean
ApplyModifier_At(ApplyModifiersState *st) {
-VarLoop_t loop;
+VarLoop loop;
VarPattern_Flags vflags = VAR_NOSUBST;
st->cp = ++(st->tstr);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 4 10:46:32 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): fix documentation of Var_Subst, clean up other documentation
To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.249 src/usr.bin/make/var.c:1.250
--- src/usr.bin/make/var.c:1.249 Sat Jul 4 10:35:30 2020
+++ src/usr.bin/make/var.c Sat Jul 4 10:46:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.249 2020/07/04 10:35:30 rillig Exp $ */
+/* $NetBSD: var.c,v 1.250 2020/07/04 10:46:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.249 2020/07/04 10:35:30 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.250 2020/07/04 10:46:31 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.249 2020/07/04 10:35:30 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.250 2020/07/04 10:46:31 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -102,11 +102,9 @@ __RCSID("$NetBSD: var.c,v 1.249 2020/07/
* Var_Value Return the value of a variable in a context or
* NULL if the variable is undefined.
*
- * Var_Subst Substitute named variable, or all variables if
- * NULL in a string using
- * the given context as the top-most one. If the
- * third argument is non-zero, Parse_Error is
- * called if any variables are undefined.
+ * Var_Subst Substitute either a single variable or all
+ * variables in a string, using the given context as
+ * the top-most one.
*
* Var_Parse Parse a variable expansion from a string and
* return the result and the number of characters
@@ -469,9 +467,6 @@ VarFreeEnv(Var *v, Boolean destroy)
* val value to set it to
* ctxt context in which to set it
*
- * Results:
- * None
- *
* Side Effects:
* The new variable is placed at the front of the given context
* The name and val arguments are duplicated so they may
@@ -506,9 +501,6 @@ VarAdd(const char *name, const char *val
* Var_Delete --
* Remove a variable from a context.
*
- * Results:
- * None.
- *
* Side Effects:
* The Var structure is removed and freed.
*
@@ -960,9 +952,6 @@ out:
* val value to give to the variable
* ctxt context in which to set it
*
- * Results:
- * None.
- *
* Side Effects:
* If the variable doesn't yet exist, a new record is created for it.
* Else the old value is freed and the new one stuck in its place
@@ -995,9 +984,6 @@ Var_Set(const char *name, const char *va
* val String to append to it
* ctxt Context in which this should occur
*
- * Results:
- * None
- *
* Side Effects:
* If the variable doesn't exist, it is created. Else the strings
* are concatenated (with a space in between).
@@ -1432,9 +1418,6 @@ nosub:
* VarREError --
* Print the error caused by a regcomp or regexec call.
*
- * Results:
- * None.
- *
* Side Effects:
* An error gets printed.
*
@@ -3921,7 +3904,7 @@ Var_Parse(const char *str, GNode *ctxt,
/*-
*---
* Var_Subst --
- * Substitute for all variables in the given string in the given context
+ * Substitute for all variables in the given string in the given context.
* If flags & VARF_UNDEFERR, Parse_Error will be called when an undefined
* variable is encountered.
*
@@ -3937,7 +3920,7 @@ Var_Parse(const char *str, GNode *ctxt,
* The resulting string.
*
* Side Effects:
- * None. The old string must be freed by the caller
+ * None.
*---
*/
char *
@@ -4092,18 +4075,7 @@ Var_Subst(const char *var, const char *s
return Buf_DestroyCompact();
}
-/*-
- *---
- * Var_Init --
- * Initialize the module
- *
- * Results:
- * None
- *
- * Side Effects:
- * The VAR_CMD and VAR_GLOBAL contexts are created
- *---
- */
+/* Initialize the module. */
void
Var_Init(void)
{
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 4 10:35:30 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): remove unnecessary forward declarations, fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.248 src/usr.bin/make/var.c:1.249
--- src/usr.bin/make/var.c:1.248 Sat Jul 4 10:19:39 2020
+++ src/usr.bin/make/var.c Sat Jul 4 10:35:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.248 2020/07/04 10:19:39 rillig Exp $ */
+/* $NetBSD: var.c,v 1.249 2020/07/04 10:35:30 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.248 2020/07/04 10:19:39 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.249 2020/07/04 10:35:30 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.248 2020/07/04 10:19:39 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.249 2020/07/04 10:35:30 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -152,14 +152,14 @@ char **savedEnv = NULL;
* to determine if there was an error in parsing -- easier than returning
* a flag, as things outside this module don't give a hoot.
*/
-char var_Error[] = "";
+char var_Error[] = "";
/*
* Similar to var_Error, but returned when the 'VARF_UNDEFERR' flag for
* Var_Parse is not set. Why not just use a constant? Well, gcc likes
* to condense identical string instances...
*/
-static char varNoError[] = "";
+static char varNoError[] = "";
/*
* Traditionally we consume $$ during := like any other expansion.
@@ -299,19 +299,6 @@ typedef struct {
int end; /* last word to select */
} VarSelectWords_t;
-static char *VarGetPattern(GNode *, Var_Parse_State *,
- VarPattern_Flags, const char **, int,
- VarPattern_Flags *, int *, VarPattern *);
-static char *VarQuote(char *, Boolean);
-static char *VarHash(char *);
-static char *VarModify(GNode *, Var_Parse_State *,
-const char *,
-Boolean (*)(GNode *, Var_Parse_State *, char *, Boolean, Buffer *, void *),
-void *);
-static char *VarOrder(const char *, const char);
-static char *VarUniq(const char *);
-static int VarWordCompare(const void *, const void *);
-
#define BROPEN '{'
#define BRCLOSE '}'
#define PROPEN '('
@@ -874,7 +861,7 @@ static void
Var_Set_with_flags(const char *name, const char *val, GNode *ctxt,
VarSet_Flags flags)
{
-Var *v;
+Var *v;
char *expanded_name = NULL;
/*
@@ -1027,8 +1014,8 @@ Var_Set(const char *name, const char *va
void
Var_Append(const char *name, const char *val, GNode *ctxt)
{
-Var *v;
-Hash_Entry *h;
+Var *v;
+Hash_Entry *h;
char *expanded_name = NULL;
if (strchr(name, '$') != NULL) {
@@ -1330,7 +1317,7 @@ VarSubstitute(GNode *ctx MAKE_ATTR_UNUSE
/*
* Matches at start but need to copy in trailing characters
*/
- if ((pattern->rightLen + wordLen - pattern->leftLen) != 0){
+ if ((pattern->rightLen + wordLen - pattern->leftLen) != 0) {
if (addSpace && vpstate->varSpace) {
Buf_AddByte(buf, vpstate->varSpace);
}
@@ -1397,7 +1384,7 @@ VarSubstitute(GNode *ctx MAKE_ATTR_UNUSE
while (!done) {
cp = Str_FindSubstring(word, pattern->lhs);
if (cp != NULL) {
- if (addSpace && (((cp - word) + pattern->rightLen) != 0)){
+ if (addSpace && (((cp - word) + pattern->rightLen) != 0)) {
Buf_AddByte(buf, vpstate->varSpace);
addSpace = FALSE;
}
@@ -1595,14 +1582,14 @@ VarLoopExpand(GNode *ctx MAKE_ATTR_UNUSE
int slen;
if (*word) {
-Var_Set_with_flags(loop->tvar, word, loop->ctxt, VAR_NO_EXPORT);
-s = Var_Subst(NULL, loop->str, loop->ctxt, loop->flags);
-if (s != NULL && *s != '\0') {
-if (addSpace && *s != '\n')
-Buf_AddByte(buf, ' ');
-Buf_AddBytes(buf, (slen = strlen(s)), s);
-addSpace = (slen > 0 && s[slen - 1] != '\n');
-}
+ Var_Set_with_flags(loop->tvar, word, loop->ctxt, VAR_NO_EXPORT);
+ s = Var_Subst(NULL, loop->str, loop->ctxt, loop->flags);
+ if (s != NULL && *s != '\0') {
+ if (addSpace && *s != '\n')
+ Buf_AddByte(buf, ' ');
+ Buf_AddBytes(buf, (slen = strlen(s)), s);
+ addSpace = (slen > 0 && s[slen - 1] != '\n');
+ }
free(s);
}
return addSpace;
@@ -2018,8 +2005,8 @@ VarGetPattern(GNode *ctxt, Var_Parse_Sta
* delimiter, assume it's a variable
* substitution and recurse.
*/
- cp2 = Var_Parse(cp, ctxt, errnum |
-(flags & VARF_WANTRES), , );
+ cp2 = Var_Parse(cp, ctxt, errnum | (flags & VARF_WANTRES),
+, );
Buf_AddBytes(, strlen(cp2), cp2);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Jul 4 10:19:39 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): remove unnecessary forward declarations
To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.247 src/usr.bin/make/var.c:1.248
--- src/usr.bin/make/var.c:1.247 Sat Jul 4 03:08:20 2020
+++ src/usr.bin/make/var.c Sat Jul 4 10:19:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.247 2020/07/04 03:08:20 lukem Exp $ */
+/* $NetBSD: var.c,v 1.248 2020/07/04 10:19:39 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.247 2020/07/04 03:08:20 lukem Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.248 2020/07/04 10:19:39 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.247 2020/07/04 03:08:20 lukem Exp $");
+__RCSID("$NetBSD: var.c,v 1.248 2020/07/04 10:19:39 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -299,33 +299,6 @@ typedef struct {
int end; /* last word to select */
} VarSelectWords_t;
-static Var *VarFind(const char *, GNode *, int);
-static void VarAdd(const char *, const char *, GNode *);
-static Boolean VarHead(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-static Boolean VarTail(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-static Boolean VarSuffix(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-static Boolean VarRoot(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-static Boolean VarMatch(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-#ifdef SYSVVARSUB
-static Boolean VarSYSVMatch(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-#endif
-static Boolean VarNoMatch(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-#ifndef NO_REGEX
-static void VarREError(int, regex_t *, const char *);
-static Boolean VarRESubstitute(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-#endif
-static Boolean VarSubstitute(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
-static Boolean VarLoopExpand(GNode *, Var_Parse_State *,
- char *, Boolean, Buffer *, void *);
static char *VarGetPattern(GNode *, Var_Parse_State *,
VarPattern_Flags, const char **, int,
VarPattern_Flags *, int *, VarPattern *);
CVS commit: othersrc/usr.bin/tnftp/src
Module Name:othersrc
Committed By: lukem
Date: Sat Jul 4 09:59:07 UTC 2020
Modified Files:
othersrc/usr.bin/tnftp/src: cmds.c complete.c domacro.c extern.h
fetch.c ftp.1 ftp.c ftp_var.h main.c progressbar.c ssl.c ssl.h
util.c version.h
Log Message:
Merge NetBSD-ftp 20200608
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 othersrc/usr.bin/tnftp/src/cmds.c
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/src/complete.c
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/domacro.c
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/src/extern.h
cvs rdiff -u -r1.23 -r1.24 othersrc/usr.bin/tnftp/src/fetch.c \
othersrc/usr.bin/tnftp/src/util.c
cvs rdiff -u -r1.15 -r1.16 othersrc/usr.bin/tnftp/src/ftp.1 \
othersrc/usr.bin/tnftp/src/progressbar.c
cvs rdiff -u -r1.21 -r1.22 othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/src/ftp_var.h
cvs rdiff -u -r1.20 -r1.21 othersrc/usr.bin/tnftp/src/main.c
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/src/ssl.c \
othersrc/usr.bin/tnftp/src/ssl.h
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/tnftp/src/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/src/cmds.c
diff -u othersrc/usr.bin/tnftp/src/cmds.c:1.18 othersrc/usr.bin/tnftp/src/cmds.c:1.19
--- othersrc/usr.bin/tnftp/src/cmds.c:1.18 Sun May 5 11:17:30 2013
+++ othersrc/usr.bin/tnftp/src/cmds.c Sat Jul 4 09:59:07 2020
@@ -1,5 +1,5 @@
-/* $NetBSD: cmds.c,v 1.18 2013/05/05 11:17:30 lukem Exp $ */
-/* from NetBSD: cmds.c,v 1.135 2012/12/22 16:57:09 christos Exp */
+/* $NetBSD: cmds.c,v 1.19 2020/07/04 09:59:07 lukem Exp $ */
+/* from NetBSD: cmds.c,v 1.140 2019/02/06 07:56:42 martin Exp */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID(" NetBSD: cmds.c,v 1.135 2012/12/22 16:57:09 christos Exp ");
+__RCSID(" NetBSD: cmds.c,v 1.140 2019/02/06 07:56:42 martin Exp ");
#endif
#endif /* not lint */
@@ -1165,7 +1165,8 @@ cd(int argc, char *argv[])
}
if (r == COMPLETE) {
dirchange = 1;
- updateremotecwd();
+ remotecwd[0] = '\0';
+ remcwdvalid = 0;
}
}
@@ -1551,9 +1552,9 @@ pwd(int argc, char *argv[])
UPRINTF("usage: %s\n", argv[0]);
return;
}
- if (! remotecwd[0])
+ if (!remcwdvalid || remotecwd[0] == '\0')
updateremotecwd();
- if (! remotecwd[0])
+ if (remotecwd[0] == '\0')
fprintf(ttyout, "Unable to determine remote directory\n");
else {
fprintf(ttyout, "Remote directory: %s\n", remotecwd);
@@ -1782,6 +1783,18 @@ quit(int argc, char *argv[])
exit(0);
}
+void __dead
+justquit(void)
+{
+
+ quit(0, NULL);
+ /*
+ * quit is not __dead, but for our invocation it never will return,
+ * but some compilers are not smart enough to find this out.
+ */
+ exit(0);
+}
+
/*
* Terminate session, but don't exit.
* May be called with 0, NULL.
@@ -1974,15 +1987,15 @@ dotrans(char *dst, size_t dlen, const ch
char *cp2 = dst;
size_t i, ostop;
- for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++)
+ for (ostop = 0; ntout[ostop] && ostop < sizeof(ntout); ostop++)
continue;
for (cp1 = src; *cp1; cp1++) {
int found = 0;
- for (i = 0; *(ntin + i) && i < 16; i++) {
- if (*cp1 == *(ntin + i)) {
+ for (i = 0; i < sizeof(ntin) && ntin[i]; i++) {
+ if (*cp1 == ntin[i]) {
found++;
if (i < ostop) {
- *cp2++ = *(ntout + i);
+ *cp2++ = ntout[i];
if (cp2 - dst >= (ptrdiff_t)(dlen - 1))
goto out;
}
@@ -2191,7 +2204,7 @@ LOOP:
}
break;
}
-/* intentional drop through */
+/* FALLTHROUGH */
default:
*cp2++ = *cp1;
break;
@@ -2366,7 +2379,8 @@ cdup(int argc, char *argv[])
}
if (r == COMPLETE) {
dirchange = 1;
- updateremotecwd();
+ remotecwd[0] = '\0';
+ remcwdvalid = 0;
}
}
Index: othersrc/usr.bin/tnftp/src/complete.c
diff -u othersrc/usr.bin/tnftp/src/complete.c:1.10 othersrc/usr.bin/tnftp/src/complete.c:1.11
--- othersrc/usr.bin/tnftp/src/complete.c:1.10 Wed May 20 12:53:47 2009
+++ othersrc/usr.bin/tnftp/src/complete.c Sat Jul 4 09:59:07 2020
@@ -1,5 +1,5 @@
-/* $NetBSD: complete.c,v 1.10 2009/05/20 12:53:47 lukem Exp $ */
-/* from NetBSD: complete.c,v 1.46 2009/04/12 10:18:52 lukem Exp */
+/* $NetBSD: complete.c,v 1.11 2020/07/04 09:59:07 lukem Exp $ */
+/* from NetBSD: complete.c,v 1.47 2019/01/28 12:04:16 christos Exp */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID(" NetBSD: complete.c,v 1.46 2009/04/12 10:18:52 lukem Exp ");
+__RCSID(" NetBSD: complete.c,v 1.47 2019/01/28 12:04:16 christos Exp ");
#endif /* not lint */
/*
@@ -106,11 +106,10 @@ complete_ambiguous(char *word, int list,
}
if (!list) {
- matchlen = 0;
lastmatch = words->sl_str[0];
matchlen =
CVS import: othersrc/usr.bin/tnftp/src
Module Name:othersrc Committed By: lukem Date: Sat Jul 4 09:48:28 UTC 2020 Update of /cvsroot/othersrc/usr.bin/tnftp/src In directory ivanova.netbsd.org:/tmp/cvs-serv25717 Log Message: Import NetBSD-ftp 20200608 Notable changes since NetBSD-ftp 20151003: * Avoid crashies by exit if lostpeer due to a signal (e.g., remote server disconnection). * Issue PWD commands to the server only when we actually need the results, not speculatively, just in case we might. Works around broken servers, and is quicker too. * Fix error reporting when handling TLS connections. * Use "anonymous" instead of the local username for anonymous ftp. Avoids unnecesary information leak. * Correct format of IPv6 endpoint reporting. * Refactoring and build fixes. * Support using CONNECT for https:// via proxy. PR/50438, PR/51043. * Fix downloads of local files using file:// URLs * Use the first name we requested the http/https URL for, not any name we ended up with after random redirects. Status: Vendor Tag: NetBSD Release Tags: NetBSD-20200608 U othersrc/usr.bin/tnftp/src/ruserpass.c C othersrc/usr.bin/tnftp/src/ftp.1 C othersrc/usr.bin/tnftp/src/fetch.c C othersrc/usr.bin/tnftp/src/util.c C othersrc/usr.bin/tnftp/src/ftp.c U othersrc/usr.bin/tnftp/src/cmdtab.c C othersrc/usr.bin/tnftp/src/ssl.h C othersrc/usr.bin/tnftp/src/main.c C othersrc/usr.bin/tnftp/src/ssl.c C othersrc/usr.bin/tnftp/src/extern.h U othersrc/usr.bin/tnftp/src/progressbar.h C othersrc/usr.bin/tnftp/src/ftp_var.h C othersrc/usr.bin/tnftp/src/version.h C othersrc/usr.bin/tnftp/src/progressbar.c C othersrc/usr.bin/tnftp/src/Makefile C othersrc/usr.bin/tnftp/src/complete.c C othersrc/usr.bin/tnftp/src/domacro.c C othersrc/usr.bin/tnftp/src/cmds.c 15 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/src
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sat Jul 4 09:21:30 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: modmisc.exp modmisc.mk
Log Message:
make(1): add tests for the :S and :C modifiers
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/modmisc.exp
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/modmisc.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/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.8 src/usr.bin/make/unit-tests/modmisc.exp:1.9
--- src/usr.bin/make/unit-tests/modmisc.exp:1.8 Fri Jul 3 22:10:42 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp Sat Jul 4 09:21:30 2020
@@ -17,4 +17,17 @@ C:
S:empty
C:empty
@:
+:a b b c:
+:a b b c:
+: b c:
+:a c:
+:x__ 3 x__ 3:
+:a b b c:
+:a b b c:
+: b c:
+make: RE substitution error: repetition-operator operand invalid
+make: Unclosed substitution for (, missing)
+:C,word,,:Q}:
+:a c:
+:x__ 3 x__ 3:
exit status 0
Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.7 src/usr.bin/make/unit-tests/modmisc.mk:1.8
--- src/usr.bin/make/unit-tests/modmisc.mk:1.7 Fri Jul 3 22:10:42 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk Sat Jul 4 09:21:30 2020
@@ -1,4 +1,4 @@
-# $Id: modmisc.mk,v 1.7 2020/07/03 22:10:42 rillig Exp $
+# $Id: modmisc.mk,v 1.8 2020/07/04 09:21:30 rillig Exp $
#
# miscellaneous modifier tests
@@ -16,6 +16,7 @@ MOD_OPT=@d@$${exists($$d):?$$d:$${d:S,/u
MOD_SEP=S,:, ,g
all: modvar modvarloop modsysv mod-HTE emptyvar undefvar
+all: mod-S mod-C
modsysv:
@echo "The answer is ${libfoo.a:L:libfoo.a=42}"
@@ -58,3 +59,18 @@ undefvar:
@echo S:${:U:S,^$,empty,}
@echo C:${:U:C,^$,empty,}
@echo @:${:U:@var@empty@}
+
+mod-S:
+ @echo :${:Ua b b c:S,a b,,:Q}:
+ @echo :${:Ua b b c:S,a b,,1:Q}:
+ @echo :${:Ua b b c:S,a b,,W:Q}:
+ @echo :${:Ua b b c:S,b,,g:Q}:
+ @echo :${:U1 2 3 1 2 3:S,1 2,___,Wg:S,_,x,:Q}:
+
+mod-C:
+ @echo :${:Ua b b c:C,a b,,:Q}:
+ @echo :${:Ua b b c:C,a b,,1:Q}:
+ @echo :${:Ua b b c:C,a b,,W:Q}:
+ @echo :${:Uword1 word2:C,,,g:C,word,,:Q}:
+ @echo :${:Ua b b c:C,b,,g:Q}:
+ @echo :${:U1 2 3 1 2 3:C,1 2,___,Wg:C,_,x,:Q}:
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: bouyer
Date: Sat Jul 4 09:03:55 UTC 2020
Modified Files:
src/sys/arch/x86/x86: idt.c
Log Message:
Fix unset_idtgate() for XENPV, pointed out by yamaguchi@
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/x86/idt.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/x86/x86/idt.c
diff -u src/sys/arch/x86/x86/idt.c:1.11 src/sys/arch/x86/x86/idt.c:1.12
--- src/sys/arch/x86/x86/idt.c:1.11 Mon Jun 17 06:38:30 2019
+++ src/sys/arch/x86/x86/idt.c Sat Jul 4 09:03:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: idt.c,v 1.11 2019/06/17 06:38:30 msaitoh Exp $ */
+/* $NetBSD: idt.c,v 1.12 2020/07/04 09:03:54 bouyer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2009 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: idt.c,v 1.11 2019/06/17 06:38:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: idt.c,v 1.12 2020/07/04 09:03:54 bouyer Exp $");
#include
#include
@@ -132,7 +132,7 @@ void
unset_idtgate(struct trap_info *xen_idd)
{
#if defined(__x86_64__)
- vaddr_t xen_idt_vaddr = ((vaddr_t) xen_idd) & PAGE_MASK;
+ vaddr_t xen_idt_vaddr = ((vaddr_t) xen_idd) & ~PAGE_MASK;
/* Make it writeable, so we can update the values. */
pmap_changeprot_local(xen_idt_vaddr, VM_PROT_READ | VM_PROT_WRITE);
CVS commit: src/share/man/man4
Module Name:src Committed By: ryoon Date: Sat Jul 4 08:10:21 UTC 2020 Modified Files: src/share/man/man4: ugensa.4 Log Message: man4: Add Linux USB 3.0 debu port to ugensa.4 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/ugensa.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ugensa.4 diff -u src/share/man/man4/ugensa.4:1.10 src/share/man/man4/ugensa.4:1.11 --- src/share/man/man4/ugensa.4:1.10 Mon Dec 14 09:33:47 2009 +++ src/share/man/man4/ugensa.4 Sat Jul 4 08:10:21 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: ugensa.4,v 1.10 2009/12/14 09:33:47 wiz Exp $ +.\" $NetBSD: ugensa.4,v 1.11 2020/07/04 08:10:21 ryoon Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 14, 2009 +.Dd July 4, 2020 .Dt UGENSA 4 .Os .Sh NAME @@ -68,6 +68,7 @@ device): .It Dell/Novatel Wireless HDSPA modem .It Dell W5500 HDSPA modem [not tested] .It AnyDATA ADU-E500A [not tested] +.It Linux's USB 3.0 debug port serial communication .El .Sh DESCRIPTION The
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: ryoon
Date: Sat Jul 4 08:07:02 UTC 2020
Modified Files:
src/sys/dev/usb: ugensa.c
Log Message:
usb/ugensa: Support Linux USB 3.0 debugging port serial communication
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/ugensa.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/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.42 src/sys/dev/usb/ugensa.c:1.43
--- src/sys/dev/usb/ugensa.c:1.42 Fri Jun 5 08:01:49 2020
+++ src/sys/dev/usb/ugensa.c Sat Jul 4 08:07:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.42 2020/06/05 08:01:49 skrll Exp $ */
+/* $NetBSD: ugensa.c,v 1.43 2020/07/04 08:07:02 ryoon Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.42 2020/06/05 08:01:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.43 2020/07/04 08:07:02 ryoon Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -95,6 +95,7 @@ static const struct ugensa_type ugensa_d
{{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_FLEXPACKGPS }, 0 },
{{ USB_VENDOR_QUALCOMM_K, USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K }, 0 },
{{ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_AC8700 }, 0 },
+ {{ USB_VENDOR_LINUXFOUNDATION, USB_PRODUCT_LINUXFOUNDATION_USB3DEBUG}, 0 },
/*
* The following devices are untested, but they are purported to
CVS commit: src/sys/dev/usb
Module Name:src Committed By: ryoon Date: Sat Jul 4 08:05:26 UTC 2020 Modified Files: src/sys/dev/usb: usbdevs Log Message: usbdevs: Add Linux USB 3.0 debugging port serial device To generate a diff of this commit: cvs rdiff -u -r1.783 -r1.784 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.783 src/sys/dev/usb/usbdevs:1.784 --- src/sys/dev/usb/usbdevs:1.783 Fri Jun 19 11:52:42 2020 +++ src/sys/dev/usb/usbdevs Sat Jul 4 08:05:26 2020 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.783 2020/06/19 11:52:42 flxd Exp $ +$NetBSD: usbdevs,v 1.784 2020/07/04 08:05:26 ryoon Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2141,6 +2141,7 @@ product LINKSYS4 WUSB600NV2 0x0079 WUSB6 product LINUXFOUNDATION ROOT_HUB_11 0x0001 1.1 root hub product LINUXFOUNDATION ROOT_HUB_20 0x0002 2.0 root hub product LINUXFOUNDATION ROOT_HUB_30 0x0003 3.0 root hub +product LINUXFOUNDATION USB3DEBUG 0x0010 USB 3.0 debug port /* Lite-On Technology */ product LITEON AR9271 0x4605 AR9271
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: skrll Date: Sat Jul 4 07:02:35 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: machdep.h Log Message: Protect with #ifdef _KERNEL To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/include/arm32/machdep.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/arm/include/arm32/machdep.h diff -u src/sys/arch/arm/include/arm32/machdep.h:1.33 src/sys/arch/arm/include/arm32/machdep.h:1.34 --- src/sys/arch/arm/include/arm32/machdep.h:1.33 Thu Mar 5 15:18:54 2020 +++ src/sys/arch/arm/include/arm32/machdep.h Sat Jul 4 07:02:35 2020 @@ -1,8 +1,10 @@ -/* $NetBSD: machdep.h,v 1.33 2020/03/05 15:18:54 riastradh Exp $ */ +/* $NetBSD: machdep.h,v 1.34 2020/07/04 07:02:35 skrll Exp $ */ #ifndef _ARM32_MACHDEP_H_ #define _ARM32_MACHDEP_H_ +#ifdef _KERNEL + /* Define various stack sizes in pages */ #ifndef IRQ_STACK_SIZE #define IRQ_STACK_SIZE 1 @@ -103,4 +105,7 @@ void set_spl_masks(void); #ifdef DIAGNOSTIC void dump_spl_masks(void); #endif -#endif + +#endif /* _KERNEL */ + +#endif /* _ARM32_MACHDEP_H_ */
CVS commit: othersrc/libexec/tnftpd
Module Name:othersrc Committed By: lukem Date: Sat Jul 4 06:57:46 UTC 2020 Modified Files: othersrc/libexec/tnftpd: configure Log Message: regen for tnftpd 20200704 To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 othersrc/libexec/tnftpd/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/libexec/tnftpd/configure diff -u othersrc/libexec/tnftpd/configure:1.51 othersrc/libexec/tnftpd/configure:1.52 --- othersrc/libexec/tnftpd/configure:1.51 Sat Jul 4 04:55:03 2020 +++ othersrc/libexec/tnftpd/configure Sat Jul 4 06:57:46 2020 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision: 1.45 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for tnftpd 20190602. +# Generated by GNU Autoconf 2.69 for tnftpd 20200704. # # Report bugs to . # @@ -13,7 +13,7 @@ # gives unlimited permission to copy, distribute and modify it. # # -# Copyright (c) 2001-2019 The NetBSD Foundation, Inc. +# Copyright (c) 2001-2020 The NetBSD Foundation, Inc. # All rights reserved. # ## ## @@ -596,8 +596,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tnftpd' PACKAGE_TARNAME='tnftpd' -PACKAGE_VERSION='20190602' -PACKAGE_STRING='tnftpd 20190602' +PACKAGE_VERSION='20200704' +PACKAGE_STRING='tnftpd 20200704' PACKAGE_BUGREPORT='lu...@netbsd.org' PACKAGE_URL='' @@ -1335,7 +1335,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tnftpd 20190602 to adapt to many kinds of systems. +\`configure' configures tnftpd 20200704 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tnftpd 20190602:";; + short | recursive ) echo "Configuration of tnftpd 20200704:";; esac cat <<\_ACEOF @@ -1528,7 +1528,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tnftpd configure 20190602 +tnftpd configure 20200704 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1536,7 +1536,7 @@ This configure script is free software; gives unlimited permission to copy, distribute and modify it. -Copyright (c) 2001-2019 The NetBSD Foundation, Inc. +Copyright (c) 2001-2020 The NetBSD Foundation, Inc. All rights reserved. _ACEOF @@ -2113,7 +2113,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tnftpd $as_me 20190602, which was +It was created by tnftpd $as_me 20200704, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3104,7 +3104,7 @@ fi # Define the identity of the package. PACKAGE='tnftpd' - VERSION='20190602' + VERSION='20200704' cat >>confdefs.h <<_ACEOF @@ -16242,7 +16242,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tnftpd $as_me 20190602, which was +This file was extended by tnftpd $as_me 20200704, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -16308,7 +16308,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/&/g'`" ac_cs_version="\\ -tnftpd config.status 20190602 +tnftpd config.status 20200704 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"
CVS commit: othersrc/libexec/tnftpd
Module Name:othersrc Committed By: lukem Date: Sat Jul 4 06:49:19 UTC 2020 Modified Files: othersrc/libexec/tnftpd: ChangeLog NEWS configure.ac Log Message: tnftpd 20200704 release Changes since tnftpd 20200704: - Adapt to NetBSD blocklistd(8) service rename. - Increase some buffer sizes. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 othersrc/libexec/tnftpd/ChangeLog cvs rdiff -u -r1.14 -r1.15 othersrc/libexec/tnftpd/NEWS cvs rdiff -u -r1.45 -r1.46 othersrc/libexec/tnftpd/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/libexec/tnftpd/ChangeLog diff -u othersrc/libexec/tnftpd/ChangeLog:1.63 othersrc/libexec/tnftpd/ChangeLog:1.64 --- othersrc/libexec/tnftpd/ChangeLog:1.63 Sun Jun 2 06:54:55 2019 +++ othersrc/libexec/tnftpd/ChangeLog Sat Jul 4 06:49:19 2020 @@ -1,4 +1,15 @@ -$NetBSD: ChangeLog,v 1.63 2019/06/02 06:54:55 lukem Exp $ +$NetBSD: ChangeLog,v 1.64 2020/07/04 06:49:19 lukem Exp $ + +Sat Jul 4 06:40:38 UTC 2020 lukem + + * Release as "tnftpd 20200704". + + * Change --with-blacklist to --with-blocklist and search for + libblocklist first, falling back to the legacy libblacklist. + + * Update to NetBSD-ftpd 20200615: + * Increase some buffer sizes. + * Rename blacklist to blocklist. Sun Jun 2 05:56:12 UTC 2019 lukem @@ -89,7 +100,7 @@ Mon Jan 4 05:51:15 UTC 2010 lukem Wed Dec 30 01:48:57 UTC 2009 lukem - * Release as "tnftpd 20091122" + * Release as "tnftpd 20091122" Sat Nov 7 11:13:38 UTC 2009 lukem Index: othersrc/libexec/tnftpd/NEWS diff -u othersrc/libexec/tnftpd/NEWS:1.14 othersrc/libexec/tnftpd/NEWS:1.15 --- othersrc/libexec/tnftpd/NEWS:1.14 Sun Jun 2 06:54:55 2019 +++ othersrc/libexec/tnftpd/NEWS Sat Jul 4 06:49:19 2020 @@ -1,6 +1,12 @@ -$NetBSD: NEWS,v 1.14 2019/06/02 06:54:55 lukem Exp $ +$NetBSD: NEWS,v 1.15 2020/07/04 06:49:19 lukem Exp $ -This is tnftpd version 20190602. +This is tnftpd version 20200704. + +Changes in tnftpd from 20190602 to 20200704: + + Adapt to NetBSD blocklistd(8) service rename. + + Increase some buffer sizes. Changes in tnftpd from 20130325 to 20190602: Index: othersrc/libexec/tnftpd/configure.ac diff -u othersrc/libexec/tnftpd/configure.ac:1.45 othersrc/libexec/tnftpd/configure.ac:1.46 --- othersrc/libexec/tnftpd/configure.ac:1.45 Sat Jul 4 04:39:59 2020 +++ othersrc/libexec/tnftpd/configure.ac Sat Jul 4 06:49:19 2020 @@ -1,15 +1,15 @@ -# $NetBSD: configure.ac,v 1.45 2020/07/04 04:39:59 lukem Exp $ +# $NetBSD: configure.ac,v 1.46 2020/07/04 06:49:19 lukem Exp $ # # Process this file with autoconf to produce a configure script. -AC_INIT([tnftpd], [20190602], [lu...@netbsd.org]) +AC_INIT([tnftpd], [20200704], [lu...@netbsd.org]) AC_PREREQ([2.69]) AC_COPYRIGHT([ -Copyright (c) 2001-2019 The NetBSD Foundation, Inc. +Copyright (c) 2001-2020 The NetBSD Foundation, Inc. All rights reserved. ]) -AC_REVISION([$Revision: 1.45 $]) +AC_REVISION([$Revision: 1.46 $]) AS_SHELL_SANITIZE()
CVS commit: src/etc/rc.d
Module Name:src
Committed By: skrll
Date: Sat Jul 4 06:24:53 UTC 2020
Modified Files:
src/etc/rc.d: bootconf.sh fccache.in ipfilter lvm mdnsd named network
npf ntpd pf rtadvd
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/etc/rc.d/bootconf.sh
cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/fccache.in src/etc/rc.d/mdnsd
cvs rdiff -u -r1.18 -r1.19 src/etc/rc.d/ipfilter
cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/lvm
cvs rdiff -u -r1.25 -r1.26 src/etc/rc.d/named
cvs rdiff -u -r1.79 -r1.80 src/etc/rc.d/network
cvs rdiff -u -r1.4 -r1.5 src/etc/rc.d/npf
cvs rdiff -u -r1.16 -r1.17 src/etc/rc.d/ntpd
cvs rdiff -u -r1.11 -r1.12 src/etc/rc.d/pf
cvs rdiff -u -r1.10 -r1.11 src/etc/rc.d/rtadvd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/bootconf.sh
diff -u src/etc/rc.d/bootconf.sh:1.15 src/etc/rc.d/bootconf.sh:1.16
--- src/etc/rc.d/bootconf.sh:1.15 Mon Dec 31 23:21:27 2012
+++ src/etc/rc.d/bootconf.sh Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: bootconf.sh,v 1.15 2012/12/31 23:21:27 christos Exp $
+# $NetBSD: bootconf.sh,v 1.16 2020/07/04 06:24:53 skrll Exp $
#
# PROVIDE: bootconf
@@ -38,7 +38,7 @@ bootconf_start()
case $name in
current|default|\*)
continue
- ;;
+ ;;
*)
if [ "$name" = "$default" ]; then
echo -n "${spc}[${name}]"
Index: src/etc/rc.d/fccache.in
diff -u src/etc/rc.d/fccache.in:1.3 src/etc/rc.d/fccache.in:1.4
--- src/etc/rc.d/fccache.in:1.3 Tue Feb 7 10:36:01 2012
+++ src/etc/rc.d/fccache.in Sat Jul 4 06:24:53 2020
@@ -1,9 +1,9 @@
#!/bin/sh
#
-# $NetBSD: fccache.in,v 1.3 2012/02/07 10:36:01 mbalmer Exp $
+# $NetBSD: fccache.in,v 1.4 2020/07/04 06:24:53 skrll Exp $
#
-# PROVIDE: fccache
+# PROVIDE: fccache
# REQUIRE: mountcritremote
# BEFORE: DAEMON
Index: src/etc/rc.d/mdnsd
diff -u src/etc/rc.d/mdnsd:1.3 src/etc/rc.d/mdnsd:1.4
--- src/etc/rc.d/mdnsd:1.3 Thu Oct 15 16:47:28 2015
+++ src/etc/rc.d/mdnsd Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mdnsd,v 1.3 2015/10/15 16:47:28 roy Exp $
+# $NetBSD: mdnsd,v 1.4 2020/07/04 06:24:53 skrll Exp $
#
# PROVIDE: mdnsd
@@ -22,6 +22,6 @@ mdnsd_precmd()
fi
chown _mdnsd:_mdnsd /var/run/mdnsd
}
-
+
load_rc_config $name
run_rc_command "$1"
Index: src/etc/rc.d/ipfilter
diff -u src/etc/rc.d/ipfilter:1.18 src/etc/rc.d/ipfilter:1.19
--- src/etc/rc.d/ipfilter:1.18 Mon Mar 23 18:52:02 2009
+++ src/etc/rc.d/ipfilter Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ipfilter,v 1.18 2009/03/23 18:52:02 hannken Exp $
+# $NetBSD: ipfilter,v 1.19 2020/07/04 06:24:53 skrll Exp $
#
# PROVIDE: ipfilter
@@ -84,7 +84,7 @@ ipfilter_reload()
if [ -f /etc/ipf6.conf ] && ! /sbin/ipf -I -6 -f /etc/ipf6.conf; then
err 1 "reload of ipf6.conf failed; not swapping to new ruleset."
fi
-
+
# Swap in the new rules
#
/sbin/ipf -s
Index: src/etc/rc.d/lvm
diff -u src/etc/rc.d/lvm:1.5 src/etc/rc.d/lvm:1.6
--- src/etc/rc.d/lvm:1.5 Tue Apr 21 16:08:57 2009
+++ src/etc/rc.d/lvm Sat Jul 4 06:24:53 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: lvm,v 1.5 2009/04/21 16:08:57 joerg Exp $
+# $NetBSD: lvm,v 1.6 2020/07/04 06:24:53 skrll Exp $
#
# PROVIDE: lvm
@@ -20,7 +20,7 @@ lvm_start()
{
if [ -x /sbin/dmsetup ]; then
/sbin/dmsetup version >/dev/null
- if [ $? -ne 0 ]; then
+ if [ $? -ne 0 ]; then
warn "Device-mapper not present in kernel"
return 1;
fi
@@ -31,7 +31,7 @@ lvm_start()
# Scan for all available VG's
/sbin/lvm vgscan --mknodes --ignorelockingfailure >/dev/null
-
+
# Activate all LV's and create apropriate nodes in /dev
/sbin/lvm vgchange --ignorelockingfailure -a y >/dev/null
LV_LIST=$(/sbin/lvm vgdisplay -C -o vg_name --noheadings 2>/dev/null)
@@ -43,7 +43,7 @@ lvm_stop()
{
if [ -x /sbin/dmsetup ]; then
/sbin/dmsetup version >/dev/null
- if [ $? -ne 0 ]; then
+ if [ $? -ne 0 ]; then
warn "Device-mapper not present in kernel"
return 1;
fi
@@ -51,7 +51,7 @@ lvm_stop()
if [ -x /sbin/lvm ]; then
echo "Unconfiguring lvm devices."
-
+
LOGICAL_VOLUMES=$(/sbin/lvm lvdisplay -C -o vg_name,lv_name \
-O vg_name --separator \/ --noheadings 2>/dev/null)
VOLUME_GROUPS=$(/sbin/lvm vgdisplay -C -o vg_name \
@@ -68,7 +68,7 @@ lvm_stop()
;;
esac
done
-
+
for vg in ${VOLUME_GROUPS}; do
# Set IFS to field separator
IFS=":"
@@ -76,7 +76,7 @@ lvm_stop()
# The seventh parameter is number of opened LVs in a Volume Group
VG_HAS_ACTIVE_LV=$7
IFS="$ifs_restore";
-
+
if [ "${VG_HAS_ACTIVE_LV}" = 0 ]; then
echo " Shutting Down volume group: ${vg}"
/sbin/lvm vgchange -an --ignorelockingfailure \
Index: src/etc/rc.d/named
diff -u src/etc/rc.d/named:1.25 src/etc/rc.d/named:1.26
--- src/etc/rc.d/named:1.25 Sun Jul 13
