CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: skrll
Date: Mon Apr 29 07:34:27 UTC 2024
Modified Files:
src/sys/arch/hppa/stand/xxboot: Makefile
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/stand/xxboot/Makefile
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/hppa/stand/xxboot/Makefile
diff -u src/sys/arch/hppa/stand/xxboot/Makefile:1.5 src/sys/arch/hppa/stand/xxboot/Makefile:1.6
--- src/sys/arch/hppa/stand/xxboot/Makefile:1.5 Mon Apr 29 07:31:18 2024
+++ src/sys/arch/hppa/stand/xxboot/Makefile Mon Apr 29 07:34:27 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2024/04/29 07:31:18 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2024/04/29 07:34:27 skrll Exp $
-NODEBUG=yes
-PROG= xxboot
-NOMAN= # defined
-SRCS= start.S main.c readufs.c readufs_ffs.c readufs_lfs.c milli_tiny.S
+NODEBUG= yes
+PROG= xxboot
+NOMAN= # defined
+SRCS= start.S main.c readufs.c readufs_ffs.c readufs_lfs.c milli_tiny.S
.PATH: ${.CURDIR}/../common
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src Committed By: skrll Date: Mon Apr 29 07:34:27 UTC 2024 Modified Files: src/sys/arch/hppa/stand/xxboot: Makefile Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/stand/xxboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/stand
Module Name:src Committed By: skrll Date: Mon Apr 29 07:33:32 UTC 2024 Modified Files: src/sys/arch/hppa/stand: Makefile.buildboot Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/stand/Makefile.buildboot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/stand
Module Name:src
Committed By: skrll
Date: Mon Apr 29 07:33:32 UTC 2024
Modified Files:
src/sys/arch/hppa/stand: Makefile.buildboot
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/stand/Makefile.buildboot
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/hppa/stand/Makefile.buildboot
diff -u src/sys/arch/hppa/stand/Makefile.buildboot:1.7 src/sys/arch/hppa/stand/Makefile.buildboot:1.8
--- src/sys/arch/hppa/stand/Makefile.buildboot:1.7 Thu Aug 3 08:16:31 2023
+++ src/sys/arch/hppa/stand/Makefile.buildboot Mon Apr 29 07:33:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.7 2023/08/03 08:16:31 mrg Exp $
+# $NetBSD: Makefile.buildboot,v 1.8 2024/04/29 07:33:32 skrll Exp $
NOPIE=yes
NOSSP=yes
@@ -38,12 +38,12 @@ CFLAGS+= -mdisable-fpregs -mfast-indirec
.include "${S}/conf/newvers_stand.mk"
-CPPFLAGS+= -D_STANDALONE -Dhppa ${DEBUGFLAGS}
-CPPFLAGS+= -DRELOC=0x${RELOC} -DHEAP_LIMIT=${HEAP_LIMIT}
-CPPFLAGS+= -DNO_NET
+CPPFLAGS+= -D_STANDALONE -Dhppa ${DEBUGFLAGS}
+CPPFLAGS+= -DRELOC=0x${RELOC} -DHEAP_LIMIT=${HEAP_LIMIT}
+CPPFLAGS+= -DNO_NET
-COMMONSOURCE= cons.c dev_hppa.c dk.c itecons.c \
- machdep.c milli_tiny.S pdc.c time.c
+COMMONSOURCE= cons.c dev_hppa.c dk.c itecons.c \
+ machdep.c milli_tiny.S pdc.c time.c
DRIVERSOURCE=
### find out what to use for libkern
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src
Committed By: skrll
Date: Mon Apr 29 07:31:18 UTC 2024
Modified Files:
src/sys/arch/hppa/stand/xxboot: Makefile
Log Message:
Ensure a user specified DBG isn't used for xxboot.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/stand/xxboot/Makefile
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/hppa/stand/xxboot/Makefile
diff -u src/sys/arch/hppa/stand/xxboot/Makefile:1.4 src/sys/arch/hppa/stand/xxboot/Makefile:1.5
--- src/sys/arch/hppa/stand/xxboot/Makefile:1.4 Fri Jan 13 18:43:43 2023
+++ src/sys/arch/hppa/stand/xxboot/Makefile Mon Apr 29 07:31:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/01/13 18:43:43 martin Exp $
+# $NetBSD: Makefile,v 1.5 2024/04/29 07:31:18 skrll Exp $
NODEBUG=yes
PROG= xxboot
@@ -17,6 +17,9 @@ CPPFLAGS+= -D__daddr_t=int32_t -D__ino_t
CPPFLAGS+= -Dconst=
COPTS+= -Os -fno-delete-null-pointer-checks -funsigned-char -mdisable-fpregs -mpa-risc-1-0
+# Make sure we override any optimization options specified by the user
+DBG= # empty
+
.include
LINKS= ${BINDIR}/${PROG} ${BINDIR}/sdboot
CVS commit: src/sys/arch/hppa/stand/xxboot
Module Name:src Committed By: skrll Date: Mon Apr 29 07:31:18 UTC 2024 Modified Files: src/sys/arch/hppa/stand/xxboot: Makefile Log Message: Ensure a user specified DBG isn't used for xxboot. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/stand/xxboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/stand
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 07:13:42 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst: Makefile
src/sys/arch/hp300/stand/uboot: Makefile
Log Message:
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/uboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/inst/Makefile
diff -u src/sys/arch/hp300/stand/inst/Makefile:1.10 src/sys/arch/hp300/stand/inst/Makefile:1.11
--- src/sys/arch/hp300/stand/inst/Makefile:1.10 Mon Sep 23 13:42:36 2019
+++ src/sys/arch/hp300/stand/inst/Makefile Mon Apr 29 07:13:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:36 christos Exp $
+# $NetBSD: Makefile,v 1.11 2024/04/29 07:13:42 tsutsui Exp $
PROGAOUT= inst
PROGSOURCE= inst.c
@@ -6,16 +6,14 @@ NEWVERSWHAT= "Miniroot Installer"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_INST
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL} -d -m 755 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} ${INSTPRIV} \
- inst.lif ${DESTDIR}${BINDIR}/inst.lif
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_INST
- ln ${DESTDIR}${BINDIR}/inst.lif ${DESTDIR}${BINDIR}/rbootd/SYS_INST
-release: check_RELEASEDIR .WAIT inst.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_INST
Index: src/sys/arch/hp300/stand/uboot/Makefile
diff -u src/sys/arch/hp300/stand/uboot/Makefile:1.10 src/sys/arch/hp300/stand/uboot/Makefile:1.11
--- src/sys/arch/hp300/stand/uboot/Makefile:1.10 Sun Dec 11 07:41:37 2022
+++ src/sys/arch/hp300/stand/uboot/Makefile Mon Apr 29 07:13:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/12/11 07:41:37 tsutsui Exp $
+# $NetBSD: Makefile,v 1.11 2024/04/29 07:13:42 tsutsui Exp $
PROGAOUT= uboot
PROGSOURCE= uboot.c tgets.c
@@ -7,28 +7,20 @@ NEWVERSWHAT= "Primary Boot"
CPPFLAGS+= -DSUPPORT_ETHERNET -DSUPPORT_TAPE -DSUPPORT_DISK
CPPFLAGS+= -DSUPPORT_UFS2
+LINKS= ${BINDIR}/${PROG} ${BINDIR}/rdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootrd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/sdboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootsd
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/ctboot
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/bootct
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/rbootd/SYS_UBOOT
+
.include "../Makefile.buildboot"
-install:
+beforeinstall:
${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${BINDIR}/rbootd
- ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 444 \
- uboot.lif ${DESTDIR}${BINDIR}/uboot.lif
- rm -f ${DESTDIR}${BINDIR}/rdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rdboot
- rm -f ${DESTDIR}${BINDIR}/bootrd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootrd
- rm -f ${DESTDIR}${BINDIR}/sdboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/sdboot
- rm -f ${DESTDIR}${BINDIR}/bootsd
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootsd
- rm -f ${DESTDIR}${BINDIR}/ctboot
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/ctboot
- rm -f ${DESTDIR}${BINDIR}/bootct
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/bootct
- rm -f ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
- ln ${DESTDIR}${BINDIR}/uboot.lif ${DESTDIR}${BINDIR}/rbootd/SYS_UBOOT
-release: check_RELEASEDIR .WAIT uboot.lif
- ${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
+release: check_RELEASEDIR .WAIT ${PROG}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_UBOOT
CVS commit: src/sys/arch/hp300/stand
Module Name:src
Committed By: tsutsui
Date: Mon Apr 29 07:13:42 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/inst: Makefile
src/sys/arch/hp300/stand/uboot: Makefile
Log Message:
Use LINKS to create hard links to generate proper METALOG files.
Also use the default ${PROG} variable and "install" target.
Fixes PR port-hp300/58211.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/uboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/bsd/nvi/dist/docs/vi.man
Module Name:src Committed By: maya Date: Mon Apr 29 00:50:43 UTC 2024 Modified Files: src/external/bsd/nvi/dist/docs/vi.man: vi.1 Log Message: Remove documentation for long removed -F option Suggested by Robert Whitlock in PR bin/58177 I've sent this patch to the nvi maintainers but the response suggested patching this downstream, as there would be no further releases of nvi. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nvi/dist/docs/vi.man/vi.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/nvi/dist/docs/vi.man/vi.1 diff -u src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.7 src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.8 --- src/external/bsd/nvi/dist/docs/vi.man/vi.1:1.7 Fri Sep 14 13:19:15 2018 +++ src/external/bsd/nvi/dist/docs/vi.man/vi.1 Mon Apr 29 00:50:42 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: vi.1,v 1.7 2018/09/14 13:19:15 rin Exp $ +.\" $NetBSD: vi.1,v 1.8 2024/04/29 00:50:42 maya Exp $ .\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. @@ -12,14 +12,14 @@ .\" .\" Id: vi.1,v 8.53 2001/01/28 13:20:06 skimo Exp (Berkeley) Date: 2001/01/28 13:20:06 .\" -.TH VI 1 "September 14, 2018" +.TH VI 1 "April 28, 2024" .UC .SH NAME ex, vi, view \- text editors .SH SYNOPSIS .B ex [\c -.B -eFGRrSsv\c +.B -eGRrSsv\c ] [\c .BI -c " cmd"\c ] [\c @@ -30,7 +30,7 @@ ex, vi, view \- text editors .br .B vi [\c -.B -eFlRrSv\c +.B -elRrSv\c ] [\c .BI -c " cmd"\c ] [\c @@ -41,7 +41,7 @@ ex, vi, view \- text editors .br .B view [\c -.B -eFGRrSv\c +.B -eGRrSv\c ] [\c .BI -c " cmd"\c ] [\c @@ -115,11 +115,6 @@ supports both the old and new syntax. Start editing in ex mode, as if the command name were .IR \ . .TP -.B \-F -Don't copy the entire file when first starting to edit. -(The default is to make a copy in case someone else modifies -the file during your edit session.) -.TP .B \-G Start editing in gtags mode, as if the gtagsmode option was set. .TP
CVS commit: src/external/bsd/nvi/dist/docs/vi.man
Module Name:src Committed By: maya Date: Mon Apr 29 00:50:43 UTC 2024 Modified Files: src/external/bsd/nvi/dist/docs/vi.man: vi.1 Log Message: Remove documentation for long removed -F option Suggested by Robert Whitlock in PR bin/58177 I've sent this patch to the nvi maintainers but the response suggested patching this downstream, as there would be no further releases of nvi. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nvi/dist/docs/vi.man/vi.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/cgdconfig
Module Name:src
Committed By: riastradh
Date: Mon Apr 29 00:28:18 UTC 2024
Modified Files:
src/sbin/cgdconfig: cgdconfig.c
Log Message:
cgdconfig(8): KNF in cgdconfig.c.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sbin/cgdconfig/cgdconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/cgdconfig.c
diff -u src/sbin/cgdconfig/cgdconfig.c:1.61 src/sbin/cgdconfig/cgdconfig.c:1.62
--- src/sbin/cgdconfig/cgdconfig.c:1.61 Thu Nov 17 06:40:38 2022
+++ src/sbin/cgdconfig/cgdconfig.c Mon Apr 29 00:28:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdconfig.c,v 1.61 2022/11/17 06:40:38 chs Exp $ */
+/* $NetBSD: cgdconfig.c,v 1.62 2024/04/29 00:28:18 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: cgdconfig.c,v 1.61 2022/11/17 06:40:38 chs Exp $");
+__RCSID("$NetBSD: cgdconfig.c,v 1.62 2024/04/29 00:28:18 riastradh Exp $");
#endif
#ifdef HAVE_ARGON2
@@ -1507,7 +1507,8 @@ iv_method(int mode)
static void
-show(const char *dev) {
+show(const char *dev)
+{
char path[64];
struct cgd_user cgu;
int fd;
@@ -1532,11 +1533,13 @@ show(const char *dev) {
}
dev = devname(cgu.cgu_dev, S_IFBLK);
- if (dev != NULL)
+ if (dev != NULL) {
printf("%s ", dev);
- else
- printf("dev %llu,%llu ", (unsigned long long)major(cgu.cgu_dev),
+ } else {
+ printf("dev %llu,%llu ",
+ (unsigned long long)major(cgu.cgu_dev),
(unsigned long long)minor(cgu.cgu_dev));
+ }
if (verbose)
printf("%s ", cgu.cgu_alg);
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: riastradh Date: Mon Apr 29 00:28:18 UTC 2024 Modified Files: src/sbin/cgdconfig: cgdconfig.c Log Message: cgdconfig(8): KNF in cgdconfig.c. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sbin/cgdconfig/cgdconfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: uwe Date: Sun Apr 28 23:10:26 UTC 2024 Modified Files: src/lib/libc/sys: execve.2 Log Message: execve(2): brush up markup To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/lib/libc/sys/execve.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/execve.2 diff -u src/lib/libc/sys/execve.2:1.46 src/lib/libc/sys/execve.2:1.47 --- src/lib/libc/sys/execve.2:1.46 Sun Apr 28 22:21:21 2024 +++ src/lib/libc/sys/execve.2 Sun Apr 28 23:10:26 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: execve.2,v 1.46 2024/04/28 22:21:21 rillig Exp $ +.\" $NetBSD: execve.2,v 1.47 2024/04/28 23:10:26 uwe Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -75,35 +75,32 @@ and .Xr a.out 5 . .Pp An interpreter file begins with a line of the form: -.Pp -.Bd -ragged -offset indent -compact -.Sy
CVS commit: src/lib/libc/sys
Module Name:src Committed By: uwe Date: Sun Apr 28 23:10:26 UTC 2024 Modified Files: src/lib/libc/sys: execve.2 Log Message: execve(2): brush up markup To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/lib/libc/sys/execve.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: rillig Date: Sun Apr 28 22:57:16 UTC 2024 Modified Files: src/lib/libc/gen: time.3 Log Message: time.3: clarify that *tloc is always set if tloc != NULL To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libc/gen/time.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/time.3 diff -u src/lib/libc/gen/time.3:1.16 src/lib/libc/gen/time.3:1.17 --- src/lib/libc/gen/time.3:1.16 Sat Nov 5 18:17:29 2011 +++ src/lib/libc/gen/time.3 Sun Apr 28 22:57:16 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: time.3,v 1.16 2011/11/05 18:17:29 christos Exp $ +.\" $NetBSD: time.3,v 1.17 2024/04/28 22:57:16 rillig Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" .\" @(#)time.3 8.1 (Berkeley) 6/4/93 .\" -.Dd November 5, 2011 +.Dd April 29, 2024 .Dt TIME 3 .Os .Sh NAME @@ -52,21 +52,17 @@ function returns the value of time in seconds since 0 hours, 0 minutes, 0 seconds, January 1, 1970, Coordinated Universal Time. .Pp -A copy of the time value may be saved to the area indicated by the -pointer -.Fa tloc . If .Fa tloc -is a -.Dv NULL -pointer, no value is stored. +is not a null pointer, a copy of the time value is saved in +.Fa *tloc . .Pp Upon successful completion, .Fn time returns the value of time. Otherwise a value of .Po -.Po Fa time_t Pc \-1 +.Po Fa time_t Pc Ns \-1 .Pc is returned and the global variable .Va errno
CVS commit: src/lib/libc/gen
Module Name:src Committed By: rillig Date: Sun Apr 28 22:57:16 UTC 2024 Modified Files: src/lib/libc/gen: time.3 Log Message: time.3: clarify that *tloc is always set if tloc != NULL To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libc/gen/time.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: rillig Date: Sun Apr 28 22:43:30 UTC 2024 Modified Files: src/lib/libc/gen: setmode.3 Log Message: setmode.3: fix typos To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/setmode.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/setmode.3 diff -u src/lib/libc/gen/setmode.3:1.23 src/lib/libc/gen/setmode.3:1.24 --- src/lib/libc/gen/setmode.3:1.23 Sat Mar 12 17:31:39 2022 +++ src/lib/libc/gen/setmode.3 Sun Apr 28 22:43:30 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: setmode.3,v 1.23 2022/03/12 17:31:39 christos Exp $ +.\" $NetBSD: setmode.3,v 1.24 2024/04/28 22:43:30 rillig Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -51,16 +51,15 @@ function accepts a string representation compiles it to binary form, and returns an abstract representation that may be passed to .Fn getmode . -The string may be an numeric (octal) or symbolic string of the form +The string may be a numeric (octal) or symbolic string of the form accepted by .Xr chmod 1 , and may represent either an exact mode to set or a change to make to -the existing mode. +an existing mode. .Pp The .Fn getmode -function -adjusts the file permission bits given by +function adjusts the file permission bits given by .Fa mode according to the compiled change representation .Fa set , @@ -116,7 +115,7 @@ or .Xr strtol 3 . In addition, .Fn setmode -will fail and set +may fail and set .Va errno to: .Bl -tag -width Er
CVS commit: src/lib/libc/gen
Module Name:src Committed By: rillig Date: Sun Apr 28 22:43:30 UTC 2024 Modified Files: src/lib/libc/gen: setmode.3 Log Message: setmode.3: fix typos To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libc/gen/setmode.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: rillig Date: Sun Apr 28 22:21:21 UTC 2024 Modified Files: src/lib/libc/sys: execve.2 Log Message: execve.2: fix typo in markup To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/execve.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/execve.2 diff -u src/lib/libc/sys/execve.2:1.45 src/lib/libc/sys/execve.2:1.46 --- src/lib/libc/sys/execve.2:1.45 Wed Sep 18 04:57:53 2019 +++ src/lib/libc/sys/execve.2 Sun Apr 28 22:21:21 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: execve.2,v 1.45 2019/09/18 04:57:53 wiz Exp $ +.\" $NetBSD: execve.2,v 1.46 2024/04/28 22:21:21 rillig Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -83,7 +83,7 @@ An interpreter file begins with a line o .Ed .Pp When an interpreter file is -.Sy execve Ar d , +.Sy execve Ap d , the system actually .Sy execve Ap s the specified
CVS commit: src/lib/libc/sys
Module Name:src Committed By: rillig Date: Sun Apr 28 22:21:21 UTC 2024 Modified Files: src/lib/libc/sys: execve.2 Log Message: execve.2: fix typo in markup To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/execve.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/acpi
> Module Name:src > Committed By: christos > Date: Fri Apr 26 18:19:18 UTC 2024 > > Modified Files: > src/sys/dev/acpi: acpi_bat.c > > Log Message: > PR/58201: Malte Dehling: re-order sysmon initialization before acpi > registration, to avoid needing to call to acpi_deregister_notify on sysmon > failure. This isn't really a bug: the detach function calls acpi_deregister_notify. Now, with this change, it will call acpi_deregister_notify even if acpi_register_notify was never called. Fortunately, that's mostly harmless in the current implementation -- just as it was harmless to leave the notifier there; it doesn't use any memory that would be leaked. (Really, if there's any bug here, it's that sysmon_envsys_register can fail at all. This creates vast swaths of never-tested error branches that waste maintainer and auditor time.)
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rillig Date: Sun Apr 28 18:55:04 UTC 2024 Modified Files: src/distrib/sets/lists/debug: mi Log Message: tests/cd9660: add debug info to the file list To generate a diff of this commit: cvs rdiff -u -r1.433 -r1.434 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.433 src/distrib/sets/lists/debug/mi:1.434 --- src/distrib/sets/lists/debug/mi:1.433 Sun Apr 28 01:21:26 2024 +++ src/distrib/sets/lists/debug/mi Sun Apr 28 18:55:04 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.433 2024/04/28 01:21:26 riastradh Exp $ +# $NetBSD: mi,v 1.434 2024/04/28 18:55:04 rillig Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -1681,6 +1681,7 @@ ./usr/libdata/debug/usr/tests/dev/scsipi/t_cd.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/dev/sysmon/t_swwdog.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/dev/usb/t_hid.debug tests-fs-debug debug,atf,rump +./usr/libdata/debug/usr/tests/fs/cd9660/h_hexdump_r.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/fs/ffs/h_ffs_server.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_server.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_tests.debug tests-fs-debug debug,atf,rump
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rillig Date: Sun Apr 28 18:55:04 UTC 2024 Modified Files: src/distrib/sets/lists/debug: mi Log Message: tests/cd9660: add debug info to the file list To generate a diff of this commit: cvs rdiff -u -r1.433 -r1.434 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Sun Apr 28 17:12:30 UTC 2024 Modified Files: src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c Log Message: Bump bozohttpd version to today for mobile-friendly directory listing To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/libexec/httpd/CHANGES cvs rdiff -u -r1.96 -r1.97 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.146 -r1.147 src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/CHANGES diff -u src/libexec/httpd/CHANGES:1.55 src/libexec/httpd/CHANGES:1.56 --- src/libexec/httpd/CHANGES:1.55 Fri Jan 26 23:19:44 2024 +++ src/libexec/httpd/CHANGES Sun Apr 28 17:12:30 2024 @@ -1,4 +1,7 @@ -$NetBSD: CHANGES,v 1.55 2024/01/26 23:19:44 mrg Exp $ +$NetBSD: CHANGES,v 1.56 2024/04/28 17:12:30 maya Exp $ + +changes in bozohttpd 20240428: + o make directory listings mobile friendly. from D. Bohdan. changes in bozohttpd 20240126: o add some more default mime types. Index: src/libexec/httpd/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.96 src/libexec/httpd/bozohttpd.8:1.97 --- src/libexec/httpd/bozohttpd.8:1.96 Sun Feb 4 05:54:20 2024 +++ src/libexec/httpd/bozohttpd.8 Sun Apr 28 17:12:30 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: bozohttpd.8,v 1.96 2024/02/04 05:54:20 mrg Exp $ +.\" $NetBSD: bozohttpd.8,v 1.97 2024/04/28 17:12:30 maya Exp $ .\" .\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $ .\" @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Jan 26, 2024 +.Dd Apr 28, 2024 .Dt BOZOHTTPD 8 .Os .Sh NAME @@ -664,7 +664,7 @@ The focus has always been simplicity and and regular code audits. This manual documents .Nm -version 20240126. +version 20240428. .Sh AUTHORS .An -nosplit .Nm Index: src/libexec/httpd/bozohttpd.c diff -u src/libexec/httpd/bozohttpd.c:1.146 src/libexec/httpd/bozohttpd.c:1.147 --- src/libexec/httpd/bozohttpd.c:1.146 Fri Jan 26 23:19:44 2024 +++ src/libexec/httpd/bozohttpd.c Sun Apr 28 17:12:30 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: bozohttpd.c,v 1.146 2024/01/26 23:19:44 mrg Exp $ */ +/* $NetBSD: bozohttpd.c,v 1.147 2024/04/28 17:12:30 maya Exp $ */ /* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */ @@ -108,7 +108,7 @@ #define INDEX_HTML "index.html" #endif #ifndef SERVER_SOFTWARE -#define SERVER_SOFTWARE "bozohttpd/20240126" +#define SERVER_SOFTWARE "bozohttpd/20240428" #endif #ifndef PUBLIC_HTML #define PUBLIC_HTML "public_html"
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Sun Apr 28 17:12:30 UTC 2024 Modified Files: src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c Log Message: Bump bozohttpd version to today for mobile-friendly directory listing To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/libexec/httpd/CHANGES cvs rdiff -u -r1.96 -r1.97 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.146 -r1.147 src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Sun Apr 28 15:35:39 UTC 2024 Modified Files: src/sys/external/bsd/drm2/linux: linux_sync_file.c Log Message: linux_sync_file: Fix missing init/fini steps. Noted by rjs@. PR kern/58210 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/linux/linux_sync_file.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Sun Apr 28 15:35:39 UTC 2024 Modified Files: src/sys/external/bsd/drm2/linux: linux_sync_file.c Log Message: linux_sync_file: Fix missing init/fini steps. Noted by rjs@. PR kern/58210 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/linux/linux_sync_file.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/linux/linux_sync_file.c diff -u src/sys/external/bsd/drm2/linux/linux_sync_file.c:1.2 src/sys/external/bsd/drm2/linux/linux_sync_file.c:1.3 --- src/sys/external/bsd/drm2/linux/linux_sync_file.c:1.2 Sat Feb 12 15:51:29 2022 +++ src/sys/external/bsd/drm2/linux/linux_sync_file.c Sun Apr 28 15:35:39 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sync_file.c,v 1.2 2022/02/12 15:51:29 thorpej Exp $ */ +/* $NetBSD: linux_sync_file.c,v 1.3 2024/04/28 15:35:39 riastradh Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_sync_file.c,v 1.2 2022/02/12 15:51:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_sync_file.c,v 1.3 2024/04/28 15:35:39 riastradh Exp $"); #include #include @@ -51,15 +51,17 @@ sync_file_create(struct dma_fence *fence sf = kmem_zalloc(sizeof(*sf), KM_SLEEP); sf->file = fp; - sf->sf_fence = dma_fence_get(fence); + mutex_init(>sf_lock, MUTEX_DEFAULT, IPL_VM); selinit(>sf_selq); sf->sf_polling = false; sf->sf_signalled = false; + sf->sf_fence = dma_fence_get(fence); fp->f_type = DTYPE_MISC; fp->f_flag = FREAD | FWRITE; fp->f_ops = _file_ops; + fp->f_data = sf; return sf; } @@ -73,6 +75,8 @@ sync_file_close(struct file *fp) dma_fence_remove_callback(sf->sf_fence, >sf_fcb); dma_fence_put(sf->sf_fence); sf->sf_fence = NULL; + seldestroy(>sf_selq); + mutex_destroy(>sf_lock); kmem_free(sf, sizeof(*sf));
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Apr 28 15:10:19 UTC 2024 Modified Files: src/usr.bin/make: buf.c buf.h var.c Log Message: make: don't reallocate memory after evaluating an expression When an expression is evaluated, the resulting text is short-lived in almost all cases. In particular, the compaction neither affects the target names nor the global variable values, which are the prime candidates for permanent memory usage. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/usr.bin/make/buf.c cvs rdiff -u -r1.49 -r1.50 src/usr.bin/make/buf.h cvs rdiff -u -r1.1107 -r1.1108 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.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Apr 28 15:10:19 UTC 2024
Modified Files:
src/usr.bin/make: buf.c buf.h var.c
Log Message:
make: don't reallocate memory after evaluating an expression
When an expression is evaluated, the resulting text is short-lived in
almost all cases. In particular, the compaction neither affects the
target names nor the global variable values, which are the prime
candidates for permanent memory usage.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/make/buf.c
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/make/buf.h
cvs rdiff -u -r1.1107 -r1.1108 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/buf.c
diff -u src/usr.bin/make/buf.c:1.57 src/usr.bin/make/buf.c:1.58
--- src/usr.bin/make/buf.c:1.57 Tue Dec 19 19:33:39 2023
+++ src/usr.bin/make/buf.c Sun Apr 28 15:10:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.57 2023/12/19 19:33:39 rillig Exp $ */
+/* $NetBSD: buf.c,v 1.58 2024/04/28 15:10:19 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -75,7 +75,7 @@
#include "make.h"
/* "@(#)buf.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: buf.c,v 1.57 2023/12/19 19:33:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: buf.c,v 1.58 2024/04/28 15:10:19 rillig Exp $");
/* Make space in the buffer for adding at least 16 more bytes. */
void
@@ -187,30 +187,3 @@ Buf_DoneData(Buffer *buf)
return data;
}
-
-#ifndef BUF_COMPACT_LIMIT
-# define BUF_COMPACT_LIMIT 128 /* worthwhile saving */
-#endif
-
-/*
- * Return the data from the buffer.
- * Leave the buffer itself in an indeterminate state.
- *
- * If the buffer size is much greater than its content,
- * a new buffer will be allocated and the old one freed.
- */
-char *
-Buf_DoneDataCompact(Buffer *buf)
-{
-#if BUF_COMPACT_LIMIT > 0
- if (buf->cap - buf->len >= BUF_COMPACT_LIMIT) {
- /* We trust realloc to be smart */
- char *data = bmake_realloc(buf->data, buf->len + 1);
- buf->data = NULL;
- data[buf->len] = '\0'; /* XXX: unnecessary */
- Buf_Done(buf);
- return data;
- }
-#endif
- return Buf_DoneData(buf);
-}
Index: src/usr.bin/make/buf.h
diff -u src/usr.bin/make/buf.h:1.49 src/usr.bin/make/buf.h:1.50
--- src/usr.bin/make/buf.h:1.49 Tue Dec 19 19:33:39 2023
+++ src/usr.bin/make/buf.h Sun Apr 28 15:10:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.49 2023/12/19 19:33:39 rillig Exp $ */
+/* $NetBSD: buf.h,v 1.50 2024/04/28 15:10:19 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -124,6 +124,5 @@ void Buf_Init(Buffer *);
void Buf_InitSize(Buffer *, size_t);
void Buf_Done(Buffer *);
char *Buf_DoneData(Buffer *) MAKE_ATTR_USE;
-char *Buf_DoneDataCompact(Buffer *) MAKE_ATTR_USE;
#endif
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1107 src/usr.bin/make/var.c:1.1108
--- src/usr.bin/make/var.c:1.1107 Sat Apr 27 21:26:23 2024
+++ src/usr.bin/make/var.c Sun Apr 28 15:10:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1107 2024/04/27 21:26:23 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1108 2024/04/28 15:10:19 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -132,7 +132,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1107 2024/04/27 21:26:23 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1108 2024/04/28 15:10:19 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -4731,7 +4731,7 @@ Var_Subst(const char *str, GNode *scope,
VarSubstPlain(, );
}
- return Buf_DoneDataCompact();
+ return Buf_DoneData();
}
void
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Apr 28 14:39:22 UTC 2024
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/fs/cd9660: Makefile t_high_ino_big_file.sh
Added Files:
src/tests/fs/cd9660: h_hexdump_r.c pr_48787.image.hex
Removed Files:
src/tests/fs/cd9660: pr_48787.image.bz2.uue
Log Message:
tests/cd9660: replace compressed blob with readable hexdump
This test is skipped in most circumstances because it creates a file
whose apparent size is 4.5 GB. It's an ISO 9660 image though,
containing mostly null bytes. Nevertheless, tmpfs doesn't allow such a
big file to be created, so this test is skipped in settings where /tmp
is on a tmpfs.
If the test is run, the ISO image is uncompressed, which takes several
minutes. Replace bzip2 with direct file creation from a hex dump of
that disk image, which is easier to inspect manually and also faster by
about 3 magnitudes.
To generate a diff of this commit:
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.204 -r1.205 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/cd9660/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/cd9660/h_hexdump_r.c \
src/tests/fs/cd9660/pr_48787.image.hex
cvs rdiff -u -r1.1 -r0 src/tests/fs/cd9660/pr_48787.image.bz2.uue
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/cd9660/t_high_ino_big_file.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1313 src/distrib/sets/lists/tests/mi:1.1314
--- src/distrib/sets/lists/tests/mi:1.1313 Sun Apr 28 01:21:26 2024
+++ src/distrib/sets/lists/tests/mi Sun Apr 28 14:39:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1313 2024/04/28 01:21:26 riastradh Exp $
+# $NetBSD: mi,v 1.1314 2024/04/28 14:39:22 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -35,6 +35,7 @@
./usr/libdata/debug/usr/tests/dev/sysmon tests-fs-debug compattestfile,atf
./usr/libdata/debug/usr/tests/dev/usb tests-fs-debug compattestfile,atf
./usr/libdata/debug/usr/tests/fs tests-fs-debug compattestfile,atf
+./usr/libdata/debug/usr/tests/fs/cd9660 tests-fs-debug compattestfile,atf
./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug compattestfile,atf
./usr/libdata/debug/usr/tests/fs/fifofs tests-fs-debug compattestfile,atf
./usr/libdata/debug/usr/tests/fs/hfs tests-fs-debug compattestfile,atf
@@ -1564,7 +1565,9 @@
./usr/tests/fs/cd9660 tests-fs-tests compattestfile,atf
./usr/tests/fs/cd9660/Atffiletests-fs-tests atf,rump
./usr/tests/fs/cd9660/Kyuafiletests-fs-tests atf,rump,kyua
-./usr/tests/fs/cd9660/pr_48787.image.bz2 tests-fs-tests atf,rump
+./usr/tests/fs/cd9660/h_hexdump_r tests-fs-tests atf,rump
+./usr/tests/fs/cd9660/pr_48787.image.bz2 tests-obsolete obsolete
+./usr/tests/fs/cd9660/pr_48787.image.hex tests-fs-tests atf,rump
./usr/tests/fs/cd9660/t_high_ino_big_file tests-fs-tests atf,rump
./usr/tests/fs/ffs tests-fs-tests compattestfile,atf
./usr/tests/fs/ffs/Atffiletests-fs-tests atf,rump
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.204 src/etc/mtree/NetBSD.dist.tests:1.205
--- src/etc/mtree/NetBSD.dist.tests:1.204 Sun Apr 28 01:21:27 2024
+++ src/etc/mtree/NetBSD.dist.tests Sun Apr 28 14:39:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.204 2024/04/28 01:21:27 riastradh Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.205 2024/04/28 14:39:22 rillig Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -26,6 +26,7 @@
./usr/libdata/debug/usr/tests/dev/sysmon
./usr/libdata/debug/usr/tests/dev/usb
./usr/libdata/debug/usr/tests/fs
+./usr/libdata/debug/usr/tests/fs/cd9660
./usr/libdata/debug/usr/tests/fs/ffs
./usr/libdata/debug/usr/tests/fs/fifofs
./usr/libdata/debug/usr/tests/fs/hfs
Index: src/tests/fs/cd9660/Makefile
diff -u src/tests/fs/cd9660/Makefile:1.1 src/tests/fs/cd9660/Makefile:1.2
--- src/tests/fs/cd9660/Makefile:1.1 Sat May 10 14:15:25 2014
+++ src/tests/fs/cd9660/Makefile Sun Apr 28 14:39:22 2024
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2014/05/10 14:15:25 martin Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/28 14:39:22 rillig Exp $
-TESTSDIR= ${TESTSBASE}/fs/cd9660
-WARNS= 4
-FILESDIR= ${TESTSDIR}
+TESTSDIR= ${TESTSBASE}/fs/cd9660
+FILESDIR= ${TESTSDIR}
-TESTS_SH= t_high_ino_big_file
-FILES= pr_48787.image.bz2
-UUDECODE_FILES= pr_48787.image.bz2
+TESTS_SH= t_high_ino_big_file
+PROGS= h_hexdump_r
+MAN.h_hexdump_r= # none
+BINDIR.h_hexdump_r= ${TESTSDIR}
+FILES= pr_48787.image.hex
.include
Index: src/tests/fs/cd9660/t_high_ino_big_file.sh
diff -u src/tests/fs/cd9660/t_high_ino_big_file.sh:1.5 src/tests/fs/cd9660/t_high_ino_big_file.sh:1.6
--- src/tests/fs/cd9660/t_high_ino_big_file.sh:1.5 Sat Dec 30 13:09:24 2023
+++
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Apr 28 14:39:22 UTC 2024 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests src/tests/fs/cd9660: Makefile t_high_ino_big_file.sh Added Files: src/tests/fs/cd9660: h_hexdump_r.c pr_48787.image.hex Removed Files: src/tests/fs/cd9660: pr_48787.image.bz2.uue Log Message: tests/cd9660: replace compressed blob with readable hexdump This test is skipped in most circumstances because it creates a file whose apparent size is 4.5 GB. It's an ISO 9660 image though, containing mostly null bytes. Nevertheless, tmpfs doesn't allow such a big file to be created, so this test is skipped in settings where /tmp is on a tmpfs. If the test is run, the ISO image is uncompressed, which takes several minutes. Replace bzip2 with direct file creation from a hex dump of that disk image, which is easier to inspect manually and also faster by about 3 magnitudes. To generate a diff of this commit: cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.204 -r1.205 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.1 -r1.2 src/tests/fs/cd9660/Makefile cvs rdiff -u -r0 -r1.1 src/tests/fs/cd9660/h_hexdump_r.c \ src/tests/fs/cd9660/pr_48787.image.hex cvs rdiff -u -r1.1 -r0 src/tests/fs/cd9660/pr_48787.image.bz2.uue cvs rdiff -u -r1.5 -r1.6 src/tests/fs/cd9660/t_high_ino_big_file.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib
Module Name:src Committed By: riastradh Date: Sun Apr 28 12:49:08 UTC 2024 Modified Files: src/tests/lib: Makefile Log Message: tests/lib/Makefile: Hook up libstdc++. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/tests/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/Makefile diff -u src/tests/lib/Makefile:1.35 src/tests/lib/Makefile:1.36 --- src/tests/lib/Makefile:1.35 Mon Nov 21 22:01:33 2022 +++ src/tests/lib/Makefile Sun Apr 28 12:49:08 2024 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.35 2022/11/21 22:01:33 christos Exp $ +# $NetBSD: Makefile,v 1.36 2024/04/28 12:49:08 riastradh Exp $ .include TESTS_SUBDIRS= csu libarchive libbluetooth libc libcrypt libcurses \ libexecinfo libi386 libm libnvmm libobjc libposix libppath \ - libprop libpthread librefuse librt libtre libusbhid libutil \ - libossaudio lua semaphore + libprop libpthread librefuse librt libstdc++ libtre libusbhid \ + libutil libossaudio lua semaphore TESTS_SUBDIR_INSTALL_ONLY= libevent
CVS commit: src/tests/lib
Module Name:src Committed By: riastradh Date: Sun Apr 28 12:49:08 UTC 2024 Modified Files: src/tests/lib: Makefile Log Message: tests/lib/Makefile: Hook up libstdc++. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/tests/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/include
Module Name:src
Committed By: skrll
Date: Sun Apr 28 10:57:34 UTC 2024
Modified Files:
src/sys/arch/hppa/include: types.h
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hppa/include/types.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/hppa/include/types.h
diff -u src/sys/arch/hppa/include/types.h:1.32 src/sys/arch/hppa/include/types.h:1.33
--- src/sys/arch/hppa/include/types.h:1.32 Sun Jul 23 10:09:36 2023
+++ src/sys/arch/hppa/include/types.h Sun Apr 28 10:57:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.32 2023/07/23 10:09:36 skrll Exp $ */
+/* $NetBSD: types.h,v 1.33 2024/04/28 10:57:34 skrll Exp $ */
/* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */
@@ -80,8 +80,8 @@ typedef struct {
typedef int __register_t;
-#define __SIMPLELOCK_LOCKED { { 0, 0, 0, 0} }
-#define __SIMPLELOCK_UNLOCKED { { 1, 1, 1, 1} }
+#define __SIMPLELOCK_LOCKED { { 0, 0, 0, 0 } }
+#define __SIMPLELOCK_UNLOCKED { { 1, 1, 1, 1 } }
#define __MACHINE_STACK_GROWS_UP /* stack grows to higher addresses */
#define __HAVE_FUNCTION_DESCRIPTORS /* function ptrs may be descriptors */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sun Apr 28 10:57:34 UTC 2024 Modified Files: src/sys/arch/hppa/include: types.h Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hppa/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Apr 28 08:55:03 UTC 2024
Modified Files:
src/sys/dev/usb: ohci.c
Log Message:
Fix some usb_syncmem calls and add some missing ones.
To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 src/sys/dev/usb/ohci.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/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.327 src/sys/dev/usb/ohci.c:1.328
--- src/sys/dev/usb/ohci.c:1.327 Sun Apr 28 07:52:52 2024
+++ src/sys/dev/usb/ohci.c Sun Apr 28 08:55:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.327 2024/04/28 07:52:52 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.328 2024/04/28 08:55:03 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012, 2016, 2020 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.327 2024/04/28 07:52:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.328 2024/04/28 08:55:03 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -844,6 +844,9 @@ ohci_init(ohci_softc_t *sc)
goto bad1;
}
sc->sc_ctrl_head->ed.ed_flags |= HTOO32(OHCI_ED_SKIP);
+ usb_syncmem(>sc_ctrl_head->dma, sc->sc_ctrl_head->offs,
+ sizeof(sc->sc_ctrl_head->ed),
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
/* Allocate dummy ED that starts the bulk list. */
sc->sc_bulk_head = ohci_alloc_sed(sc);
@@ -1609,6 +1612,10 @@ ohci_softintr(void *v)
for (i = 0, sitd = xfer->ux_hcpriv;;
sitd = next) {
next = sitd->nextitd;
+
+usb_syncmem(>dma, sitd->offs, sizeof(sitd->itd),
+BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+
if (OHCI_ITD_GET_CC(O32TOH(sitd->
itd.itd_flags)) != OHCI_CC_NO_ERROR)
xfer->ux_status = USBD_IOERROR;
@@ -2259,8 +2266,7 @@ ohci_abortx(struct usbd_xfer *xfer)
* waiting for the next start of frame (OHCI_SF)
*/
DPRINTFN(1, "stop ed=%#jx", (uintptr_t)sed, 0, 0, 0);
- usb_syncmem(>dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
- sizeof(sed->ed.ed_flags),
+ usb_syncmem(>dma, sed->offs, sizeof(sed->ed),
BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
if (!(sed->ed.ed_flags & OHCI_HALTED)) {
/* force hardware skip */
@@ -2337,6 +2343,9 @@ ohci_abortx(struct usbd_xfer *xfer)
hit |= headp == p->physaddr;
n = p->nexttd;
+ usb_syncmem(>dma, p->offs + offsetof(ohci_td_t, td_flags),
+ sizeof(p->td.td_flags),
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
int cc = OHCI_TD_GET_CC(O32TOH(p->td.td_flags));
if (!OHCI_CC_ACCESSED_P(cc)) {
ohci_hash_rem_td(sc, p);
@@ -2951,8 +2960,17 @@ ohci_device_clear_toggle(struct usbd_pip
{
struct ohci_pipe *opipe = OHCI_PIPE2OPIPE(pipe);
ohci_softc_t *sc = OHCI_PIPE2SC(pipe);
+ ohci_soft_ed_t *sed = opipe->sed;
+
+ usb_syncmem(>dma, sed->offs + offsetof(ohci_ed_t, ed_headp),
+ sizeof(sed->ed.ed_headp),
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
opipe->sed->ed.ed_headp &= HTOO32(~OHCI_TOGGLECARRY);
+
+ usb_syncmem(>dma, sed->offs + offsetof(ohci_ed_t, ed_headp),
+ sizeof(sed->ed.ed_headp),
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
}
Static void
@@ -3403,17 +3421,21 @@ ohci_device_setintr(ohci_softc_t *sc, st
mutex_enter(>sc_lock);
hsed = sc->sc_eds[best];
sed->next = hsed->next;
- usb_syncmem(>dma, hsed->offs + offsetof(ohci_ed_t, ed_flags),
- sizeof(hsed->ed.ed_flags),
+ usb_syncmem(>dma, sed->offs + offsetof(ohci_ed_t, ed_nexted),
+ sizeof(sed->ed.ed_nexted),
BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
sed->ed.ed_nexted = hsed->ed.ed_nexted;
- usb_syncmem(>dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
- sizeof(sed->ed.ed_flags),
+ usb_syncmem(>dma, sed->offs + offsetof(ohci_ed_t, ed_nexted),
+ sizeof(sed->ed.ed_nexted),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+
hsed->next = sed;
+ usb_syncmem(>dma, hsed->offs + offsetof(ohci_ed_t, ed_nexted),
+ sizeof(hsed->ed.ed_nexted),
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
hsed->ed.ed_nexted = HTOO32(sed->physaddr);
- usb_syncmem(>dma, hsed->offs + offsetof(ohci_ed_t, ed_flags),
- sizeof(hsed->ed.ed_flags),
+ usb_syncmem(>dma, hsed->offs + offsetof(ohci_ed_t, ed_nexted),
+ sizeof(hsed->ed.ed_nexted),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
mutex_exit(>sc_lock);
@@ -3685,8 +3707,7 @@ ohci_device_isoc_enter(struct usbd_xfer
BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
sed->ed.ed_tailp = HTOO32(tail->physaddr);
sed->ed.ed_flags &= HTOO32(~OHCI_ED_SKIP);
- usb_syncmem(>dma, sed->offs + offsetof(ohci_ed_t, ed_flags),
- sizeof(sed->ed.ed_flags),
+ usb_syncmem(>dma, sed->offs, sizeof(sed->ed),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Apr 28 08:55:03 UTC 2024 Modified Files: src/sys/dev/usb: ohci.c Log Message: Fix some usb_syncmem calls and add some missing ones. To generate a diff of this commit: cvs rdiff -u -r1.327 -r1.328 src/sys/dev/usb/ohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: nia Date: Sun Apr 28 08:12:44 UTC 2024 Modified Files: src/sys/arch/i386/conf: LEGACY Log Message: i386: disable DRMKMS drivers in LEGACY kernel (this is for ISA) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/LEGACY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: nia Date: Sun Apr 28 08:12:44 UTC 2024 Modified Files: src/sys/arch/i386/conf: LEGACY Log Message: i386: disable DRMKMS drivers in LEGACY kernel (this is for ISA) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/LEGACY 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/i386/conf/LEGACY diff -u src/sys/arch/i386/conf/LEGACY:1.2 src/sys/arch/i386/conf/LEGACY:1.3 --- src/sys/arch/i386/conf/LEGACY:1.2 Mon Jul 17 21:12:29 2023 +++ src/sys/arch/i386/conf/LEGACY Sun Apr 28 08:12:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: LEGACY,v 1.2 2023/07/17 21:12:29 riastradh Exp $ +# $NetBSD: LEGACY,v 1.3 2024/04/28 08:12:44 nia Exp $ # LEGACY kernel -- includes vga@isa and pcdisplay@isa for pre-PCI # systems, due to significant pain making them fail to attach when @@ -15,3 +15,12 @@ options ATA_DOWNGRADE_MODE # XXX we could turn off all sorts of other modern features in this # configuration, but that is left for future work. + +no i915drmkms* at pci? +no intelfb* at intelfbbus? + +no radeon* at pci? +no radeondrmkmsfb* at radeonfbbus? + +no nouveau* at pci? +no nouveaufb* at nouveaufbbus?
CVS commit: src/share/mk
Module Name:src Committed By: nia Date: Sun Apr 28 08:01:04 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Turn off MKAMDGPUFIRMWARE on i386 It's too big for the i386 install media and not useful on either pre-2012 hardware or the kinds of embedded systems where i386 still thrived after 2012. (The build of the kernel parts of amdgpu on i386 is nevertheless useful for finding obscure bugs.) "go for it" riastradh To generate a diff of this commit: cvs rdiff -u -r1.1372 -r1.1373 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1372 src/share/mk/bsd.own.mk:1.1373 --- src/share/mk/bsd.own.mk:1.1372 Wed Apr 24 20:38:24 2024 +++ src/share/mk/bsd.own.mk Sun Apr 28 08:01:04 2024 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1372 2024/04/24 20:38:24 martin Exp $ +# $NetBSD: bsd.own.mk,v 1.1373 2024/04/28 08:01:04 nia Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1301,7 +1301,6 @@ MKRADEONFIRMWARE.x86_64= yes MKRADEONFIRMWARE.i386= yes MKRADEONFIRMWARE.aarch64= yes MKAMDGPUFIRMWARE.x86_64= yes -MKAMDGPUFIRMWARE.i386= yes # Only install the tegra firmware on evbarm. MKTEGRAFIRMWARE.evbarm= yes
CVS commit: src/share/mk
Module Name:src Committed By: nia Date: Sun Apr 28 08:01:04 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Turn off MKAMDGPUFIRMWARE on i386 It's too big for the i386 install media and not useful on either pre-2012 hardware or the kinds of embedded systems where i386 still thrived after 2012. (The build of the kernel parts of amdgpu on i386 is nevertheless useful for finding obscure bugs.) "go for it" riastradh To generate a diff of this commit: cvs rdiff -u -r1.1372 -r1.1373 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Apr 28 07:52:52 UTC 2024
Modified Files:
src/sys/dev/usb: ohci.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/sys/dev/usb/ohci.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/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.326 src/sys/dev/usb/ohci.c:1.327
--- src/sys/dev/usb/ohci.c:1.326 Fri Apr 5 18:57:10 2024
+++ src/sys/dev/usb/ohci.c Sun Apr 28 07:52:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.326 2024/04/05 18:57:10 riastradh Exp $ */
+/* $NetBSD: ohci.c,v 1.327 2024/04/28 07:52:52 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012, 2016, 2020 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.326 2024/04/05 18:57:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.327 2024/04/28 07:52:52 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -826,8 +826,8 @@ ohci_init(ohci_softc_t *sc)
/* XXX determine alignment by R/W */
/* Allocate the HCCA area. */
- err = usb_allocmem(sc->sc_bus.ub_dmatag, OHCI_HCCA_SIZE, OHCI_HCCA_ALIGN,
- USBMALLOC_COHERENT, >sc_hccadma);
+ err = usb_allocmem(sc->sc_bus.ub_dmatag, OHCI_HCCA_SIZE,
+ OHCI_HCCA_ALIGN, USBMALLOC_COHERENT, >sc_hccadma);
if (err) {
sc->sc_hcca = NULL;
return err;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Apr 28 07:52:52 UTC 2024 Modified Files: src/sys/dev/usb: ohci.c Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.326 -r1.327 src/sys/dev/usb/ohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests
Module Name:src Committed By: rillig Date: Sun Apr 28 07:27:43 UTC 2024 Modified Files: src/tests/bin/df: t_df.sh src/tests/bin/pax: t_pax.sh src/tests/bin/sh: t_ulimit.sh t_varquote.sh src/tests/bin/tar: t_tar.sh src/tests/crypto/libcrypto: t_libcrypto.sh src/tests/fs/psshfs: t_psshfs.sh src/tests/fs/tmpfs: h_funcs.subr t_create.sh t_devices.sh t_dots.sh t_exec.sh t_link.sh t_mkdir.sh t_mknod.sh t_mount.sh t_pipes.sh t_read_write.sh t_readdir.sh t_remove.sh t_rename.sh t_rmdir.sh t_setattr.sh t_sizes.sh t_sockets.sh t_symlink.sh t_times.sh t_trail_slash.sh t_vnd.sh t_vnode_leak.sh src/tests/games: t_factor.sh src/tests/lib/librumphijack: t_tcpip.sh src/tests/modules: t_abi_uvm.sh t_klua_pr_52864.sh t_modload.sh t_threadpool.sh src/tests/sbin/newfs_msdos: t_create.sh src/tests/sys/rc: t_rc_d_cli.sh src/tests/usr.bin/config: t_config.sh src/tests/usr.bin/id: t_groups.sh t_id.sh t_whoami.sh src/tests/usr.bin/mtree: t_sets.sh src/tests/usr.bin/netpgpverify: Testspec t_netpgpverify.sh src/tests/usr.bin/sdiff: t_sdiff.sh Log Message: tests: replace deprecated '-s eq:...' with '-s exit:...' To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/bin/df/t_df.sh cvs rdiff -u -r1.1 -r1.2 src/tests/bin/pax/t_pax.sh cvs rdiff -u -r1.3 -r1.4 src/tests/bin/sh/t_ulimit.sh cvs rdiff -u -r1.5 -r1.6 src/tests/bin/sh/t_varquote.sh cvs rdiff -u -r1.2 -r1.3 src/tests/bin/tar/t_tar.sh cvs rdiff -u -r1.9 -r1.10 src/tests/crypto/libcrypto/t_libcrypto.sh cvs rdiff -u -r1.9 -r1.10 src/tests/fs/psshfs/t_psshfs.sh cvs rdiff -u -r1.5 -r1.6 src/tests/fs/tmpfs/h_funcs.subr \ src/tests/fs/tmpfs/t_devices.sh src/tests/fs/tmpfs/t_dots.sh \ src/tests/fs/tmpfs/t_exec.sh src/tests/fs/tmpfs/t_mknod.sh \ src/tests/fs/tmpfs/t_pipes.sh src/tests/fs/tmpfs/t_read_write.sh \ src/tests/fs/tmpfs/t_readdir.sh src/tests/fs/tmpfs/t_remove.sh \ src/tests/fs/tmpfs/t_rename.sh src/tests/fs/tmpfs/t_rmdir.sh \ src/tests/fs/tmpfs/t_setattr.sh src/tests/fs/tmpfs/t_sockets.sh \ src/tests/fs/tmpfs/t_symlink.sh src/tests/fs/tmpfs/t_trail_slash.sh cvs rdiff -u -r1.8 -r1.9 src/tests/fs/tmpfs/t_create.sh \ src/tests/fs/tmpfs/t_mkdir.sh cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/t_link.sh \ src/tests/fs/tmpfs/t_mount.sh src/tests/fs/tmpfs/t_sizes.sh cvs rdiff -u -r1.7 -r1.8 src/tests/fs/tmpfs/t_times.sh \ src/tests/fs/tmpfs/t_vnode_leak.sh cvs rdiff -u -r1.13 -r1.14 src/tests/fs/tmpfs/t_vnd.sh cvs rdiff -u -r1.11 -r1.12 src/tests/games/t_factor.sh cvs rdiff -u -r1.23 -r1.24 src/tests/lib/librumphijack/t_tcpip.sh cvs rdiff -u -r1.3 -r1.4 src/tests/modules/t_abi_uvm.sh \ src/tests/modules/t_klua_pr_52864.sh cvs rdiff -u -r1.13 -r1.14 src/tests/modules/t_modload.sh cvs rdiff -u -r1.1 -r1.2 src/tests/modules/t_threadpool.sh cvs rdiff -u -r1.4 -r1.5 src/tests/sbin/newfs_msdos/t_create.sh cvs rdiff -u -r1.5 -r1.6 src/tests/sys/rc/t_rc_d_cli.sh cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/config/t_config.sh cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/id/t_groups.sh \ src/tests/usr.bin/id/t_id.sh src/tests/usr.bin/id/t_whoami.sh cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/mtree/t_sets.sh cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/netpgpverify/Testspec cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/netpgpverify/t_netpgpverify.sh cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/sdiff/t_sdiff.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests
Module Name:src Committed By: rillig Date: Sun Apr 28 07:27:43 UTC 2024 Modified Files: src/tests/bin/df: t_df.sh src/tests/bin/pax: t_pax.sh src/tests/bin/sh: t_ulimit.sh t_varquote.sh src/tests/bin/tar: t_tar.sh src/tests/crypto/libcrypto: t_libcrypto.sh src/tests/fs/psshfs: t_psshfs.sh src/tests/fs/tmpfs: h_funcs.subr t_create.sh t_devices.sh t_dots.sh t_exec.sh t_link.sh t_mkdir.sh t_mknod.sh t_mount.sh t_pipes.sh t_read_write.sh t_readdir.sh t_remove.sh t_rename.sh t_rmdir.sh t_setattr.sh t_sizes.sh t_sockets.sh t_symlink.sh t_times.sh t_trail_slash.sh t_vnd.sh t_vnode_leak.sh src/tests/games: t_factor.sh src/tests/lib/librumphijack: t_tcpip.sh src/tests/modules: t_abi_uvm.sh t_klua_pr_52864.sh t_modload.sh t_threadpool.sh src/tests/sbin/newfs_msdos: t_create.sh src/tests/sys/rc: t_rc_d_cli.sh src/tests/usr.bin/config: t_config.sh src/tests/usr.bin/id: t_groups.sh t_id.sh t_whoami.sh src/tests/usr.bin/mtree: t_sets.sh src/tests/usr.bin/netpgpverify: Testspec t_netpgpverify.sh src/tests/usr.bin/sdiff: t_sdiff.sh Log Message: tests: replace deprecated '-s eq:...' with '-s exit:...' To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/bin/df/t_df.sh cvs rdiff -u -r1.1 -r1.2 src/tests/bin/pax/t_pax.sh cvs rdiff -u -r1.3 -r1.4 src/tests/bin/sh/t_ulimit.sh cvs rdiff -u -r1.5 -r1.6 src/tests/bin/sh/t_varquote.sh cvs rdiff -u -r1.2 -r1.3 src/tests/bin/tar/t_tar.sh cvs rdiff -u -r1.9 -r1.10 src/tests/crypto/libcrypto/t_libcrypto.sh cvs rdiff -u -r1.9 -r1.10 src/tests/fs/psshfs/t_psshfs.sh cvs rdiff -u -r1.5 -r1.6 src/tests/fs/tmpfs/h_funcs.subr \ src/tests/fs/tmpfs/t_devices.sh src/tests/fs/tmpfs/t_dots.sh \ src/tests/fs/tmpfs/t_exec.sh src/tests/fs/tmpfs/t_mknod.sh \ src/tests/fs/tmpfs/t_pipes.sh src/tests/fs/tmpfs/t_read_write.sh \ src/tests/fs/tmpfs/t_readdir.sh src/tests/fs/tmpfs/t_remove.sh \ src/tests/fs/tmpfs/t_rename.sh src/tests/fs/tmpfs/t_rmdir.sh \ src/tests/fs/tmpfs/t_setattr.sh src/tests/fs/tmpfs/t_sockets.sh \ src/tests/fs/tmpfs/t_symlink.sh src/tests/fs/tmpfs/t_trail_slash.sh cvs rdiff -u -r1.8 -r1.9 src/tests/fs/tmpfs/t_create.sh \ src/tests/fs/tmpfs/t_mkdir.sh cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/t_link.sh \ src/tests/fs/tmpfs/t_mount.sh src/tests/fs/tmpfs/t_sizes.sh cvs rdiff -u -r1.7 -r1.8 src/tests/fs/tmpfs/t_times.sh \ src/tests/fs/tmpfs/t_vnode_leak.sh cvs rdiff -u -r1.13 -r1.14 src/tests/fs/tmpfs/t_vnd.sh cvs rdiff -u -r1.11 -r1.12 src/tests/games/t_factor.sh cvs rdiff -u -r1.23 -r1.24 src/tests/lib/librumphijack/t_tcpip.sh cvs rdiff -u -r1.3 -r1.4 src/tests/modules/t_abi_uvm.sh \ src/tests/modules/t_klua_pr_52864.sh cvs rdiff -u -r1.13 -r1.14 src/tests/modules/t_modload.sh cvs rdiff -u -r1.1 -r1.2 src/tests/modules/t_threadpool.sh cvs rdiff -u -r1.4 -r1.5 src/tests/sbin/newfs_msdos/t_create.sh cvs rdiff -u -r1.5 -r1.6 src/tests/sys/rc/t_rc_d_cli.sh cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/config/t_config.sh cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/id/t_groups.sh \ src/tests/usr.bin/id/t_id.sh src/tests/usr.bin/id/t_whoami.sh cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/mtree/t_sets.sh cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/netpgpverify/Testspec cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/netpgpverify/t_netpgpverify.sh cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/sdiff/t_sdiff.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/bin/df/t_df.sh diff -u src/tests/bin/df/t_df.sh:1.2 src/tests/bin/df/t_df.sh:1.3 --- src/tests/bin/df/t_df.sh:1.2 Sun Aug 23 15:51:30 2020 +++ src/tests/bin/df/t_df.sh Sun Apr 28 07:27:40 2024 @@ -1,4 +1,4 @@ -# $NetBSD: t_df.sh,v 1.2 2020/08/23 15:51:30 ryo Exp $ +# $NetBSD: t_df.sh,v 1.3 2024/04/28 07:27:40 rillig Exp $ # # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -79,7 +79,7 @@ filer:/1202716672 1202716672 /dev/strpct 21474836476 10737418240 10737418236 50% /strpct /dev/wd0e10485688 2859932 7625756 27% /mount/windows/C EOF - atf_check -s eq:0 -o file:expout -e empty \ + atf_check -s exit:0 -o file:expout -e empty \ -x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -n" } @@ -137,7 +137,7 @@ filer:/1.1T 1.1T -172G 117% / /dev/strpct 20T10T10T 50% /strpct /dev/wd0e 10G 2.7G 7.3G 27% /mount/windows/C EOF - atf_check -s eq:0 -o file:expout -e empty \ + atf_check -s exit:0 -o file:expout -e empty \ -x "BLOCKSIZE=1k $(atf_get_srcdir)/h_df -hn" } Index: src/tests/bin/pax/t_pax.sh diff -u src/tests/bin/pax/t_pax.sh:1.1 src/tests/bin/pax/t_pax.sh:1.2 --- src/tests/bin/pax/t_pax.sh:1.1 Sat Mar 17 16:33:11 2012 +++ src/tests/bin/pax/t_pax.sh Sun Apr 28 07:27:40
CVS commit: src
Module Name:src Committed By: riastradh Date: Sun Apr 28 01:21:27 UTC 2024 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Added Files: src/tests/lib/libstdc++: Makefile h_cin_nosync.cc t_sync_with_stdio.sh Log Message: libstdc++: Add test for PR lib/58206, sync_with_stdio busted. To generate a diff of this commit: cvs rdiff -u -r1.432 -r1.433 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1312 -r1.1313 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.203 -r1.204 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r0 -r1.1 src/tests/lib/libstdc++/Makefile \ src/tests/lib/libstdc++/h_cin_nosync.cc \ src/tests/lib/libstdc++/t_sync_with_stdio.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.432 src/distrib/sets/lists/debug/mi:1.433 --- src/distrib/sets/lists/debug/mi:1.432 Tue Apr 23 07:33:24 2024 +++ src/distrib/sets/lists/debug/mi Sun Apr 28 01:21:26 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.432 2024/04/23 07:33:24 martin Exp $ +# $NetBSD: mi,v 1.433 2024/04/28 01:21:26 riastradh Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -2390,6 +2390,7 @@ ./usr/libdata/debug/usr/tests/lib/librumphijack/h_netget.debug tests-lib-debug debug,atf,rump ./usr/libdata/debug/usr/tests/lib/libskey/t_algorithms.debug tests-lib-debug debug,atf,skey,compattestfile ./usr/libdata/debug/usr/tests/lib/libsljit/h_sljit.debug tests-lib-debug debug,atf,sljit,compattestfile +./usr/libdata/debug/usr/tests/lib/libstdc++/h_cin_nosync.debug tests-lib-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libtre/h_regex_att.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/lib/libtre/t_exhaust.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libtre/t_regex_att.debug tests-lib-debug debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1312 src/distrib/sets/lists/tests/mi:1.1313 --- src/distrib/sets/lists/tests/mi:1.1312 Mon Apr 22 07:24:22 2024 +++ src/distrib/sets/lists/tests/mi Sun Apr 28 01:21:26 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1312 2024/04/22 07:24:22 pho Exp $ +# $NetBSD: mi,v 1.1313 2024/04/28 01:21:26 riastradh Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -151,6 +151,7 @@ ./usr/libdata/debug/usr/tests/lib/librumphijack tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libskey tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libsljit tests-lib-debug compattestfile,atf +./usr/libdata/debug/usr/tests/lib/libstdc++ tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libtre tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libusbhid tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libutil tests-lib-debug compattestfile,atf @@ -4091,6 +4092,11 @@ ./usr/tests/lib/libsljit/Kyuafile tests-lib-tests compattestfile,atf,sljit,kyua ./usr/tests/lib/libsljit/h_sljit tests-lib-tests compattestfile,atf,sljit ./usr/tests/lib/libsljit/t_sljit tests-lib-tests compattestfile,atf,sljit +./usr/tests/lib/libstdc++tests-lib-tests compattestfile,atf +./usr/tests/lib/libstdc++/Atffile tests-lib-tests compattestfile,atf +./usr/tests/lib/libstdc++/Kyuafile tests-lib-tests compattestfile,atf,kyua +./usr/tests/lib/libstdc++/h_cin_nosync tests-lib-tests compattestfile,atf +./usr/tests/lib/libstdc++/t_sync_with_stdio tests-lib-tests compattestfile,atf ./usr/tests/lib/libtre tests-lib-tests compattestfile,atf ./usr/tests/lib/libtre/Atffiletests-lib-tests compattestfile,atf ./usr/tests/lib/libtre/Kyuafiletests-lib-tests compattestfile,atf,kyua Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.203 src/etc/mtree/NetBSD.dist.tests:1.204 --- src/etc/mtree/NetBSD.dist.tests:1.203 Thu Mar 14 21:00:32 2024 +++ src/etc/mtree/NetBSD.dist.tests Sun Apr 28 01:21:27 2024 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.203 2024/03/14 21:00:32 rillig Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.204 2024/04/28 01:21:27 riastradh Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -131,6 +131,7 @@ ./usr/libdata/debug/usr/tests/lib/librumphijack ./usr/libdata/debug/usr/tests/lib/libskey ./usr/libdata/debug/usr/tests/lib/libsljit +./usr/libdata/debug/usr/tests/lib/libstdc++ ./usr/libdata/debug/usr/tests/lib/libtre ./usr/libdata/debug/usr/tests/lib/libusbhid ./usr/libdata/debug/usr/tests/lib/libutil @@ -345,6 +346,7 @@ ./usr/tests/lib/librumphijack ./usr/tests/lib/libskey
CVS commit: src
Module Name:src Committed By: riastradh Date: Sun Apr 28 01:21:27 UTC 2024 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Added Files: src/tests/lib/libstdc++: Makefile h_cin_nosync.cc t_sync_with_stdio.sh Log Message: libstdc++: Add test for PR lib/58206, sync_with_stdio busted. To generate a diff of this commit: cvs rdiff -u -r1.432 -r1.433 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1312 -r1.1313 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.203 -r1.204 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r0 -r1.1 src/tests/lib/libstdc++/Makefile \ src/tests/lib/libstdc++/h_cin_nosync.cc \ src/tests/lib/libstdc++/t_sync_with_stdio.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat Apr 27 21:26:23 UTC 2024 Modified Files: src/usr.bin/make: var.c Log Message: make: fix comment about forcing a use-after-free The previous expression didn't cause any bug, as the modifier ':@VAR@loop@' changed the value of the expression, thus making the expression independent from the variable value. Instead, the variable needs to be deleted from within an indirect modifier, and that modifier needs to evaluate to an empty string, thus doing nothing and preserving the original expression value. To generate a diff of this commit: cvs rdiff -u -r1.1106 -r1.1107 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.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Apr 27 21:26:23 UTC 2024
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: fix comment about forcing a use-after-free
The previous expression didn't cause any bug, as the modifier
':@VAR@loop@' changed the value of the expression, thus making the
expression independent from the variable value.
Instead, the variable needs to be deleted from within an indirect
modifier, and that modifier needs to evaluate to an empty string, thus
doing nothing and preserving the original expression value.
To generate a diff of this commit:
cvs rdiff -u -r1.1106 -r1.1107 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.1106 src/usr.bin/make/var.c:1.1107
--- src/usr.bin/make/var.c:1.1106 Sat Apr 27 20:41:32 2024
+++ src/usr.bin/make/var.c Sat Apr 27 21:26:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1106 2024/04/27 20:41:32 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1107 2024/04/27 21:26:23 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -132,7 +132,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1106 2024/04/27 20:41:32 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1107 2024/04/27 21:26:23 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -4542,7 +4542,7 @@ Var_Parse(const char **pp, GNode *scope,
* while its value is still being used:
*
* VAR= value
- * _:= ${VAR:${:U@VAR@loop@}:S,^,prefix,}
+ * _:= ${VAR:${:U:@VAR@@}:S,^,prefix,}
*
* The same effect might be achievable using the '::=' or the ':_'
* modifiers.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat Apr 27 20:41:32 UTC 2024 Modified Files: src/usr.bin/make: arch.c job.c make.h var.c src/usr.bin/make/unit-tests: depsrc-end.mk depsrc-nopath.exp depsrc-nopath.mk depsrc-phony.mk Log Message: make: clean up, test .NOPATH Trim down the comments in the archive module, as they mainly repeated the code. Trim down the binary code size in the archive module, as it is rarely used. In Var_Parse, delay two variable assignments until they are actually needed. To generate a diff of this commit: cvs rdiff -u -r1.216 -r1.217 src/usr.bin/make/arch.c cvs rdiff -u -r1.469 -r1.470 src/usr.bin/make/job.c cvs rdiff -u -r1.331 -r1.332 src/usr.bin/make/make.h cvs rdiff -u -r1.1105 -r1.1106 src/usr.bin/make/var.c cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/depsrc-end.mk \ src/usr.bin/make/unit-tests/depsrc-nopath.exp cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/depsrc-nopath.mk cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/depsrc-phony.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Apr 27 20:41:32 UTC 2024
Modified Files:
src/usr.bin/make: arch.c job.c make.h var.c
src/usr.bin/make/unit-tests: depsrc-end.mk depsrc-nopath.exp
depsrc-nopath.mk depsrc-phony.mk
Log Message:
make: clean up, test .NOPATH
Trim down the comments in the archive module, as they mainly repeated
the code. Trim down the binary code size in the archive module, as it
is rarely used.
In Var_Parse, delay two variable assignments until they are actually
needed.
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/usr.bin/make/arch.c
cvs rdiff -u -r1.469 -r1.470 src/usr.bin/make/job.c
cvs rdiff -u -r1.331 -r1.332 src/usr.bin/make/make.h
cvs rdiff -u -r1.1105 -r1.1106 src/usr.bin/make/var.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/depsrc-end.mk \
src/usr.bin/make/unit-tests/depsrc-nopath.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/depsrc-nopath.mk
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/depsrc-phony.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/arch.c
diff -u src/usr.bin/make/arch.c:1.216 src/usr.bin/make/arch.c:1.217
--- src/usr.bin/make/arch.c:1.216 Sat Apr 27 17:33:46 2024
+++ src/usr.bin/make/arch.c Sat Apr 27 20:41:32 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.216 2024/04/27 17:33:46 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.217 2024/04/27 20:41:32 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.216 2024/04/27 17:33:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.217 2024/04/27 20:41:32 rillig Exp $");
typedef struct List ArchList;
typedef struct ListNode ArchListNode;
@@ -134,7 +134,7 @@ typedef struct ListNode ArchListNode;
static ArchList archives; /* The archives we've already examined */
typedef struct Arch {
- char *name; /* Name of archive */
+ char *name;
HashTable members; /* All the members of the archive described
* by key/value pairs */
char *fnametab; /* Extended name table strings */
@@ -155,7 +155,6 @@ ArchFree(Arch *a)
{
HashIter hi;
- /* Free memory from hash entries */
HashIter_Init(, >members);
while (HashIter_Next() != NULL)
free(hi.entry->value);
@@ -168,32 +167,22 @@ ArchFree(Arch *a)
#endif
/* Return "archive(member)". */
-static char *
+MAKE_ATTR_NOINLINE static char *
FullName(const char *archive, const char *member)
{
- size_t len1 = strlen(archive);
- size_t len3 = strlen(member);
- char *result = bmake_malloc(len1 + 1 + len3 + 1 + 1);
- memcpy(result, archive, len1);
- memcpy(result + len1, "(", 1);
- memcpy(result + len1 + 1, member, len3);
- memcpy(result + len1 + 1 + len3, ")", 1 + 1);
- return result;
+ Buffer buf;
+ Buf_Init();
+ Buf_AddStr(, archive);
+ Buf_AddStr(, "(");
+ Buf_AddStr(, member);
+ Buf_AddStr(, ")");
+ return Buf_DoneData();
}
/*
* Parse an archive specification such as "archive.a(member1 member2.${EXT})",
- * adding nodes for the expanded members to gns. Nodes are created as
- * necessary.
- *
- * Input:
- * pp The start of the specification.
- * gns The list on which to place the nodes.
- * scope The scope in which to expand variables.
- *
- * Output:
- * return True if it was a valid specification.
- * *pp Points to the first non-space after the archive spec.
+ * adding nodes for the expanded members to gns. If successful, advance pp
+ * beyond the archive specification and any trailing whitespace.
*/
bool
Arch_ParseArchive(char **pp, GNodeList *gns, GNode *scope)
@@ -274,12 +263,6 @@ Arch_ParseArchive(char **pp, GNodeList *
}
}
- /*
- * If the specification ends without a closing parenthesis,
- * chances are there's something wrong (like a missing
- * backslash), so it's better to return failure than allow
- * such things to happen
- */
if (*cp == '\0') {
Parse_Error(PARSE_FATAL,
"No closing parenthesis "
@@ -287,9 +270,6 @@ Arch_ParseArchive(char **pp, GNodeList *
return false;
}
- /*
- * If we didn't move anywhere, we must be done
- */
if (cp == mem.str)
break;
@@ -326,8 +306,7 @@ Arch_ParseArchive(char **pp, GNodeList *
/*
* Must contain dynamic sources, so we can't
* deal with it now. Just create an ARCHV node
- * for the thing and let SuffExpandChildren
- * handle it.
+ * and let SuffExpandChildren handle it.
*/
gn = Targ_GetNode(fullName);
gn->type |= OP_ARCHV;
@@ -364,13 +343,6 @@ Arch_ParseArchive(char **pp, GNodeList *
gn = Targ_GetNode(fullname);
free(fullname);
- /*
- * We've found the node, but have to make sure the
- * rest of the world knows it's an archive member,
- * without having to constantly check for parentheses,
- * so we type the thing with the OP_ARCHV bit before
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sat Apr 27 20:23:22 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: archive.exp archive.mk
Log Message:
tests/make: test detection of static library files
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/archive.exp
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/archive.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/archive.exp
diff -u src/usr.bin/make/unit-tests/archive.exp:1.7 src/usr.bin/make/unit-tests/archive.exp:1.8
--- src/usr.bin/make/unit-tests/archive.exp:1.7 Fri Oct 9 06:44:42 2020
+++ src/usr.bin/make/unit-tests/archive.exp Sat Apr 27 20:23:22 2024
@@ -25,4 +25,12 @@ depend-on-existing-member
Making remove-archive
rm -f libprog.a
+begin library
+Examining libbad.a...up-to-date.
+Examining -lbad...up-to-date.
+Examining libgood.a...library...up-to-date.
+Examining -lgood...library...up-to-date.
+Examining library...nonexistentPHONY node...out-of-date.
+Examining .END...nonexistent...nonexistent and no sources...out-of-date.
+end library
exit status 0
Index: src/usr.bin/make/unit-tests/archive.mk
diff -u src/usr.bin/make/unit-tests/archive.mk:1.12 src/usr.bin/make/unit-tests/archive.mk:1.13
--- src/usr.bin/make/unit-tests/archive.mk:1.12 Fri Apr 9 14:42:00 2021
+++ src/usr.bin/make/unit-tests/archive.mk Sat Apr 27 20:23:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: archive.mk,v 1.12 2021/04/09 14:42:00 christos Exp $
+# $NetBSD: archive.mk,v 1.13 2024/04/27 20:23:22 rillig Exp $
#
# Very basic demonstration of handling archives, based on the description
# in PSD.doc/tutorial.ms.
@@ -24,6 +24,12 @@ all:
@${MAKE} -f ${MAKEFILE} depend-on-existing-member
@${MAKE} -f ${MAKEFILE} depend-on-nonexistent-member
@${MAKE} -f ${MAKEFILE} remove-archive
+ @${MAKE} -f ${MAKEFILE} set-up-library
+ @${MAKE} -f ${MAKEFILE} -dm library 2>&1 \
+ | sed -n '/^Examining/p' \
+ | sed 's,\.\.\.modified[^.]*,,'
+ @${MAKE} -f ${MAKEFILE} tear-down-library
+
create-archive: ${ARCHIVE} pre post
@@ -58,3 +64,28 @@ pre: .USEBEFORE
@echo Making ${.TARGET} ${.OODATE:C,.+,out-of-date,W} ${.OODATE:O}
post: .USE
@echo
+
+
+set-up-library: .PHONY
+ @echo "member" > member.txt
+ @echo "not a library" > libbad.a
+ @ar cr libgood.a member.txt
+ @echo "begin library"
+
+.if make(library)
+.SUFFIXES: .a
+.LIBS: .a
+.endif
+# The two lines for libgood contain the word "library", the two lines for
+# libbad don't.
+#
+# expect: Examining libbad.a...up-to-date.
+# expect: Examining -lbad...up-to-date.
+# expect: Examining libgood.a...library...up-to-date.
+# expect: Examining -lgood...library...up-to-date.
+library: .PHONY libbad.a -lbad libgood.a -lgood
+ : Making ${.TARGET} from ${.ALLSRC}
+
+tear-down-library: .PHONY
+ @echo "end library"
+ @rm member.txt libbad.a libgood.a
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sat Apr 27 20:23:22 UTC 2024 Modified Files: src/usr.bin/make/unit-tests: archive.exp archive.mk Log Message: tests/make: test detection of static library files To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/archive.exp cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/archive.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Apr 27 17:33:47 UTC 2024
Modified Files:
src/usr.bin/make: arch.c lst.c lst.h main.c meta.c parse.c targ.c
Log Message:
make: simplify freeing of lists
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/arch.c
cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/lst.c
cvs rdiff -u -r1.104 -r1.105 src/usr.bin/make/lst.h
cvs rdiff -u -r1.612 -r1.613 src/usr.bin/make/main.c
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/make/meta.c
cvs rdiff -u -r1.721 -r1.722 src/usr.bin/make/parse.c
cvs rdiff -u -r1.180 -r1.181 src/usr.bin/make/targ.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/arch.c
diff -u src/usr.bin/make/arch.c:1.215 src/usr.bin/make/arch.c:1.216
--- src/usr.bin/make/arch.c:1.215 Wed Feb 7 06:43:02 2024
+++ src/usr.bin/make/arch.c Sat Apr 27 17:33:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.215 2024/02/07 06:43:02 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.216 2024/04/27 17:33:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.215 2024/02/07 06:43:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.216 2024/04/27 17:33:46 rillig Exp $");
typedef struct List ArchList;
typedef struct ListNode ArchListNode;
@@ -151,9 +151,8 @@ static int ArchSVR4Entry(Arch *, char *,
#ifdef CLEANUP
static void
-ArchFree(void *ap)
+ArchFree(Arch *a)
{
- Arch *a = ap;
HashIter hi;
/* Free memory from hash entries */
@@ -1070,7 +1069,11 @@ void
Arch_End(void)
{
#ifdef CLEANUP
- Lst_DoneCall(, ArchFree);
+ ArchListNode *ln;
+
+ for (ln = archives.first; ln != NULL; ln = ln->next)
+ ArchFree(ln->datum);
+ Lst_Done();
#endif
}
Index: src/usr.bin/make/lst.c
diff -u src/usr.bin/make/lst.c:1.107 src/usr.bin/make/lst.c:1.108
--- src/usr.bin/make/lst.c:1.107 Fri Dec 29 20:43:58 2023
+++ src/usr.bin/make/lst.c Sat Apr 27 17:33:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.107 2023/12/29 20:43:58 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.108 2024/04/27 17:33:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -34,7 +34,7 @@
#include "make.h"
-MAKE_RCSID("$NetBSD: lst.c,v 1.107 2023/12/29 20:43:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: lst.c,v 1.108 2024/04/27 17:33:46 rillig Exp $");
static ListNode *
LstNodeNew(ListNode *prev, ListNode *next, void *datum)
@@ -60,13 +60,13 @@ Lst_Done(List *list)
}
void
-Lst_DoneCall(List *list, LstFreeProc freeProc)
+Lst_DoneFree(List *list)
{
ListNode *ln, *next;
for (ln = list->first; ln != NULL; ln = next) {
next = ln->next;
- freeProc(ln->datum);
+ free(ln->datum);
free(ln);
}
}
Index: src/usr.bin/make/lst.h
diff -u src/usr.bin/make/lst.h:1.104 src/usr.bin/make/lst.h:1.105
--- src/usr.bin/make/lst.h:1.104 Fri Dec 29 20:43:58 2023
+++ src/usr.bin/make/lst.h Sat Apr 27 17:33:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.h,v 1.104 2023/12/29 20:43:58 rillig Exp $ */
+/* $NetBSD: lst.h,v 1.105 2024/04/27 17:33:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -98,13 +98,10 @@ struct List {
ListNode *last;
};
-/* Free the datum of a node, called before freeing the node itself. */
-typedef void LstFreeProc(void *);
-
-/* Free the list nodes, but not the list itself. */
+/* Free the list nodes. */
void Lst_Done(List *);
-/* Free the list nodes, freeing the node data using the given function. */
-void Lst_DoneCall(List *, LstFreeProc);
+/* Free the list nodes, as well as each node's datum. */
+void Lst_DoneFree(List *);
#define LST_INIT { NULL, NULL }
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.612 src/usr.bin/make/main.c:1.613
--- src/usr.bin/make/main.c:1.612 Sun Mar 10 02:53:37 2024
+++ src/usr.bin/make/main.c Sat Apr 27 17:33:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.612 2024/03/10 02:53:37 sjg Exp $ */
+/* $NetBSD: main.c,v 1.613 2024/04/27 17:33:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.612 2024/03/10 02:53:37 sjg Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.613 2024/04/27 17:33:46 rillig Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1199,7 +1199,7 @@ ReadBuiltinRules(void)
Fatal("%s: cannot open %s.",
progname, (const char *)sysMkFiles.first->datum);
- Lst_DoneCall(, free);
+ Lst_DoneFree();
}
static void
@@ -1564,9 +1564,9 @@ static void
main_CleanUp(void)
{
#ifdef CLEANUP
- Lst_DoneCall(, free);
- Lst_DoneCall(, free);
- Lst_DoneCall(, free);
+ Lst_DoneFree();
+ Lst_DoneFree();
+ Lst_DoneFree();
#endif
if (DEBUG(GRAPH2))
Index:
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat Apr 27 17:33:47 UTC 2024 Modified Files: src/usr.bin/make: arch.c lst.c lst.h main.c meta.c parse.c targ.c Log Message: make: simplify freeing of lists To generate a diff of this commit: cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/arch.c cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/lst.c cvs rdiff -u -r1.104 -r1.105 src/usr.bin/make/lst.h cvs rdiff -u -r1.612 -r1.613 src/usr.bin/make/main.c cvs rdiff -u -r1.207 -r1.208 src/usr.bin/make/meta.c cvs rdiff -u -r1.721 -r1.722 src/usr.bin/make/parse.c cvs rdiff -u -r1.180 -r1.181 src/usr.bin/make/targ.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sat Apr 27 14:54:58 UTC 2024 Modified Files: src/share/man/man4: thinkpad.4 Log Message: mention that we handle battery controls too. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/thinkpad.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sat Apr 27 14:54:58 UTC 2024 Modified Files: src/share/man/man4: thinkpad.4 Log Message: mention that we handle battery controls too. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/thinkpad.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/thinkpad.4 diff -u src/share/man/man4/thinkpad.4:1.4 src/share/man/man4/thinkpad.4:1.5 --- src/share/man/man4/thinkpad.4:1.4 Tue Mar 18 14:20:39 2014 +++ src/share/man/man4/thinkpad.4 Sat Apr 27 10:54:58 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: thinkpad.4,v 1.4 2014/03/18 18:20:39 riastradh Exp $ +.\" $NetBSD: thinkpad.4,v 1.5 2024/04/27 14:54:58 christos Exp $ .\" .\" Copyright (c) 2008 Jared D. McNeill .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 9, 2010 +.Dd April 27, 2024 .Dt THINKPAD 4 .Os .Sh NAME @@ -36,8 +36,8 @@ The .Nm driver provides support for vendor specific features found in IBM and -Lenovo brand laptops, such as function key handling, hotkey handling, and -temperature and fan monitoring. +Lenovo brand laptops, such as function key handling, hotkey handling, +battery controls, and temperature and fan monitoring. .Sh SEE ALSO .Xr acpi 4 , .Xr aps 4 ,
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: christos
Date: Sat Apr 27 14:50:18 UTC 2024
Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c
Log Message:
Expose a sysctl interface hw.acpi.thinkpad.bat[]. to control
some aspects of battery charging behavior on supported systems:
charge_start
threshold below which to start charging (in %, 0-99)
charge_stop
threshold above which to stop charging (in %, 1-100)
force_discharge
discharge while on AC power, e.g., for calibration
charge_inhibit
inhibit charging while on AC power
>From Malte Dehling
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/acpi/thinkpad_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.56 src/sys/dev/acpi/thinkpad_acpi.c:1.57
--- src/sys/dev/acpi/thinkpad_acpi.c:1.56 Sat Apr 27 10:45:11 2024
+++ src/sys/dev/acpi/thinkpad_acpi.c Sat Apr 27 10:50:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.56 2024/04/27 14:45:11 christos Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.57 2024/04/27 14:50:18 christos Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,13 +27,14 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.56 2024/04/27 14:45:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.57 2024/04/27 14:50:18 christos Exp $");
#include
#include
#include
#include
#include
+#include
#include
#include
@@ -49,10 +50,27 @@ ACPI_MODULE_NAME ("thinkpad_acpi")
#define THINKPAD_NFANSENSORS 1
#define THINKPAD_NSENSORS (THINKPAD_NTEMPSENSORS + THINKPAD_NFANSENSORS)
+typedef struct tp_sysctl_param {
+ device_t sp_dev;
+ int sp_bat;
+} tp_sysctl_param_t;
+
+typedef union tp_batctl {
+ int have_any;
+ struct {
+ int charge_start:1;
+ int charge_stop:1;
+ int charge_inhibit:1;
+ int force_discharge:1;
+ int individual_control:1;
+ } have;
+} tp_batctl_t;
+
typedef struct thinkpad_softc {
device_t sc_dev;
device_t sc_ecdev;
struct acpi_devnode *sc_node;
+ struct sysctllog *sc_log;
ACPI_HANDLE sc_powhdl;
ACPI_HANDLE sc_cmoshdl;
ACPI_INTEGER sc_ver;
@@ -90,6 +108,14 @@ typedef struct thinkpad_softc {
envsys_data_t sc_sensor[THINKPAD_NSENSORS];
int sc_display_state;
+
+#define THINKPAD_BAT_ANY 0
+#define THINKPAD_BAT_PRIMARY 1
+#define THINKPAD_BAT_SECONDARY 2
+#define THINKPAD_BAT_LAST 3
+
+ tp_batctl_t sc_batctl;
+ tp_sysctl_param_t sc_scparam[THINKPAD_BAT_LAST];
} thinkpad_softc_t;
/* Hotkey events */
@@ -130,6 +156,17 @@ typedef struct thinkpad_softc {
#define THINKPAD_DISPLAY_ALL \
(THINKPAD_DISPLAY_LCD | THINKPAD_DISPLAY_CRT | THINKPAD_DISPLAY_DVI)
+#define THINKPAD_GET_CHARGE_START "BCTG"
+#define THINKPAD_SET_CHARGE_START "BCCS"
+#define THINKPAD_GET_CHARGE_STOP "BCSG"
+#define THINKPAD_SET_CHARGE_STOP "BCSS"
+#define THINKPAD_GET_FORCE_DISCHARGE "BDSG"
+#define THINKPAD_SET_FORCE_DISCHARGE "BDSS"
+#define THINKPAD_GET_CHARGE_INHIBIT "BICG"
+#define THINKPAD_SET_CHARGE_INHIBIT "BICS"
+
+#define THINKPAD_CALL_ERROR 0x8000
+
#define THINKPAD_BLUETOOTH_HWPRESENT 0x01
#define THINKPAD_BLUETOOTH_RADIOSSW 0x02
#define THINKPAD_BLUETOOTH_RESUMECTRL 0x04
@@ -168,6 +205,9 @@ static void thinkpad_brightness_down(dev
static uint8_t thinkpad_brightness_read(thinkpad_softc_t *);
static void thinkpad_cmos(thinkpad_softc_t *, uint8_t);
+static void thinkpad_battery_probe_support(device_t);
+static void thinkpad_battery_sysctl_setup(device_t);
+
CFATTACH_DECL3_NEW(thinkpad, sizeof(thinkpad_softc_t),
thinkpad_match, thinkpad_attach, thinkpad_detach, NULL, NULL, NULL,
0);
@@ -220,6 +260,7 @@ thinkpad_attach(device_t parent, device_
int i;
sc->sc_dev = self;
+ sc->sc_log = NULL;
sc->sc_powhdl = NULL;
sc->sc_cmoshdl = NULL;
sc->sc_node = aa->aa_node;
@@ -371,6 +412,17 @@ thinkpad_attach(device_t parent, device_
/* Register temperature and fan sensors with envsys */
thinkpad_sensors_init(sc);
+ /* Probe supported battery charge/control operations */
+ thinkpad_battery_probe_support(self);
+
+ if (sc->sc_batctl.have_any) {
+ for (i = 0; i < THINKPAD_BAT_LAST; i++) {
+ sc->sc_scparam[i].sp_dev = self;
+ sc->sc_scparam[i].sp_bat = i;
+ }
+ thinkpad_battery_sysctl_setup(self);
+ }
+
fail:
if (!pmf_device_register(self, NULL, thinkpad_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
@@ -396,6 +448,9 @@ thinkpad_detach(device_t self, int flags
if (sc->sc_sme != NULL)
sysmon_envsys_unregister(sc->sc_sme);
+ if (sc->sc_log != NULL)
+ sysctl_teardown(>sc_log);
+
pmf_device_deregister(self);
pmf_event_deregister(self, PMFE_DISPLAY_BRIGHTNESS_UP,
@@ -948,6 +1003,290 @@ thinkpad_cmos(thinkpad_softc_t *sc, uint
AcpiFormatException(rv));
}
+static uint32_t
+thinkpad_call_method(device_t
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Apr 27 14:50:18 UTC 2024 Modified Files: src/sys/dev/acpi: thinkpad_acpi.c Log Message: Expose a sysctl interface hw.acpi.thinkpad.bat[]. to control some aspects of battery charging behavior on supported systems: charge_start threshold below which to start charging (in %, 0-99) charge_stop threshold above which to stop charging (in %, 1-100) force_discharge discharge while on AC power, e.g., for calibration charge_inhibit inhibit charging while on AC power >From Malte Dehling To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/dev/acpi/thinkpad_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Apr 27 14:45:11 UTC 2024 Modified Files: src/sys/dev/acpi: thinkpad_acpi.c Log Message: thinkpad cosmetic patches (Malte Dehling) To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/acpi/thinkpad_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: christos
Date: Sat Apr 27 14:45:11 UTC 2024
Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c
Log Message:
thinkpad cosmetic patches (Malte Dehling)
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/acpi/thinkpad_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.55 src/sys/dev/acpi/thinkpad_acpi.c:1.56
--- src/sys/dev/acpi/thinkpad_acpi.c:1.55 Fri Aug 12 12:21:41 2022
+++ src/sys/dev/acpi/thinkpad_acpi.c Sat Apr 27 10:45:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.55 2022/08/12 16:21:41 riastradh Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.56 2024/04/27 14:45:11 christos Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.55 2022/08/12 16:21:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.56 2024/04/27 14:45:11 christos Exp $");
#include
#include
@@ -138,8 +138,8 @@ typedef struct thinkpad_softc {
#define THINKPAD_WWAN_RADIOSSW 0x02
#define THINKPAD_WWAN_RESUMECTRL 0x04
-#define THINKPAD_UWB_HWPRESENT 0x01
-#define THINKPAD_UWB_RADIOSSW 0x02
+#define THINKPAD_UWB_HWPRESENT 0x01
+#define THINKPAD_UWB_RADIOSSW 0x02
#define THINKPAD_RFK_BLUETOOTH 0
#define THINKPAD_RFK_WWAN 1
@@ -165,7 +165,7 @@ static void thinkpad_bluetooth_toggle(th
static bool thinkpad_resume(device_t, const pmf_qual_t *);
static void thinkpad_brightness_up(device_t);
static void thinkpad_brightness_down(device_t);
-static uint8_t thinkpad_brightness_read(thinkpad_softc_t *sc);
+static uint8_t thinkpad_brightness_read(thinkpad_softc_t *);
static void thinkpad_cmos(thinkpad_softc_t *, uint8_t);
CFATTACH_DECL3_NEW(thinkpad, sizeof(thinkpad_softc_t),
@@ -230,7 +230,7 @@ thinkpad_attach(device_t parent, device_
sc->sc_ecdev = NULL;
for (curdev = deviter_first(, DEVITER_F_ROOT_FIRST);
- curdev != NULL; curdev = deviter_next())
+ curdev != NULL; curdev = deviter_next())
if (device_is_a(curdev, "acpiecdt") ||
device_is_a(curdev, "acpiec")) {
sc->sc_ecdev = curdev;
@@ -330,29 +330,30 @@ thinkpad_attach(device_t parent, device_
#endif
for (i = TP_PSW_DISPLAY_CYCLE; i < TP_PSW_LAST; i++)
sc->sc_smpsw[i].smpsw_type = PSWITCH_TYPE_HOTKEY;
- psw[TP_PSW_DISPLAY_CYCLE].smpsw_name = PSWITCH_HK_DISPLAY_CYCLE;
- psw[TP_PSW_LOCK_SCREEN].smpsw_name = PSWITCH_HK_LOCK_SCREEN;
- psw[TP_PSW_BATTERY_INFO].smpsw_name = PSWITCH_HK_BATTERY_INFO;
- psw[TP_PSW_EJECT_BUTTON].smpsw_name = PSWITCH_HK_EJECT_BUTTON;
- psw[TP_PSW_ZOOM_BUTTON].smpsw_name = PSWITCH_HK_ZOOM_BUTTON;
- psw[TP_PSW_VENDOR_BUTTON].smpsw_name = PSWITCH_HK_VENDOR_BUTTON;
+
+ psw[TP_PSW_DISPLAY_CYCLE].smpsw_name = PSWITCH_HK_DISPLAY_CYCLE;
+ psw[TP_PSW_LOCK_SCREEN].smpsw_name = PSWITCH_HK_LOCK_SCREEN;
+ psw[TP_PSW_BATTERY_INFO].smpsw_name = PSWITCH_HK_BATTERY_INFO;
+ psw[TP_PSW_EJECT_BUTTON].smpsw_name = PSWITCH_HK_EJECT_BUTTON;
+ psw[TP_PSW_ZOOM_BUTTON].smpsw_name = PSWITCH_HK_ZOOM_BUTTON;
+ psw[TP_PSW_VENDOR_BUTTON].smpsw_name = PSWITCH_HK_VENDOR_BUTTON;
#ifndef THINKPAD_NORMAL_HOTKEYS
- psw[TP_PSW_FNF1_BUTTON].smpsw_name = PSWITCH_HK_FNF1_BUTTON;
- psw[TP_PSW_WIRELESS_BUTTON].smpsw_name = PSWITCH_HK_WIRELESS_BUTTON;
- psw[TP_PSW_WWAN_BUTTON].smpsw_name = PSWITCH_HK_WWAN_BUTTON;
- psw[TP_PSW_POINTER_BUTTON].smpsw_name = PSWITCH_HK_POINTER_BUTTON;
- psw[TP_PSW_FNF10_BUTTON].smpsw_name= PSWITCH_HK_FNF10_BUTTON;
- psw[TP_PSW_FNF11_BUTTON].smpsw_name= PSWITCH_HK_FNF11_BUTTON;
- psw[TP_PSW_BRIGHTNESS_UP].smpsw_name = PSWITCH_HK_BRIGHTNESS_UP;
- psw[TP_PSW_BRIGHTNESS_DOWN].smpsw_name = PSWITCH_HK_BRIGHTNESS_DOWN;
- psw[TP_PSW_THINKLIGHT].smpsw_name = PSWITCH_HK_THINKLIGHT;
- psw[TP_PSW_VOLUME_UP].smpsw_name = PSWITCH_HK_VOLUME_UP;
- psw[TP_PSW_VOLUME_DOWN].smpsw_name = PSWITCH_HK_VOLUME_DOWN;
- psw[TP_PSW_VOLUME_MUTE].smpsw_name = PSWITCH_HK_VOLUME_MUTE;
- psw[TP_PSW_STAR_BUTTON].smpsw_name = PSWITCH_HK_STAR_BUTTON;
- psw[TP_PSW_SCISSORS_BUTTON].smpsw_name = PSWITCH_HK_SCISSORS_BUTTON;
- psw[TP_PSW_BLUETOOTH_BUTTON].smpsw_name = PSWITCH_HK_BLUETOOTH_BUTTON;
- psw[TP_PSW_KEYBOARD_BUTTON].smpsw_name = PSWITCH_HK_KEYBOARD_BUTTON;
+ psw[TP_PSW_FNF1_BUTTON].smpsw_name = PSWITCH_HK_FNF1_BUTTON;
+ psw[TP_PSW_WIRELESS_BUTTON].smpsw_name = PSWITCH_HK_WIRELESS_BUTTON;
+ psw[TP_PSW_WWAN_BUTTON].smpsw_name = PSWITCH_HK_WWAN_BUTTON;
+ psw[TP_PSW_POINTER_BUTTON].smpsw_name = PSWITCH_HK_POINTER_BUTTON;
+ psw[TP_PSW_FNF10_BUTTON].smpsw_name = PSWITCH_HK_FNF10_BUTTON;
+ psw[TP_PSW_FNF11_BUTTON].smpsw_name = PSWITCH_HK_FNF11_BUTTON;
+ psw[TP_PSW_BRIGHTNESS_UP].smpsw_name = PSWITCH_HK_BRIGHTNESS_UP;
+ psw[TP_PSW_BRIGHTNESS_DOWN].smpsw_name = PSWITCH_HK_BRIGHTNESS_DOWN;
+ psw[TP_PSW_THINKLIGHT].smpsw_name = PSWITCH_HK_THINKLIGHT;
+
CVS commit: src/etc/etc.vax
Module Name:src
Committed By: tsutsui
Date: Sat Apr 27 14:42:21 UTC 2024
Modified Files:
src/etc/etc.vax: MAKEDEV.conf
Log Message:
Disable dmf* and dmz* entries and add warns "not integrated yet."
Also note tty[EFGH]? have been used by MI wscons and new tty node names
should be assigned once dmf(4) is committed.
Ok'ed by ragge@ on port-vax@.
https://mail-index.netbsd.org/port-vax/2024/02/13/msg004859.html
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/etc/etc.vax/MAKEDEV.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.vax/MAKEDEV.conf
diff -u src/etc/etc.vax/MAKEDEV.conf:1.20 src/etc/etc.vax/MAKEDEV.conf:1.21
--- src/etc/etc.vax/MAKEDEV.conf:1.20 Thu Feb 1 22:22:05 2024
+++ src/etc/etc.vax/MAKEDEV.conf Sat Apr 27 14:42:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.20 2024/02/01 22:22:05 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.21 2024/04/27 14:42:21 tsutsui Exp $
all_md)
makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
@@ -129,29 +129,34 @@ dhu[0-9]*|dh[0-9]*|dmf[0-9]*|dmz[0-9]*|v
esac
;;
dmz*) name=dmz; major=37; count=24
- unit=${i#dmz}
- case $unit in
- 0) ch=a ;;
- 1) ch=b ;;
- 2) ch=c ;;
- 3) ch=e ;;
- 4) ch=f ;;
- *) warn "bad unit for $name in: $i" ;;
- esac
+ warn "$i is not integrated yet"
+# unit=${i#dmz}
+# case $unit in
+# 0) ch=a ;;
+# 1) ch=b ;;
+# 2) ch=c ;;
+# 3) ch=e ;;
+# 4) ch=f ;;
+# *) warn "bad unit for $name in: $i" ;;
+# esac
;;
dmf*) name=dmf; major=22; count=8
- unit=${i#dmf}
- case $unit in
- 0) ch=A ;;
- 1) ch=B ;;
- 2) ch=C ;;
- 3) ch=E ;;
- 4) ch=F ;;
- 5) ch=G ;;
- 6) ch=H ;;
- 7) ch=I ;;
- *) warn "bad unit for $name in: $i" ;;
- esac
+ warn "$i is not integrated yet"
+## XXX:
+## tty[EFGH]? have already been used by MI wscons so
+## new tty node names should be assigned once dmf(4) is committed
+# unit=${i#dmf}
+# case $unit in
+# 0) ch=A ;;
+# 1) ch=B ;;
+# 2) ch=C ;;
+# 3) ch=E ;;
+# 4) ch=F ;;
+# 5) ch=G ;;
+# 6) ch=H ;;
+# 7) ch=I ;;
+# *) warn "bad unit for $name in: $i" ;;
+# esac
;;
dhu*) name=dhu; major=34; count=16
unit=${i#dhu}
CVS commit: src/etc/etc.vax
Module Name:src Committed By: tsutsui Date: Sat Apr 27 14:42:21 UTC 2024 Modified Files: src/etc/etc.vax: MAKEDEV.conf Log Message: Disable dmf* and dmz* entries and add warns "not integrated yet." Also note tty[EFGH]? have been used by MI wscons and new tty node names should be assigned once dmf(4) is committed. Ok'ed by ragge@ on port-vax@. https://mail-index.netbsd.org/port-vax/2024/02/13/msg004859.html To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/etc/etc.vax/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Apr 27 12:46:37 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: queries.c
src/usr.bin/xlint/lint1: tree.c
Log Message:
lint: converting a null pointer to another pointer type is not narrowing
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tests/usr.bin/xlint/lint1/queries.c
cvs rdiff -u -r1.636 -r1.637 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/queries.c
diff -u src/tests/usr.bin/xlint/lint1/queries.c:1.28 src/tests/usr.bin/xlint/lint1/queries.c:1.29
--- src/tests/usr.bin/xlint/lint1/queries.c:1.28 Sat Apr 27 10:08:54 2024
+++ src/tests/usr.bin/xlint/lint1/queries.c Sat Apr 27 12:46:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: queries.c,v 1.28 2024/04/27 10:08:54 rillig Exp $ */
+/* $NetBSD: queries.c,v 1.29 2024/04/27 12:46:37 rillig Exp $ */
# 3 "queries.c"
/*
@@ -532,4 +532,6 @@ Q20_void_pointer_conversion(void)
int_ptr = char_ptr;
/* expect+1: warning: illegal combination of 'pointer to char' and 'pointer to int', op '=' [124] */
char_ptr = int_ptr;
+
+ int_ptr = (void *)0;
}
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.636 src/usr.bin/xlint/lint1/tree.c:1.637
--- src/usr.bin/xlint/lint1/tree.c:1.636 Sat Apr 27 10:08:54 2024
+++ src/usr.bin/xlint/lint1/tree.c Sat Apr 27 12:46:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.636 2024/04/27 10:08:54 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.637 2024/04/27 12:46:37 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.636 2024/04/27 10:08:54 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.637 2024/04/27 12:46:37 rillig Exp $");
#endif
#include
@@ -1434,7 +1434,8 @@ build_assignment(op_t op, bool sys, tnod
if (is_query_enabled[20]
&& lt == PTR && ln->tn_type->t_subt->t_tspec != VOID
- && rt == PTR && rn->tn_type->t_subt->t_tspec == VOID)
+ && rt == PTR && rn->tn_type->t_subt->t_tspec == VOID
+ && !is_null_pointer(rn))
/* implicit narrowing conversion from void ... */
query_message(20, type_name(ln->tn_type));
CVS commit: src
Module Name:src Committed By: rillig Date: Sat Apr 27 12:46:37 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: queries.c src/usr.bin/xlint/lint1: tree.c Log Message: lint: converting a null pointer to another pointer type is not narrowing To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/tests/usr.bin/xlint/lint1/queries.c cvs rdiff -u -r1.636 -r1.637 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Apr 27 10:08:55 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: queries.c t_usage.sh
src/usr.bin/xlint/lint1: err.c tree.c
Log Message:
lint: add query for conversion from void pointer to other pointer
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/tests/usr.bin/xlint/lint1/queries.c
cvs rdiff -u -r1.19 -r1.20 src/tests/usr.bin/xlint/lint1/t_usage.sh
cvs rdiff -u -r1.240 -r1.241 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.635 -r1.636 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/queries.c
diff -u src/tests/usr.bin/xlint/lint1/queries.c:1.27 src/tests/usr.bin/xlint/lint1/queries.c:1.28
--- src/tests/usr.bin/xlint/lint1/queries.c:1.27 Sat Mar 30 19:12:37 2024
+++ src/tests/usr.bin/xlint/lint1/queries.c Sat Apr 27 10:08:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: queries.c,v 1.27 2024/03/30 19:12:37 rillig Exp $ */
+/* $NetBSD: queries.c,v 1.28 2024/04/27 10:08:54 rillig Exp $ */
# 3 "queries.c"
/*
@@ -16,7 +16,7 @@
*/
/* lint1-extra-flags: -q 1,2,3,4,5,6,7,8,9,10 */
-/* lint1-extra-flags: -q 11,12,13,14,15,16,17,18,19 */
+/* lint1-extra-flags: -q 11,12,13,14,15,16,17,18,19,20 */
/* lint1-extra-flags: -X 351 */
typedef unsigned char u8_t;
@@ -73,6 +73,8 @@ volatile char *vstr;
void *void_ptr;
const void *const_void_ptr;
+char *char_ptr;
+int *int_ptr;
int
Q1(double dbl)
@@ -359,9 +361,9 @@ Q9(int x)
return (0.0);
case 9:
return
-# 363 "queries.c" 3 4
+# 365 "queries.c" 3 4
((void *)0)
-# 365 "queries.c"
+# 367 "queries.c"
/* expect+1: warning: illegal combination of integer 'int' and pointer 'pointer to void' [183] */
;
case 10:
@@ -509,10 +511,25 @@ convert_from_integer_to_floating(void)
f64 = (double)u32;
}
-/*
- * Since queries do not affect the exit status, force a warning to make this
- * test conform to the general expectation that a test that produces output
- * exits non-successfully.
- */
-/* expect+1: warning: static variable 'unused' unused [226] */
-static int unused;
+// C allows implicit narrowing conversions from a void pointer to an arbitrary
+// object pointer. C++ doesn't allow this conversion since it is narrowing.
+void
+Q20_void_pointer_conversion(void)
+{
+ /* expect+1: warning: operands of '=' have incompatible pointer types to 'void' and 'const void' [128] */
+ void_ptr = const_void_ptr;
+ const_void_ptr = void_ptr;
+ /* expect+1: implicit narrowing conversion from void pointer to 'pointer to int' [Q20] */
+ int_ptr = void_ptr;
+ /* expect+1: redundant cast from 'pointer to void' to 'pointer to int' before assignment [Q7] */
+ int_ptr = (int *)void_ptr;
+ /* expect+1: implicit narrowing conversion from void pointer to 'pointer to char' [Q20] */
+ char_ptr = void_ptr;
+ void_ptr = char_ptr;
+ /* expect+1: implicit narrowing conversion from void pointer to 'pointer to int' [Q20] */
+ int_ptr = void_ptr;
+ /* expect+1: warning: illegal combination of 'pointer to int' and 'pointer to char', op '=' [124] */
+ int_ptr = char_ptr;
+ /* expect+1: warning: illegal combination of 'pointer to char' and 'pointer to int', op '=' [124] */
+ char_ptr = int_ptr;
+}
Index: src/tests/usr.bin/xlint/lint1/t_usage.sh
diff -u src/tests/usr.bin/xlint/lint1/t_usage.sh:1.19 src/tests/usr.bin/xlint/lint1/t_usage.sh:1.20
--- src/tests/usr.bin/xlint/lint1/t_usage.sh:1.19 Sat Mar 30 17:23:13 2024
+++ src/tests/usr.bin/xlint/lint1/t_usage.sh Sat Apr 27 10:08:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_usage.sh,v 1.19 2024/03/30 17:23:13 rillig Exp $
+# $NetBSD: t_usage.sh,v 1.20 2024/04/27 10:08:54 rillig Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -89,13 +89,13 @@ enable_queries_body()
# The largest known query.
atf_check \
- "$lint1" -q 19 code.c /dev/null
+ "$lint1" -q 20 code.c /dev/null
# Larger than the largest known query.
atf_check \
-s 'exit:1' \
- -e "inline:lint1: invalid query ID '20'\n" \
- "$lint1" -q 20 code.c /dev/null
+ -e "inline:lint1: invalid query ID '21'\n" \
+ "$lint1" -q 21 code.c /dev/null
# Whitespace is not allowed before a query ID.
atf_check \
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.240 src/usr.bin/xlint/lint1/err.c:1.241
--- src/usr.bin/xlint/lint1/err.c:1.240 Fri Apr 12 05:17:48 2024
+++ src/usr.bin/xlint/lint1/err.c Sat Apr 27 10:08:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.240 2024/04/12 05:17:48 rillig Exp $ */
+/* $NetBSD: err.c,v 1.241 2024/04/27 10:08:54 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.240 2024/04/12 05:17:48 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.241 2024/04/27 10:08:54 rillig Exp $");
#endif
#include
@@ -741,6 +741,7 @@ static
CVS commit: src
Module Name:src Committed By: rillig Date: Sat Apr 27 10:08:55 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: queries.c t_usage.sh src/usr.bin/xlint/lint1: err.c tree.c Log Message: lint: add query for conversion from void pointer to other pointer To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/tests/usr.bin/xlint/lint1/queries.c cvs rdiff -u -r1.19 -r1.20 src/tests/usr.bin/xlint/lint1/t_usage.sh cvs rdiff -u -r1.240 -r1.241 src/usr.bin/xlint/lint1/err.c cvs rdiff -u -r1.635 -r1.636 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: rillig Date: Sat Apr 27 06:01:08 UTC 2024 Modified Files: src/sys/arch/mips/include: float.h Log Message: mips: fix syntax error in LDBL_MAX (since 2011) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/include/float.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/mips/include/float.h diff -u src/sys/arch/mips/include/float.h:1.18 src/sys/arch/mips/include/float.h:1.19 --- src/sys/arch/mips/include/float.h:1.18 Sun Jul 26 08:08:41 2020 +++ src/sys/arch/mips/include/float.h Sat Apr 27 06:01:08 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: float.h,v 1.18 2020/07/26 08:08:41 simonb Exp $ */ +/* $NetBSD: float.h,v 1.19 2024/04/27 06:01:08 rillig Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ #if __STDC_VERSION__ >= 199901L #define LDBL_EPSILON 0x1p-112L #define LDBL_MIN 0x1p-16382L -#define LDBL_MAX 0x1.p+16383L, +#define LDBL_MAX 0x1.p+16383L #else #define LDBL_EPSILON 1.9259299443872358530559779425849273E-34L #define LDBL_MIN 3.3621031431120935062626778173217526E-4932L
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: rillig Date: Sat Apr 27 06:01:08 UTC 2024 Modified Files: src/sys/arch/mips/include: float.h Log Message: mips: fix syntax error in LDBL_MAX (since 2011) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/include/float.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Apr 27 00:40:07 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: Remove 0 initializations (since the softc is zalloc'ed) and the initial refresh which will have no data. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/dev/acpi/acpi_bat.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/acpi/acpi_bat.c diff -u src/sys/dev/acpi/acpi_bat.c:1.122 src/sys/dev/acpi/acpi_bat.c:1.123 --- src/sys/dev/acpi/acpi_bat.c:1.122 Fri Apr 26 14:19:18 2024 +++ src/sys/dev/acpi/acpi_bat.c Fri Apr 26 20:40:06 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $ */ +/* $NetBSD: acpi_bat.c,v 1.123 2024/04/27 00:40:06 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.123 2024/04/27 00:40:06 christos Exp $"); #include #include @@ -229,14 +229,6 @@ acpibat_attach(device_t parent, device_t sc->sc_node = aa->aa_node; - sc->sc_present = 0; - sc->sc_dvoltage = 0; - sc->sc_dcapacity = 0; - sc->sc_lcapacity = 0; - sc->sc_wcapacity = 0; - - sc->sc_sme = NULL; - mutex_init(>sc_mutex, MUTEX_DEFAULT, IPL_NONE); cv_init(>sc_condvar, device_xname(self)); @@ -759,7 +751,7 @@ acpibat_init_envsys(device_t dv) sc->sc_sme->sme_cookie = dv; sc->sc_sme->sme_refresh = acpibat_refresh; sc->sc_sme->sme_class = SME_CLASS_BATTERY; - sc->sc_sme->sme_flags = SME_POLL_ONLY | SME_INIT_REFRESH; + sc->sc_sme->sme_flags = SME_POLL_ONLY; sc->sc_sme->sme_get_limits = acpibat_get_limits; if (sysmon_envsys_register(sc->sc_sme))
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Apr 27 00:40:07 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: Remove 0 initializations (since the softc is zalloc'ed) and the initial refresh which will have no data. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/dev/acpi/acpi_bat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/crash
Module Name:src
Committed By: christos
Date: Fri Apr 26 22:07:32 UTC 2024
Modified Files:
src/usr.sbin/crash: Makefile
Log Message:
Add ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/crash/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.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.50 src/usr.sbin/crash/Makefile:1.51
--- src/usr.sbin/crash/Makefile:1.50 Tue Nov 21 21:01:07 2023
+++ src/usr.sbin/crash/Makefile Fri Apr 26 18:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2023/11/22 02:01:07 thorpej Exp $
+# $NetBSD: Makefile,v 1.51 2024/04/26 22:07:32 christos Exp $
PROG= crash
MAN= crash.8
@@ -119,7 +119,7 @@ NVFLAGS+=-R
# vers.c
SRCS+= vers.c
vers.c: ${S}/conf/newvers.sh ${_NETBSD_VERSION_DEPENDS}
- ${HOST_SH} ${S}/conf/newvers.sh ${NVFLAGS} -n -m ${MACHINE} -i CRASH
+ TOOL_DATE=${TOOL_DATE} ${HOST_SH} ${S}/conf/newvers.sh ${NVFLAGS} -n -m ${MACHINE} -i CRASH
CLEANFILES+= vers.c version
.else# } {
CVS commit: src/usr.sbin/crash
Module Name:src
Committed By: christos
Date: Fri Apr 26 22:07:32 UTC 2024
Modified Files:
src/usr.sbin/crash: Makefile
Log Message:
Add ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/crash/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Fri Apr 26 20:27:12 UTC 2024 Modified Files: src/libexec/httpd: dir-index-bozo.c Log Message: Create mobile-friendly directory listings A typical mobile browser on a smartphone assumes a page without a "viewport" tag is designed for desktop browsers. It displays the page in a virtual window that simulates a wider screen and does not adjust it for the phone's pixel density. The usual result is that the content on the page looks small, and interacting with the page comfortably and precisely requires zoom. This is currently the case with bozohttpd directory listing pages. from D. Bohdan in PR bin/57962 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/dir-index-bozo.c diff -u src/libexec/httpd/dir-index-bozo.c:1.36 src/libexec/httpd/dir-index-bozo.c:1.37 --- src/libexec/httpd/dir-index-bozo.c:1.36 Wed May 18 00:37:11 2022 +++ src/libexec/httpd/dir-index-bozo.c Fri Apr 26 20:27:12 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: dir-index-bozo.c,v 1.36 2022/05/18 00:37:11 mrg Exp $ */ +/* $NetBSD: dir-index-bozo.c,v 1.37 2024/04/26 20:27:12 maya Exp $ */ /* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */ @@ -123,6 +123,7 @@ bozo_dir_index(bozo_httpreq_t *request, bozo_printf(httpd, "\r\n" "\r\n" + "\r\n"
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Fri Apr 26 20:27:12 UTC 2024 Modified Files: src/libexec/httpd: dir-index-bozo.c Log Message: Create mobile-friendly directory listings A typical mobile browser on a smartphone assumes a page without a "viewport" tag is designed for desktop browsers. It displays the page in a virtual window that simulates a wider screen and does not adjust it for the phone's pixel density. The usual result is that the content on the page looks small, and interacting with the page comfortably and precisely requires zoom. This is currently the case with bozohttpd directory listing pages. from D. Bohdan in PR bin/57962 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/fstyp
Module Name:src
Committed By: christos
Date: Fri Apr 26 18:21:25 UTC 2024
Modified Files:
src/usr.sbin/fstyp: Makefile
Log Message:
PR/58202: Malte Dehling: Don't link libzfs
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/fstyp/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.sbin/fstyp/Makefile
diff -u src/usr.sbin/fstyp/Makefile:1.14 src/usr.sbin/fstyp/Makefile:1.15
--- src/usr.sbin/fstyp/Makefile:1.14 Sat Jun 3 17:26:29 2023
+++ src/usr.sbin/fstyp/Makefile Fri Apr 26 14:21:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/06/03 21:26:29 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2024/04/26 18:21:25 christos Exp $
.include
@@ -17,7 +17,8 @@ WARNS?= 6
COPTS.zfs.c+= -Wno-unknown-pragmas
COPTS.zfs.c+= -Wno-sign-conversion
COPTS.zfs.c+= -Wno-strict-prototypes
-LDADD+= -lnvpair -lzfs
+LDADD+= -lnvpair
+DPADD+= ${LIBNVPAIR}
OSNET=${NETBSDSRCDIR}/external/cddl/osnet
CPPFLAGS+= -DHAVE_ZFS
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: christos Date: Fri Apr 26 18:21:25 UTC 2024 Modified Files: src/usr.sbin/fstyp: Makefile Log Message: PR/58202: Malte Dehling: Don't link libzfs To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/fstyp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Fri Apr 26 18:19:18 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: PR/58201: Malte Dehling: re-order sysmon initialization before acpi registration, to avoid needing to call to acpi_deregister_notify on sysmon failure. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/dev/acpi/acpi_bat.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/acpi/acpi_bat.c diff -u src/sys/dev/acpi/acpi_bat.c:1.121 src/sys/dev/acpi/acpi_bat.c:1.122 --- src/sys/dev/acpi/acpi_bat.c:1.121 Thu Jan 6 20:10:57 2022 +++ src/sys/dev/acpi/acpi_bat.c Fri Apr 26 14:19:18 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_bat.c,v 1.121 2022/01/07 01:10:57 riastradh Exp $ */ +/* $NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.121 2022/01/07 01:10:57 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $"); #include #include @@ -762,17 +762,16 @@ acpibat_init_envsys(device_t dv) sc->sc_sme->sme_flags = SME_POLL_ONLY | SME_INIT_REFRESH; sc->sc_sme->sme_get_limits = acpibat_get_limits; + if (sysmon_envsys_register(sc->sc_sme)) + goto fail; + (void)acpi_register_notify(sc->sc_node, acpibat_notify_handler); acpibat_update_info(dv); acpibat_update_status(dv); - if (sysmon_envsys_register(sc->sc_sme)) - goto fail; - (void)pmf_device_register(dv, NULL, acpibat_resume); return; - fail: aprint_error_dev(dv, "failed to initialize sysmon\n");
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Fri Apr 26 18:19:18 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: PR/58201: Malte Dehling: re-order sysmon initialization before acpi registration, to avoid needing to call to acpi_deregister_notify on sysmon failure. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/dev/acpi/acpi_bat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Fri Apr 26 18:06:02 UTC 2024
Modified Files:
src/etc: Makefile
Log Message:
PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed
To generate a diff of this commit:
cvs rdiff -u -r1.469 -r1.470 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.469 src/etc/Makefile:1.470
--- src/etc/Makefile:1.469 Fri Nov 10 15:44:58 2023
+++ src/etc/Makefile Fri Apr 26 14:06:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.469 2023/11/10 20:44:58 christos Exp $
+# $NetBSD: Makefile,v 1.470 2024/04/26 18:06:02 christos Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -393,10 +393,10 @@ install-obsolete-lists: .PHONY .MAKE
mkdir -p ${OBSOLETE.dir}
.if ${MKX11} != "no"
(cd ${NETBSDSRCDIR}/distrib/sets && \
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
+ AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
.else
(cd ${NETBSDSRCDIR}/distrib/sets && \
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
+ AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
.endif
.for file in ${OBSOLETE.files}
${_MKMSG_INSTALL} ${DESTDIR}/var/db/obsolete/${file}
CVS commit: src/etc
Module Name:src Committed By: christos Date: Fri Apr 26 18:06:02 UTC 2024 Modified Files: src/etc: Makefile Log Message: PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed To generate a diff of this commit: cvs rdiff -u -r1.469 -r1.470 src/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Apr 26 17:38:44 UTC 2024 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: BUILDING: fix typo To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/BUILDING cvs rdiff -u -r1.149 -r1.150 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Apr 26 17:38:44 UTC 2024 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: BUILDING: fix typo To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/BUILDING cvs rdiff -u -r1.149 -r1.150 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.160 src/BUILDING:1.161 --- src/BUILDING:1.160 Sat Jul 22 18:50:04 2023 +++ src/BUILDING Fri Apr 26 17:38:44 2024 @@ -729,7 +729,7 @@ BUILDING MACHINE and MACHINE_ARCH settings. -N noiselevel - Set the "noisyness" level of the build, by setting MAKEVERBOSE + Set the "noisiness" level of the build, by setting MAKEVERBOSE to noiselevel. -nShow the commands that would be executed by build.sh, but do Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.149 src/doc/BUILDING.mdoc:1.150 --- src/doc/BUILDING.mdoc:1.149 Sat Jul 22 18:50:04 2023 +++ src/doc/BUILDING.mdoc Fri Apr 26 17:38:44 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.149 2023/07/22 18:50:04 lukem Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.150 2024/04/26 17:38:44 rillig Exp $ .\" .\" Copyright (c) 2001-2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1645,7 +1645,7 @@ settings. . .It Fl N Ar noiselevel Set the -.Dq noisyness +.Dq noisiness level of the build, by setting .Sy MAKEVERBOSE to
CVS commit: src/distrib
Module Name:src Committed By: nia Date: Fri Apr 26 17:36:32 UTC 2024 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/amd64/cdroms/installdvd: Makefile src/distrib/i386/cdroms: Makefile.cdrom src/distrib/i386/cdroms/installdvd: Makefile src/distrib/sparc64/cdroms/installdvd: Makefile Log Message: Remove modules set from the i386 install cd It is not particularly useful to be able to load modules while installing on i386, probably the most useful one is dtrace, and this takes up about 20mb on a port that is already exceeding CD limits. Most stuff you'd want to use while installing is already in GENERIC. The modules set is still available compressed for installing into a target system, meaning modules are available after installation. While here, add man set to the installation DVD, it's helpful to be able to read e.g. the man page for fdisk when rescuing a system. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile cvs rdiff -u -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: nia
Date: Fri Apr 26 17:36:32 UTC 2024
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/installdvd: Makefile
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/i386/cdroms/installdvd: Makefile
src/distrib/sparc64/cdroms/installdvd: Makefile
Log Message:
Remove modules set from the i386 install cd
It is not particularly useful to be able to load modules while
installing on i386, probably the most useful one is dtrace,
and this takes up about 20mb on a port that is already exceeding
CD limits. Most stuff you'd want to use while installing is already
in GENERIC.
The modules set is still available compressed for installing into
a target system, meaning modules are available after installation.
While here, add man set to the installation DVD, it's helpful to be able
to read e.g. the man page for fdisk when rescuing a system.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile
cvs rdiff -u -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.27 src/distrib/amd64/cdroms/Makefile.cdrom:1.28
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.27 Sat Sep 25 08:54:29 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.27 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.cdrom,v 1.28 2024/04/26 17:36:32 nia Exp $
.include
.include
@@ -17,7 +17,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc gpufw
+CD_SETS+= base etc gpufw
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
Index: src/distrib/amd64/cdroms/installdvd/Makefile
diff -u src/distrib/amd64/cdroms/installdvd/Makefile:1.1 src/distrib/amd64/cdroms/installdvd/Makefile:1.2
--- src/distrib/amd64/cdroms/installdvd/Makefile:1.1 Wed Apr 24 11:29:34 2024
+++ src/distrib/amd64/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -12,6 +12,10 @@ CDRELEASE= true # include $RELEASEDIR/
CDBUILDEXTRA= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+.if ${MKMAN} != "no"
+CD_SETS+= man
+.endif
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
< ${.CURDIR}/boot.cfg.in > boot.cfg
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.42 src/distrib/i386/cdroms/Makefile.cdrom:1.43
--- src/distrib/i386/cdroms/Makefile.cdrom:1.42 Sat Sep 25 08:54:29 2021
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.42 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.cdrom,v 1.43 2024/04/26 17:36:32 nia Exp $
.include
@@ -10,10 +10,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc gpufw
-.if ${MKKMOD} != "no"
-CD_SETS+= modules
-.endif
+CD_SETS+= base etc gpufw
image_md_pre:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
Index: src/distrib/i386/cdroms/installdvd/Makefile
diff -u src/distrib/i386/cdroms/installdvd/Makefile:1.1 src/distrib/i386/cdroms/installdvd/Makefile:1.2
--- src/distrib/i386/cdroms/installdvd/Makefile:1.1 Wed Apr 24 11:29:34 2024
+++ src/distrib/i386/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -12,6 +12,14 @@ CDRELEASE= true# inc
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+.if ${MKKMOD} != "no"
+CD_SETS+= modules
+.endif
+
+.if ${MKMAN} != "no"
+CD_SETS+= man
+.endif
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
Index: src/distrib/sparc64/cdroms/installdvd/Makefile
diff -u src/distrib/sparc64/cdroms/installdvd/Makefile:1.1 src/distrib/sparc64/cdroms/installdvd/Makefile:1.2
--- src/distrib/sparc64/cdroms/installdvd/Makefile:1.1 Wed Apr 24 15:39:58 2024
+++ src/distrib/sparc64/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/04/24 15:39:58 nia Exp $
+# $NetBSD: Makefile,v
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: rillig Date: Fri Apr 26 17:22:26 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: dri: disable lint To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/dri/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.40 src/external/mit/xorg/lib/dri/Makefile:1.41 --- src/external/mit/xorg/lib/dri/Makefile:1.40 Sun Apr 21 00:23:23 2024 +++ src/external/mit/xorg/lib/dri/Makefile Fri Apr 26 17:22:26 2024 @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.40 2024/04/21 00:23:23 maya Exp $ +# $NetBSD: Makefile,v 1.41 2024/04/26 17:22:26 rillig Exp $ # Link the mesa_dri_drivers mega driver. +NOLINT= # Lots of "Unsupported platform" due to undefined __GNUC__ + .include .include "../mesa-which.mk"
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: rillig Date: Fri Apr 26 17:22:26 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: dri: disable lint To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Fri Apr 26 17:11:22 UTC 2024
Modified Files:
src/usr.bin/make: job.c
src/usr.bin/make/unit-tests: opt-debug-errors-jobs.exp
Log Message:
make: in parallel mode, print the directory in which a job failed
When multiple targets run in parallel, the "stopped in" line may be
several lines away from the "Failed target" line, making them hard to
correlate.
To generate a diff of this commit:
cvs rdiff -u -r1.468 -r1.469 src/usr.bin/make/job.c
cvs rdiff -u -r1.4 -r1.5 \
src/usr.bin/make/unit-tests/opt-debug-errors-jobs.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/job.c
diff -u src/usr.bin/make/job.c:1.468 src/usr.bin/make/job.c:1.469
--- src/usr.bin/make/job.c:1.468 Sat Apr 20 10:18:55 2024
+++ src/usr.bin/make/job.c Fri Apr 26 17:11:22 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.468 2024/04/20 10:18:55 rillig Exp $ */
+/* $NetBSD: job.c,v 1.469 2024/04/26 17:11:22 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -141,7 +141,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.468 2024/04/20 10:18:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.469 2024/04/26 17:11:22 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -1062,6 +1062,7 @@ DebugFailedJob(const Job *job)
debug_printf("\n");
debug_printf("*** Failed target: %s\n", job->node->name);
+ debug_printf("*** In directory: %s\n", curdir);
debug_printf("*** Failed commands:\n");
for (ln = job->node->commands.first; ln != NULL; ln = ln->next) {
const char *cmd = ln->datum;
Index: src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.4 src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.5
--- src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.4 Sun Nov 28 00:02:07 2021
+++ src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp Fri Apr 26 17:11:22 2024
@@ -2,6 +2,7 @@ echo '3 spaces'; false
3 spaces
*** Failed target: fail-spaces
+*** In directory:
*** Failed commands:
echo '3 spaces'; false
*** [fail-spaces] Error code 1
@@ -11,6 +12,7 @@ echo \ indented; false
indented
*** Failed target: fail-escaped-space
+*** In directory:
*** Failed commands:
echo \ indented; false
*** [fail-escaped-space] Error code 1
@@ -22,6 +24,7 @@ line1
line2
*** Failed target: fail-newline
+*** In directory:
*** Failed commands:
echo 'line1${.newline}line2'; false
=> echo 'line1
@@ -33,6 +36,7 @@ echo 'line1 line2'; false
line1 line2
*** Failed target: fail-multiline
+*** In directory:
*** Failed commands:
echo 'line1 line2'; false
*** [fail-multiline] Error code 1
@@ -42,6 +46,7 @@ echo 'word1' 'word2'; false
word1 word2
*** Failed target: fail-multiline-intention
+*** In directory:
*** Failed commands:
echo 'word1' 'word2'; false
*** [fail-multiline-intention] Error code 1
@@ -49,6 +54,7 @@ word1 word2
make: stopped in unit-tests
*** Failed target: fail-vars
+*** In directory:
*** Failed commands:
@${COMPILE_C} ${COMPILE_C_FLAGS}
=> @false c-compiler flag1 -macro="several words"
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Fri Apr 26 17:11:22 UTC 2024 Modified Files: src/usr.bin/make: job.c src/usr.bin/make/unit-tests: opt-debug-errors-jobs.exp Log Message: make: in parallel mode, print the directory in which a job failed When multiple targets run in parallel, the "stopped in" line may be several lines away from the "Failed target" line, making them hard to correlate. To generate a diff of this commit: cvs rdiff -u -r1.468 -r1.469 src/usr.bin/make/job.c cvs rdiff -u -r1.4 -r1.5 \ src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rillig Date: Fri Apr 26 16:34:18 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: gallium: disable lint To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/gallium/Makefile diff -u src/external/mit/xorg/lib/gallium/Makefile:1.53 src/external/mit/xorg/lib/gallium/Makefile:1.54 --- src/external/mit/xorg/lib/gallium/Makefile:1.53 Sat Nov 25 20:00:25 2023 +++ src/external/mit/xorg/lib/gallium/Makefile Fri Apr 26 16:34:17 2024 @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.53 2023/11/25 20:00:25 rjs Exp $ +# $NetBSD: Makefile,v 1.54 2024/04/26 16:34:17 rillig Exp $ # Link the gallium mega driver. LIBISMODULE= yes LIBISCXX= yes +NOLINT= # Lots of "Unsupported platform" due to undefined __GNUC__ + .include .include "../mesa-which.mk"
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rillig Date: Fri Apr 26 16:34:18 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: gallium: disable lint To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/bin/cp
Module Name:src
Committed By: rillig
Date: Fri Apr 26 01:33:23 UTC 2024
Modified Files:
src/tests/bin/cp: t_cp.sh
Log Message:
tests/cp: clean up
Replace the deprecated "eq:0" with "exit:0", remove redundant "-o empty"
and "-e empty".
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/cp/t_cp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/cp/t_cp.sh
diff -u src/tests/bin/cp/t_cp.sh:1.1 src/tests/bin/cp/t_cp.sh:1.2
--- src/tests/bin/cp/t_cp.sh:1.1 Sat Mar 17 16:33:10 2012
+++ src/tests/bin/cp/t_cp.sh Fri Apr 26 01:33:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_cp.sh,v 1.1 2012/03/17 16:33:10 jruoho Exp $
+# $NetBSD: t_cp.sh,v 1.2 2024/04/26 01:33:23 rillig Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,7 +62,7 @@ file_to_file_simple() {
rm -f file2
umask 022
chmod 777 file
- atf_check -s eq:0 -o empty -e empty cp file file2
+ atf_check cp file file2
cp_compare file_to_file_simple file file2
if [ `stat -f "%Lp" file2` != "755" ]; then
atf_fail "new file not created with umask"
@@ -80,7 +80,7 @@ file_to_file_preserve() {
rm file3
chmod 644 file
chflags nodump file
- atf_check -s eq:0 -o empty -e empty cp -p file file3
+ atf_check cp -p file file3
finfo=`stat -f "%p%u%g%m%z%f" file`
f3info=`stat -f "%p%u%g%m%z%f" file3`
if [ $finfo != $f3info ]; then
@@ -92,7 +92,7 @@ file_to_file_noflags() {
rm file3
chmod 644 file
chflags nodump file
- atf_check -s eq:0 -o empty -e empty cp -p -N file file3
+ atf_check cp -p -N file file3
finfo=`stat -f "%f" file`
f3info=`stat -f "%f" file3`
if [ $finfo = $f3info ]; then
@@ -106,7 +106,7 @@ file_to_link_head() {
}
file_to_link_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp file2 link
+ atf_check cp file2 link
cp_compare file_to_link file file2
}
@@ -117,8 +117,8 @@ link_to_file_head() {
link_to_file_body() {
reset
# file and link are identical (not copied).
- atf_check -s eq:1 -o empty -e ignore cp link file
- atf_check -s eq:0 -o empty -e empty cp link file2
+ atf_check -s exit:1 -e ignore cp link file
+ atf_check cp link file2
cp_compare link_to_file file file2
}
@@ -129,7 +129,7 @@ file_over_link_head() {
}
file_over_link_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp -P file link
+ atf_check cp -P file link
cp_compare file_over_link file link
}
@@ -140,7 +140,7 @@ link_over_file_head() {
}
link_over_file_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp -P link file
+ atf_check cp -P link file
if [ `readlink link` != `readlink file` ]; then
atf_fail "readlink link != readlink file"
fi
@@ -153,8 +153,8 @@ files_to_dir_head() {
files_to_dir_body() {
reset
# can't copy multiple files to a file
- atf_check -s eq:1 -o empty -e ignore cp file file2 file3
- atf_check -s eq:0 -o empty -e empty cp file file2 link dir
+ atf_check -s exit:1 -e ignore cp file file2 file3
+ atf_check cp file file2 link dir
cp_compare files_to_dir file "dir/file"
}
@@ -166,8 +166,8 @@ dir_to_file_head() {
dir_to_file_body() {
reset
# can't copy a dir onto a file
- atf_check -s eq:1 -o empty -e ignore cp dir file
- atf_check -s eq:1 -o empty -e ignore cp -R dir file
+ atf_check -s exit:1 -e ignore cp dir file
+ atf_check -s exit:1 -e ignore cp -R dir file
}
atf_test_case file_to_linkdir
@@ -177,12 +177,12 @@ file_to_linkdir_head() {
}
file_to_linkdir_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp file dirlink
+ atf_check cp file dirlink
cp_compare file_to_linkdir file "dir/file"
# overwrite the link
- atf_check -s eq:0 -o empty -e empty cp -P file dirlink
- atf_check -s eq:1 -o empty -e empty readlink dirlink
+ atf_check cp -P file dirlink
+ atf_check -s exit:1 readlink dirlink
cp_compare file_to_linkdir file dirlink
}
@@ -194,21 +194,21 @@ linkdir_to_file_head() {
linkdir_to_file_body() {
reset
# cannot copy a dir onto a file
- atf_check -s eq:1 -o empty -e ignore cp dirlink file
+ atf_check -s exit:1 -e ignore cp dirlink file
# overwrite the link
- atf_check -s eq:0 -o empty -e empty cp -P dirlink file
+ atf_check cp -P dirlink file
if [ `readlink file` != `readlink dirlink` ]; then
atf_fail "readlink link != readlink file"
fi
}
dir_to_dne_no_R() {
- atf_check -s eq:1 -o empty -e ignore cp dir dir2
+ atf_check -s exit:1 -e ignore cp dir dir2
}
dir_to_dne() {
- atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+ atf_check cp -R dir dir2
cp_compare dir_to_dne "dir/file" "dir2/file"
readlink dir2/link >/dev/null
if [ $? -gt 0 ]; then
@@ -218,12 +218,12 @@ dir_to_dne() {
dir_to_dir_H() {
dir_to_dir_setup
- atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+ atf_check cp -R dir dir2
chmod 777 dir
# copy a dir into a dir, only command-line links are followed
- atf_check -s eq:0 -o empty -e empty cp -R -H dirlink dir2
+
CVS commit: src/tests/bin/cp
Module Name:src Committed By: rillig Date: Fri Apr 26 01:33:23 UTC 2024 Modified Files: src/tests/bin/cp: t_cp.sh Log Message: tests/cp: clean up Replace the deprecated "eq:0" with "exit:0", remove redundant "-o empty" and "-e empty". To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/bin/cp/t_cp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mac68k/dev
Module Name:src
Committed By: nat
Date: Fri Apr 26 00:59:08 UTC 2024
Modified Files:
src/sys/arch/mac68k/dev: pm_direct.c
Log Message:
Return early if PM data is not available.
This avoids random crashes on my Powerbook when using the mouse or keyboard.
The same was needed for the Powerbook 5xx/Duos (compile tested only).
XXX pullup-10, pullup-9, pullup-8.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mac68k/dev/pm_direct.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/mac68k/dev/pm_direct.c
diff -u src/sys/arch/mac68k/dev/pm_direct.c:1.30 src/sys/arch/mac68k/dev/pm_direct.c:1.31
--- src/sys/arch/mac68k/dev/pm_direct.c:1.30 Sat Aug 21 11:55:24 2021
+++ src/sys/arch/mac68k/dev/pm_direct.c Fri Apr 26 00:59:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $ */
+/* $NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -32,7 +32,7 @@
/* From: pm_direct.c 1.3 03/18/98 Takashi Hamada */
#include
-__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $");
#include "opt_adb.h"
@@ -562,6 +562,7 @@ pm_intr_pm1(void *arg)
printf("pm: PM is not ready. error code=%08x\n", rval);
#endif
splx(s);
+ return;
}
if ((pmdata.data[2] & 0x10) == 0x10) {
@@ -821,6 +822,7 @@ pm_intr_pm2(void *arg)
printf("pm: PM is not ready. error code: %08x\n", rval);
#endif
splx(s);
+ return;
}
switch ((u_int)(pmdata.data[2] & 0xff)) {
CVS commit: src/sys/arch/mac68k/dev
Module Name:src Committed By: nat Date: Fri Apr 26 00:59:08 UTC 2024 Modified Files: src/sys/arch/mac68k/dev: pm_direct.c Log Message: Return early if PM data is not available. This avoids random crashes on my Powerbook when using the mouse or keyboard. The same was needed for the Powerbook 5xx/Duos (compile tested only). XXX pullup-10, pullup-9, pullup-8. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mac68k/dev/pm_direct.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/bin/cat
Module Name:src
Committed By: rillig
Date: Fri Apr 26 00:57:15 UTC 2024
Modified Files:
src/tests/bin/cat: t_cat.sh
Log Message:
tests/cat: clean up
Multiple arguments to atf_set are joined by spaces, there's no need for
an extra space.
The exit status on success must be 0, so don't ignore it.
Remove the unnecessary shell wrapper, as no redirection is going on.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/bin/cat/t_cat.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/cat/t_cat.sh
diff -u src/tests/bin/cat/t_cat.sh:1.3 src/tests/bin/cat/t_cat.sh:1.4
--- src/tests/bin/cat/t_cat.sh:1.3 Thu Jun 16 01:04:58 2016
+++ src/tests/bin/cat/t_cat.sh Fri Apr 26 00:57:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_cat.sh,v 1.3 2016/06/16 01:04:58 sevan Exp $
+# $NetBSD: t_cat.sh,v 1.4 2024/04/26 00:57:15 rillig Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,37 +30,37 @@
atf_test_case align
align_head() {
- atf_set "descr" "Test that cat(1) aligns the output " \
+ atf_set "descr" "Test that cat(1) aligns the output" \
"right with options '-be' (PR bin/4841)"
}
align_body() {
- atf_check -s ignore -o file:$(atf_get_srcdir)/d_align.out \
- -x "cat -be $(atf_get_srcdir)/d_align.in"
+ atf_check -o file:$(atf_get_srcdir)/d_align.out \
+ cat -be $(atf_get_srcdir)/d_align.in
}
atf_test_case nonexistent
nonexistent_head() {
- atf_set "descr" "Test that cat(1) doesn't return zero exit " \
+ atf_set "descr" "Test that cat(1) doesn't return zero exit" \
"status for a nonexistent file (PR bin/3538)"
}
nonexistent_body() {
- atf_check -s not-exit:0 -o empty -e not-empty \
- -x "cat /some/name/that/does/not/exist"
+ atf_check -s not-exit:0 -e not-empty \
+ cat /some/name/that/does/not/exist
}
atf_test_case se_output
se_output_head() {
- atf_set "descr" "Test that cat(1) prints a $ sign " \
+ atf_set "descr" "Test that cat(1) prints a $ sign" \
"on blank lines with options '-se' (PR bin/51250)"
}
se_output_body() {
- atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \
- -x "cat -se $(atf_get_srcdir)/d_se_output.in"
+ atf_check -o file:$(atf_get_srcdir)/d_se_output.out \
+ cat -se $(atf_get_srcdir)/d_se_output.in
}
atf_init_test_cases()
CVS commit: src/tests/bin/cat
Module Name:src Committed By: rillig Date: Fri Apr 26 00:57:15 UTC 2024 Modified Files: src/tests/bin/cat: t_cat.sh Log Message: tests/cat: clean up Multiple arguments to atf_set are joined by spaces, there's no need for an extra space. The exit status on success must be 0, so don't ignore it. Remove the unnecessary shell wrapper, as no redirection is going on. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/bin/cat/t_cat.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Thu Apr 25 17:22:49 UTC 2024 Modified Files: src/doc: CHANGES Log Message: CHANGES: fix typo To generate a diff of this commit: cvs rdiff -u -r1.3050 -r1.3051 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.3050 src/doc/CHANGES:1.3051 --- src/doc/CHANGES:1.3050 Wed Apr 24 15:41:41 2024 +++ src/doc/CHANGES Thu Apr 25 17:22:48 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3050 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3051 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -137,7 +137,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: [gutteridge 20230630] tetris(6): Support the informal standard of allowing setting NO_COLOR in the environment to disable the use of color. [nia 20230701] - lint(1): Initial support for C23. [rilling 20230702] + lint(1): Initial support for C23. [rillig 20230702] heartbeat(9): New mechanism to check progress of kernel. This uses hard interrupts to check progress of low-priority soft interrupts, and one CPU to check progress of another CPU. @@ -230,7 +230,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: kernel: Replace various usage of extent(9) with vmem(9). [thorpej 20231201] indent(1): Use line number of the token start in diagnostics - [rilling 20231203] + [rillig 20231203] vmem(9): Add the notion of "private boundary tags", allowing vmem to be used VERY early in boot. [thorpej 20231203] kernel: Modularize compat90. [pgoyette 20231209] @@ -314,7 +314,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: be matched by ugen(4) and accessed through libusb. [thorpej 20240326] moused(8): Remove undocumented and unused option 'C'. - [rilling 20240329] + [rillig 20240329] ugen(4): Add a "ugen-unit" device property which devpubd(8) scripts can query to determine which /dev/ugenN.xx nodes a given ugen or ugenif device is using. [thorpej 20240329]
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Thu Apr 25 17:22:49 UTC 2024 Modified Files: src/doc: CHANGES Log Message: CHANGES: fix typo To generate a diff of this commit: cvs rdiff -u -r1.3050 -r1.3051 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: nia
Date: Thu Apr 25 11:56:51 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.installimage
src/distrib/i386/cdroms/installcd: Makefile
Log Message:
remove redundant kernels and floppies from the space-starved i386 ISO
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.11 -r1.12 src/distrib/i386/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.47 src/distrib/common/Makefile.bootcd:1.48
--- src/distrib/common/Makefile.bootcd:1.47 Wed Apr 24 11:29:34 2024
+++ src/distrib/common/Makefile.bootcd Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 nia Exp $
+# $NetBSD: Makefile.bootcd,v 1.48 2024/04/25 11:56:51 nia Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -53,7 +53,7 @@ CDROMS_RELEASEDIR?= ${MACHINE}/installat
CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
-CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+CDRELEASE_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
.endif
.if defined(CDRELEASE_NOCOMPAT)
. for sufx in tgz tar.xz
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.10 src/distrib/common/bootimage/Makefile.installimage:1.11
--- src/distrib/common/bootimage/Makefile.installimage:1.10 Sat Sep 25 21:26:03 2021
+++ src/distrib/common/bootimage/Makefile.installimage Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
+# $NetBSD: Makefile.installimage,v 1.11 2024/04/25 11:56:51 nia Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -46,7 +46,8 @@ DISKPROTO_IN?= ${NETBSDSRCDIR}/distrib/c
# XXX: no permission info for makefs(8)
IMGDIR_EXTRA= ${RELEASEDIR}/${RELEASEMACHINEDIR} ${RELEASEMACHINEDIR}
-IMGDIR_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.if defined(MD_IMGDIR_EXCLUDE)
Index: src/distrib/i386/cdroms/installcd/Makefile
diff -u src/distrib/i386/cdroms/installcd/Makefile:1.11 src/distrib/i386/cdroms/installcd/Makefile:1.12
--- src/distrib/i386/cdroms/installcd/Makefile:1.11 Tue Apr 23 20:37:08 2024
+++ src/distrib/i386/cdroms/installcd/Makefile Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/04/23 20:37:08 nia Exp $
+# $NetBSD: Makefile,v 1.12 2024/04/25 11:56:51 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -15,6 +15,21 @@ CDRELEASE_NOTESTS= true
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+# already (probably) booting from CD if using this and the floppy images
+# are 20MB+ when combined
+CDRELEASE_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+
+# MONOLITHIC (i386-only) was originally added to the release build
+# for upgrades from netbsd-5, and now primarily exists so the no-modules
+# build can continue to be tested. this takes up 20MB+ space.
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-INSTALL.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-MONOLITHIC.${sufx},,gp'
+. endfor
+
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-INSTALL.gz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-MONOLITHIC.gz,,gp'
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
