CVS commit: src/doc
Module Name:src Committed By: nia Date: Mon Oct 7 08:37:53 UTC 2024 Modified Files: src/doc: CHANGES Log Message: doc: fix typo in previous To generate a diff of this commit: cvs rdiff -u -r1.3103 -r1.3104 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.3103 src/doc/CHANGES:1.3104 --- src/doc/CHANGES:1.3103 Mon Oct 7 07:40:43 2024 +++ src/doc/CHANGES Mon Oct 7 08:37:53 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3103 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3104 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -545,5 +545,5 @@ Changes from NetBSD 10.0 to NetBSD 11.0: evbarm: Make cemac(4) MP safe. [skrll 20241005] x68k: Add SIXEL graphics sequence support. [isaki 20241005] pkill(1): Add -F option to use a pidfile and -L to ensure it's - locked. Taken from FreeBSD. [roy 2024107] + locked. Taken from FreeBSD. [roy 20241007]
CVS commit: src/doc
Module Name:src Committed By: nia Date: Mon Oct 7 08:37:53 UTC 2024 Modified Files: src/doc: CHANGES Log Message: doc: fix typo in previous To generate a diff of this commit: cvs rdiff -u -r1.3103 -r1.3104 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/doc
Module Name:src Committed By: nia Date: Mon Oct 7 07:40:43 UTC 2024 Modified Files: src/doc: CHANGES Log Message: doc: first week of october To generate a diff of this commit: cvs rdiff -u -r1.3102 -r1.3103 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/doc
Module Name:src Committed By: nia Date: Mon Oct 7 07:40:43 UTC 2024 Modified Files: src/doc: CHANGES Log Message: doc: first week of october To generate a diff of this commit: cvs rdiff -u -r1.3102 -r1.3103 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.3102 src/doc/CHANGES:1.3103 --- src/doc/CHANGES:1.3102 Sun Sep 29 06:14:59 2024 +++ src/doc/CHANGES Mon Oct 7 07:40:43 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3102 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3103 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -537,3 +537,13 @@ Changes from NetBSD 10.0 to NetBSD 11.0: variables. [rillig 20240928] compat_linux(8): Implement renameat2, clone3, sync_file_range, syncfs system calls (from Shivraj Jamgade). [christos 20240928] + udl(4): Add support for SANWA SUPPLY 500-KC002N USB to VGA Adapter. + [tsutsui 20241002] + kemtimedop(2): New system call, from Shivraj Jamgade (GSoC 2024). + [christos 20241003] + amdzentemp(4): Add support for Zen 5. [msaitoh 20241004] + evbarm: Make cemac(4) MP safe. [skrll 20241005] + x68k: Add SIXEL graphics sequence support. [isaki 20241005] + pkill(1): Add -F option to use a pidfile and -L to ensure it's + locked. Taken from FreeBSD. [roy 2024107] +
CVS commit: src/usr.bin/pkill
Module Name:src Committed By: roy Date: Mon Oct 7 06:14:05 UTC 2024 Modified Files: src/usr.bin/pkill: pkill.1 pkill.c Log Message: pkill(1): Add -F option to use a pidfile and -L to ensure it's locked Taken from FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/pkill/pkill.1 cvs rdiff -u -r1.33 -r1.34 src/usr.bin/pkill/pkill.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/pkill
Module Name:src
Committed By: roy
Date: Mon Oct 7 06:14:05 UTC 2024
Modified Files:
src/usr.bin/pkill: pkill.1 pkill.c
Log Message:
pkill(1): Add -F option to use a pidfile and -L to ensure it's locked
Taken from FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/pkill/pkill.1
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/pkill/pkill.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/pkill/pkill.1
diff -u src/usr.bin/pkill/pkill.1:1.32 src/usr.bin/pkill/pkill.1:1.33
--- src/usr.bin/pkill/pkill.1:1.32 Sat Oct 29 08:17:16 2022
+++ src/usr.bin/pkill/pkill.1 Mon Oct 7 06:14:05 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkill.1,v 1.32 2022/10/29 08:17:16 simonb Exp $
+.\" $NetBSD: pkill.1,v 1.33 2024/10/07 06:14:05 roy Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 29, 2022
+.Dd October 6, 2024
.Dt PKILL 1
.Os
.Sh NAME
@@ -37,8 +37,9 @@
.Nd find or signal processes by name
.Sh SYNOPSIS
.Nm pgrep
-.Op Fl filnqvx
+.Op Fl fiLlnqvx
.Op Fl d Ar delim
+.Op Fl F Ar pidfile
.Op Fl G Ar gid
.Op Fl g Ar pgrp
.Op Fl P Ar ppid
@@ -49,7 +50,8 @@
.Ar pattern ...
.Nm pkill
.Op Fl signal
-.Op Fl filnvx
+.Op Fl fiLlnvx
+.Op Fl F Ar pidfile
.Op Fl G Ar gid
.Op Fl g Ar pgrp
.Op Fl P Ar ppid
@@ -89,7 +91,7 @@ The following options are available for
.Nm pkill
and
.Nm pgrep :
-.Bl -tag -width
+.Bl -tag -width ".Fl F Ar pidfile"
.It Fl d Ar delim
Specify a delimiter to be printed between each process ID.
The default is a newline.
@@ -99,6 +101,10 @@ command.
.It Fl f
Match against full argument lists.
The default is to match against process names.
+.It Fl F Ar pidfile
+Restrict matches to processes which pid is stored in
+.Ar pidfile
+file.
.It Fl G Ar gid
Restrict matches to processes with a real group ID in the comma-separated
list
@@ -114,6 +120,15 @@ or
command.
.It Fl i
Ignore case distinctions in both the process table and the supplied pattern.
+.It Fl L
+The
+.Ar pidfile
+given for the
+.Fl F
+option must be locked with the
+.Xr flock 2
+syscall or created with
+.Xr pidfile_lock 3 .
.It Fl l
Long output.
Print the process name in addition to the process ID for each matching
@@ -181,7 +196,7 @@ This option is valid only when given as
.Pp
The following option is also available for
.Nm pgrep :
-.Bl -tag -width
+.Bl -tag -width ".Fl F Ar pidfile"
.It Fl q
Quiet; do not write anything to standard output.
.El
Index: src/usr.bin/pkill/pkill.c
diff -u src/usr.bin/pkill/pkill.c:1.33 src/usr.bin/pkill/pkill.c:1.34
--- src/usr.bin/pkill/pkill.c:1.33 Sat Oct 29 08:17:16 2022
+++ src/usr.bin/pkill/pkill.c Mon Oct 7 06:14:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pkill.c,v 1.33 2022/10/29 08:17:16 simonb Exp $ */
+/* $NetBSD: pkill.c,v 1.34 2024/10/07 06:14:05 roy Exp $ */
/*-
* Copyright (c) 2002, 2022 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: pkill.c,v 1.33 2022/10/29 08:17:16 simonb Exp $");
+__RCSID("$NetBSD: pkill.c,v 1.34 2024/10/07 06:14:05 roy Exp $");
#endif /* !lint */
#include
@@ -52,6 +52,7 @@ __RCSID("$NetBSD: pkill.c,v 1.33 2022/10
#include
#include
#include
+#include
#include
#include
#include
@@ -62,6 +63,9 @@ __RCSID("$NetBSD: pkill.c,v 1.33 2022/10
#define STATUS_BADUSAGE 2
#define STATUS_ERROR 3
+#define MIN_PID 5
+#define MAX_PID 3 // XXX PID_MAX from sys/proc.h?
+
enum listtype {
LT_GENERIC,
LT_USER,
@@ -109,12 +113,13 @@ static int killact(const struct kinfo_pr
static int reniceact(const struct kinfo_proc2 *);
static int grepact(const struct kinfo_proc2 *);
static void makelist(struct listhead *, enum listtype, char *);
+static int takepid(const char *, int);
int
main(int argc, char **argv)
{
- char buf[_POSIX2_LINE_MAX], **pargv, *q;
- int i, j, ch, bestidx, rv, criteria;
+ char buf[_POSIX2_LINE_MAX], **pargv, *q, *pidfile = NULL;
+ int i, j, ch, bestidx, rv, criteria, pidfromfile, pidfilelock = 0;
int (*action)(const struct kinfo_proc2 *);
const struct kinfo_proc2 *kp;
struct list *li;
@@ -182,12 +187,19 @@ main(int argc, char **argv)
} else
usage();
} else {
- while ((ch = getopt(argc, argv, "G:P:U:d:fg:ilnqs:t:u:vx")) != -1)
+ while ((ch = getopt(argc, argv, "F:G:LP:U:d:fg:ilnqs:t:u:vx")) != -1)
switch (ch) {
+ case 'F':
+pidfile = optarg;
+criteria = 1;
+break;
case 'G':
makelist(&rgidlist, LT_GROUP, optarg);
criteria = 1;
break;
+ case 'L':
+pidfilelock = 1;
+break;
case 'P':
makelist(&ppidlist, LT_GENERIC, optarg);
criteria = 1;
@@ -253,6 +265,15 @@ main(int argc, char **argv)
criteria = 1;
if (!criteria)
usage();
+ if (pidfile != NULL)
+ pidfr
Re: CVS commit: src/sys
> Module Name:src > Committed By: christos > Date: Thu Oct 3 16:50:52 UTC 2024 > > Modified Files: > src/sys/kern: syscalls.master sysv_sem.c > src/sys/sys: sem.h > > Log Message: > Add semtimedop GSoC 2024 (Shivraj Jamgade) This doesn't seem to pass the existing sysv semaphore tests: https://releng.netbsd.org/b5reports/i386/2024/2024.10.03.16.54.08/test.html#kernel_t_sysv_sem https://mail-index.netbsd.org/current-users/2024/10/04/msg045666.html Did you run the tests before committing? None of the new tests seem to be passing either: https://releng.netbsd.org/b5reports/i386/2024/2024.10.04.05.56.03/test.html#failed-tcs-summary semtimedop_basic: /tmp/build/2024.10.04.05.56.03-i386/src/tests/kernel/t_semtimedop.c:77: semtimedop failed: Invalid argument semtimedop_invalid: /tmp/build/2024.10.04.05.56.03-i386/src/tests/kernel/t_semtimedop.c:249: semtimedop did not fail on invalid sem_num semtimedop_timeout: /tmp/build/2024.10.04.05.56.03-i386/src/tests/kernel/t_semtimedop.c:142: WEXITSTATUS(status) != 0
CVS commit: src/sys/kern
Module Name:src
Committed By: mlelstv
Date: Sun Oct 6 22:15:33 UTC 2024
Modified Files:
src/sys/kern: sysv_sem.c
Log Message:
Use the syscall arg for IPCID_TO_SEQ like before.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/kern/sysv_sem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sysv_sem.c
diff -u src/sys/kern/sysv_sem.c:1.100 src/sys/kern/sysv_sem.c:1.101
--- src/sys/kern/sysv_sem.c:1.100 Thu Oct 3 16:54:08 2024
+++ src/sys/kern/sysv_sem.c Sun Oct 6 22:15:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_sem.c,v 1.100 2024/10/03 16:54:08 christos Exp $ */
+/* $NetBSD: sysv_sem.c,v 1.101 2024/10/06 22:15:33 mlelstv Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysv_sem.c,v 1.100 2024/10/03 16:54:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_sem.c,v 1.101 2024/10/06 22:15:33 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -873,7 +873,7 @@ restart:
}
semaptr = &sema[semid];
- seq = IPCID_TO_SEQ(semid);
+ seq = IPCID_TO_SEQ(usemid);
if ((semaptr->sem_perm.mode & SEM_ALLOC) == 0 ||
semaptr->sem_perm._seq != seq) {
error = EINVAL;
CVS commit: src/sys/kern
Module Name:src Committed By: mlelstv Date: Sun Oct 6 22:15:33 UTC 2024 Modified Files: src/sys/kern: sysv_sem.c Log Message: Use the syscall arg for IPCID_TO_SEQ like before. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/kern/sysv_sem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: andvar
Date: Sun Oct 6 20:55:12 UTC 2024
Modified Files:
src/sys/arch/acorn32/podulebus: if_ie.c
src/sys/arch/arm/broadcom: bcm2835reg.h
Log Message:
Fix couple of typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/broadcom/bcm2835reg.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/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.55 src/sys/arch/acorn32/podulebus/if_ie.c:1.56
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.55 Mon Feb 5 22:08:04 2024
+++ src/sys/arch/acorn32/podulebus/if_ie.c Sun Oct 6 20:55:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.55 2024/02/05 22:08:04 andvar Exp $ */
+/* $NetBSD: if_ie.c,v 1.56 2024/10/06 20:55:12 andvar Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.55 2024/02/05 22:08:04 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.56 2024/10/06 20:55:12 andvar Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -1387,7 +1387,7 @@ loop:
return(0);
}
-/* This is prehaps a little over cautious */
+/* This is perhaps a little over cautious */
if ( safety_catch++ > 10 )
{
printf ( "ie: Interrupt couldn't be cleared\n" );
Index: src/sys/arch/arm/broadcom/bcm2835reg.h
diff -u src/sys/arch/arm/broadcom/bcm2835reg.h:1.32 src/sys/arch/arm/broadcom/bcm2835reg.h:1.33
--- src/sys/arch/arm/broadcom/bcm2835reg.h:1.32 Mon Mar 8 14:27:45 2021
+++ src/sys/arch/arm/broadcom/bcm2835reg.h Sun Oct 6 20:55:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835reg.h,v 1.32 2021/03/08 14:27:45 mlelstv Exp $ */
+/* $NetBSD: bcm2835reg.h,v 1.33 2024/10/06 20:55:12 andvar Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
/*
- * Reference: BCM2835 ARM Periperhals
+ * Reference: BCM2835 ARM Peripherals
*
* http://www.raspberrypi.org/wp-content/uploads/2012/02/BCM2835-ARM-Peripherals.pdf
*/
CVS commit: src/sys/arch
Module Name:src Committed By: andvar Date: Sun Oct 6 20:55:12 UTC 2024 Modified Files: src/sys/arch/acorn32/podulebus: if_ie.c src/sys/arch/arm/broadcom: bcm2835reg.h Log Message: Fix couple of typos in comments. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/acorn32/podulebus/if_ie.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/broadcom/bcm2835reg.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/ic
Module Name:src
Committed By: skrll
Date: Sun Oct 6 19:34:07 UTC 2024
Modified Files:
src/sys/dev/ic: bcmgenet.c
Log Message:
Don't use obsoleted if_flags / IFF_ALLMULTI instead set / clear
ec_flags / ETHER_F_ALLMULTI.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/bcmgenet.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/ic/bcmgenet.c
diff -u src/sys/dev/ic/bcmgenet.c:1.21 src/sys/dev/ic/bcmgenet.c:1.22
--- src/sys/dev/ic/bcmgenet.c:1.21 Fri Oct 4 10:41:58 2024
+++ src/sys/dev/ic/bcmgenet.c Sun Oct 6 19:34:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgenet.c,v 1.21 2024/10/04 10:41:58 skrll Exp $ */
+/* $NetBSD: bcmgenet.c,v 1.22 2024/10/06 19:34:06 skrll Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill
@@ -33,7 +33,7 @@
#include "opt_ddb.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.21 2024/10/04 10:41:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.22 2024/10/06 19:34:06 skrll Exp $");
#include
#include
@@ -360,11 +360,12 @@ genet_setup_rxfilter(struct genet_softc
ETHER_NEXT_MULTI(step, enm);
if (n > GENET_MAX_MDF_FILTER)
- ifp->if_flags |= IFF_ALLMULTI;
+ ec->ec_flags |= ETHER_F_ALLMULTI;
else
- ifp->if_flags &= ~IFF_ALLMULTI;
+ ec->ec_flags &= ~ETHER_F_ALLMULTI;
- if ((ifp->if_flags & (IFF_PROMISC|IFF_ALLMULTI)) != 0) {
+ if ((sc->sc_if_flags & IFF_PROMISC) != 0) {
+ ec->ec_flags |= ETHER_F_ALLMULTI;
cmd |= GENET_UMAC_CMD_PROMISC;
mdf_ctrl = 0;
} else {
@@ -945,7 +946,7 @@ genet_ifflags_cb(struct ethercom *ec)
if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
ret = ENETRESET;
- } else if ((change & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+ } else if ((change & IFF_PROMISC) != 0) {
if ((sc->sc_if_flags & IFF_RUNNING) != 0)
genet_setup_rxfilter(sc);
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Sun Oct 6 19:34:07 UTC 2024 Modified Files: src/sys/dev/ic: bcmgenet.c Log Message: Don't use obsoleted if_flags / IFF_ALLMULTI instead set / clear ec_flags / ETHER_F_ALLMULTI. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/bcmgenet.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
Module Name:src
Committed By: rillig
Date: Sun Oct 6 19:31:26 UTC 2024
Modified Files:
src/usr.bin/m4: misc.c
src/usr.bin/mail: format.c
Log Message:
usr.bin: fix lint warning about "effectively discards 'const'"
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/m4/misc.c
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/mail/format.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/m4/misc.c
diff -u src/usr.bin/m4/misc.c:1.24 src/usr.bin/m4/misc.c:1.25
--- src/usr.bin/m4/misc.c:1.24 Sat Jan 16 17:01:22 2016
+++ src/usr.bin/m4/misc.c Sun Oct 6 19:31:26 2024
@@ -1,5 +1,5 @@
/* $OpenBSD: misc.c,v 1.41 2009/10/14 17:19:47 sthen Exp $ */
-/* $NetBSD: misc.c,v 1.24 2016/01/16 17:01:22 christos Exp $ */
+/* $NetBSD: misc.c,v 1.25 2024/10/06 19:31:26 rillig Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
#include "nbtool_config.h"
#endif
#include
-__RCSID("$NetBSD: misc.c,v 1.24 2016/01/16 17:01:22 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.25 2024/10/06 19:31:26 rillig Exp $");
#include
#include
#include
@@ -71,7 +71,7 @@ unsigned char *endpbb; /* end of push-
ptrdiff_t
indx(const char *s1, const char *s2)
{
- char *t;
+ const char *t;
t = strstr(s1, s2);
if (t == NULL)
Index: src/usr.bin/mail/format.c
diff -u src/usr.bin/mail/format.c:1.18 src/usr.bin/mail/format.c:1.19
--- src/usr.bin/mail/format.c:1.18 Fri Sep 8 14:34:02 2023
+++ src/usr.bin/mail/format.c Sun Oct 6 19:31:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: format.c,v 1.18 2023/09/08 14:34:02 shm Exp $ */
+/* $NetBSD: format.c,v 1.19 2024/10/06 19:31:26 rillig Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef __lint__
-__RCSID("$NetBSD: format.c,v 1.18 2023/09/08 14:34:02 shm Exp $");
+__RCSID("$NetBSD: format.c,v 1.19 2024/10/06 19:31:26 rillig Exp $");
#endif /* not __lint__ */
#include
@@ -138,7 +138,7 @@ sfmtdepth(char *str, int depth)
static const char *
sfmtfield(const char **fmtbeg, const char *fmtch, struct message *mp)
{
- char *q;
+ const char *q;
q = strchr(fmtch + 1, '?');
if (q) {
size_t len;
@@ -270,7 +270,7 @@ sfmtflag(const char **fmtbeg, const char
static const char *
login_name(const char *addr)
{
- char *p;
+ const char *p;
p = strchr(addr, '@');
if (p) {
char *q;
CVS commit: src/usr.bin
Module Name:src Committed By: rillig Date: Sun Oct 6 19:31:26 UTC 2024 Modified Files: src/usr.bin/m4: misc.c src/usr.bin/mail: format.c Log Message: usr.bin: fix lint warning about "effectively discards 'const'" No binary change. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/m4/misc.c cvs rdiff -u -r1.18 -r1.19 src/usr.bin/mail/format.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/ic
Module Name:src
Committed By: skrll
Date: Sun Oct 6 19:30:29 UTC 2024
Modified Files:
src/sys/dev/ic: dwc_eqos.c
Log Message:
Don't check obsoleted IFF_ALLMULTI in eqos_ifflags_cb
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/dwc_eqos.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/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.40 src/sys/dev/ic/dwc_eqos.c:1.41
--- src/sys/dev/ic/dwc_eqos.c:1.40 Fri Oct 4 10:42:12 2024
+++ src/sys/dev/ic/dwc_eqos.c Sun Oct 6 19:30:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.40 2024/10/04 10:42:12 skrll Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.41 2024/10/06 19:30:29 skrll Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.40 2024/10/04 10:42:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.41 2024/10/06 19:30:29 skrll Exp $");
#include
#include
@@ -1260,7 +1260,7 @@ eqos_ifflags_cb(struct ethercom *ec)
if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
ret = ENETRESET;
- } else if ((change & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+ } else if ((change & IFF_PROMISC) != 0) {
if ((sc->sc_if_flags & IFF_RUNNING) != 0)
eqos_setup_rxfilter(sc);
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Sun Oct 6 19:30:29 UTC 2024 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: Don't check obsoleted IFF_ALLMULTI in eqos_ifflags_cb To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/dwc_eqos.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/cadence
Module Name:src Committed By: skrll Date: Sun Oct 6 19:18:20 UTC 2024 Modified Files: src/sys/dev/cadence: if_cemac.c Log Message: fix whitespace from previous To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cadence/if_cemac.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/cadence/if_cemac.c diff -u src/sys/dev/cadence/if_cemac.c:1.43 src/sys/dev/cadence/if_cemac.c:1.44 --- src/sys/dev/cadence/if_cemac.c:1.43 Sat Oct 5 07:37:22 2024 +++ src/sys/dev/cadence/if_cemac.c Sun Oct 6 19:18:20 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cemac.c,v 1.43 2024/10/05 07:37:22 skrll Exp $ */ +/* $NetBSD: if_cemac.c,v 1.44 2024/10/06 19:18:20 skrll Exp $ */ /* * Copyright (c) 2015 Genetec Corporation. All rights reserved. @@ -48,7 +48,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.43 2024/10/05 07:37:22 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.44 2024/10/06 19:18:20 skrll Exp $"); #include #include @@ -1083,7 +1083,7 @@ cemac_ifstop(struct ifnet *ifp, int disa ifp->if_flags &= ~IFF_RUNNING; sc->sc_txbusy = false; - sc->sc_mii.mii_media_status &= ~IFM_ACTIVE; + sc->sc_mii.mii_media_status &= ~IFM_ACTIVE; } static void
CVS commit: src/sys/dev/cadence
Module Name:src Committed By: skrll Date: Sun Oct 6 19:18:20 UTC 2024 Modified Files: src/sys/dev/cadence: if_cemac.c Log Message: fix whitespace from previous To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cadence/if_cemac.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/envstat
Module Name:src
Committed By: rillig
Date: Sun Oct 6 19:08:34 UTC 2024
Modified Files:
src/usr.sbin/envstat: config.c
Log Message:
envstat: remove redundant local variables
This fixes the lint warnings about "effectively discards 'const'".
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/envstat/config.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/envstat/config.c
diff -u src/usr.sbin/envstat/config.c:1.14 src/usr.sbin/envstat/config.c:1.15
--- src/usr.sbin/envstat/config.c:1.14 Sat Nov 14 09:11:55 2020
+++ src/usr.sbin/envstat/config.c Sun Oct 6 19:08:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.14 2020/11/14 09:11:55 mlelstv Exp $ */
+/* $NetBSD: config.c,v 1.15 2024/10/06 19:08:34 rillig Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: config.c,v 1.14 2020/11/14 09:11:55 mlelstv Exp $");
+__RCSID("$NetBSD: config.c,v 1.15 2024/10/06 19:08:34 rillig Exp $");
#endif /* not lint */
#include
@@ -242,7 +242,7 @@ config_dict_adddev_prop(const char *key,
prop_dictionary_t d = NULL;
uint64_t timo;
size_t len;
- char *endptr, *tmp, *strval;
+ char *endptr, *strval;
bool minutes, hours;
minutes = hours = false;
@@ -250,13 +250,13 @@ config_dict_adddev_prop(const char *key,
/*
* Check what was specified: seconds, minutes or hours.
*/
- if ((tmp = strchr(value, 's'))) {
- /*
+ if (strchr(value, 's')) {
+ /*
* do nothing, by default the value will be sent as seconds.
*/
- } else if ((tmp = strchr(value, 'm'))) {
+ } else if (strchr(value, 'm')) {
minutes = true;
- } else if ((tmp = strchr(value, 'h'))) {
+ } else if (strchr(value, 'h')) {
hours = true;
} else
goto bad;
@@ -287,7 +287,7 @@ config_dict_adddev_prop(const char *key,
if (minutes)
timo *= 60;
else if (hours) {
- /*
+ /*
* Make sure the value is not too high...
*/
if (timo > 999)
@@ -710,7 +710,7 @@ convert_val_to_pnumber(prop_dictionary_t
prop_object_t obj;
prop_number_t num;
double val, max, min;
- char *strval, *tmp, *endptr;
+ char *strval, *endptr;
bool celsius;
size_t len;
@@ -727,12 +727,10 @@ convert_val_to_pnumber(prop_dictionary_t
* Make the conversion for sensor's type.
*/
if (prop_string_equals_string(obj, "Temperature")) {
- tmp = strchr(value, 'C');
- if (tmp)
+ if (strchr(value, 'C'))
celsius = true;
else {
- tmp = strchr(value, 'F');
- if (!tmp)
+ if (!strchr(value, 'F'))
config_errmsg(VALUE_ERR, prop, sensor);
celsius = false;
@@ -742,7 +740,7 @@ convert_val_to_pnumber(prop_dictionary_t
strval = calloc(len, sizeof(*value));
if (!strval)
err(EXIT_FAILURE, "calloc");
-
+
(void)strlcpy(strval, value, len);
val = strtod(strval, &endptr);
if (*endptr != '\0') {
CVS commit: src/usr.sbin/envstat
Module Name:src Committed By: rillig Date: Sun Oct 6 19:08:34 UTC 2024 Modified Files: src/usr.sbin/envstat: config.c Log Message: envstat: remove redundant local variables This fixes the lint warnings about "effectively discards 'const'". No binary change. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/envstat/config.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/wpa/dist/wpa_supplicant
Module Name:src Committed By: christos Date: Sun Oct 6 18:56:08 UTC 2024 Modified Files: src/external/bsd/wpa/dist/wpa_supplicant: events.c Log Message: fix formatting string. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/wpa/dist/wpa_supplicant/events.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/wpa/dist/wpa_supplicant
Module Name:src Committed By: christos Date: Sun Oct 6 18:56:08 UTC 2024 Modified Files: src/external/bsd/wpa/dist/wpa_supplicant: events.c Log Message: fix formatting string. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/wpa/dist/wpa_supplicant/events.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/wpa/dist/wpa_supplicant/events.c diff -u src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.10 src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.11 --- src/external/bsd/wpa/dist/wpa_supplicant/events.c:1.10 Wed Sep 18 11:09:33 2024 +++ src/external/bsd/wpa/dist/wpa_supplicant/events.c Sun Oct 6 14:56:08 2024 @@ -6129,8 +6129,8 @@ void wpa_supplicant_event(void *ctx, enu wpa_s->scan_start_time.sec = 0; wpa_s->scan_start_time.usec = 0; wpa_s->wps_scan_done = true; - wpa_dbg(wpa_s, MSG_DEBUG, "Scan completed in %ld.%06ld seconds", -diff.sec, diff.usec); + wpa_dbg(wpa_s, MSG_DEBUG, "Scan completed in %jd.%06ld seconds", +(intmax_t)diff.sec, (long)diff.usec); } if (wpa_supplicant_event_scan_results(wpa_s, data)) break; /* interface may have been removed */
CVS commit: src/bin/df
Module Name:src
Committed By: christos
Date: Sun Oct 6 17:03:28 UTC 2024
Modified Files:
src/bin/df: df.c
Log Message:
PR/58718: Christof Meerwald: "total files" and "free files" values swapped
in df -G output
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/bin/df/df.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/df/df.c
diff -u src/bin/df/df.c:1.103 src/bin/df/df.c:1.104
--- src/bin/df/df.c:1.103 Sat Aug 3 01:27:58 2024
+++ src/bin/df/df.c Sun Oct 6 13:03:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: df.c,v 1.103 2024/08/03 05:27:58 kre Exp $ */
+/* $NetBSD: df.c,v 1.104 2024/10/06 17:03:28 christos Exp $ */
/*
* Copyright (c) 1980, 1990, 1993, 1994
@@ -45,7 +45,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: df.c,v 1.103 2024/08/03 05:27:58 kre Exp $");
+__RCSID("$NetBSD: df.c,v 1.104 2024/10/06 17:03:28 christos Exp $");
#endif
#endif /* not lint */
@@ -492,7 +492,7 @@ prtstat(const struct statvfs *sfsp, int
(uint64_t)sfsp->f_bavail);
(void)printf("%10" PRId64 " total files %10" PRId64
" free files %12lx filesys id\n",
- (uint64_t)sfsp->f_ffree, (uint64_t)sfsp->f_files,
+ (uint64_t)sfsp->f_files, (uint64_t)sfsp->f_ffree,
sfsp->f_fsid);
(void)printf("%10s fstype %#15lx flag %17ld filename "
"length\n", sfsp->f_fstypename, sfsp->f_flag,
CVS commit: src/bin/df
Module Name:src Committed By: christos Date: Sun Oct 6 17:03:28 UTC 2024 Modified Files: src/bin/df: df.c Log Message: PR/58718: Christof Meerwald: "total files" and "free files" values swapped in df -G output To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/bin/df/df.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/mii
Module Name:src
Committed By: msaitoh
Date: Sun Oct 6 15:38:31 UTC 2024
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.159 -r1.160 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.170 src/sys/dev/mii/miidevs.h:1.171
--- src/sys/dev/mii/miidevs.h:1.170 Wed Jul 17 13:37:26 2024
+++ src/sys/dev/mii/miidevs.h Sun Oct 6 15:38:31 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.170 2024/07/17 13:37:26 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.171 2024/10/06 15:38:31 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.172 2024/07/17 13:37:05 msaitoh Exp
+ * NetBSD: miidevs,v 1.173 2024/10/06 15:38:11 msaitoh Exp
*/
/*-
@@ -113,6 +113,7 @@
#define MII_OUI_xxAMLOGIC 0x00068a /* Amlogic */
#define MII_OUI_xxQUALSEMI 0x00068a /* Quality Semiconductor */
#define MII_OUI_xxREALTEK 0x000732 /* Realtek */
+#define MII_OUI_xxADMTEK 0x000749 /* ADMTek */
#define MII_OUI_xxBROADCOM 0x000818 /* Broadcom Corporation */
#define MII_OUI_xxPMCSIERRA 0x0009c0 /* PMC-Sierra */
#define MII_OUI_xxICPLUS 0x0009c3 /* IC Plus Corp. */
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.159 src/sys/dev/mii/miidevs_data.h:1.160
--- src/sys/dev/mii/miidevs_data.h:1.159 Wed Jul 17 13:37:26 2024
+++ src/sys/dev/mii/miidevs_data.h Sun Oct 6 15:38:31 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.159 2024/07/17 13:37:26 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.160 2024/10/06 15:38:31 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.172 2024/07/17 13:37:05 msaitoh Exp
+ * NetBSD: miidevs,v 1.173 2024/10/06 15:38:11 msaitoh Exp
*/
/*-
@@ -93,18 +93,19 @@ static const uint32_t mii_vendors[] = {
MII_OUI_xxAMLOGIC, 252, 0,
MII_OUI_xxQUALSEMI, 244, 186, 0,
MII_OUI_xxREALTEK, 429, 0,
+ MII_OUI_xxADMTEK, 446, 0,
MII_OUI_xxBROADCOM, 109, 118, 0,
MII_OUI_xxPMCSIERRA, 338, 0,
- MII_OUI_xxICPLUS, 446, 449, 378, 0,
+ MII_OUI_xxICPLUS, 453, 456, 378, 0,
MII_OUI_xxMARVELL, 236, 186, 0,
MII_OUI_xxINTEL, 305, 0,
MII_OUI_xxBROADCOM_ALT1, 109, 118, 0,
MII_OUI_yyINTEL, 305, 0,
MII_OUI_yyASIX, 441, 186, 0,
- MII_OUI_xxVITESSE, 454, 186, 0,
+ MII_OUI_xxVITESSE, 461, 186, 0,
MII_OUI_xxPMCSIERRA2, 338, 0,
- MII_OUI_xxCICADA, 462, 186, 0,
- MII_OUI_xxRDC, 469, 186, 0,
+ MII_OUI_xxCICADA, 469, 186, 0,
+ MII_OUI_xxRDC, 476, 186, 0,
MII_OUI_xxMAXLINEAR, 419, 0,
MII_OUI_xxNATSEMI, 384, 186, 0,
MII_OUI_xxLEVEL1, 228, 234, 0,
@@ -113,479 +114,479 @@ static const uint32_t mii_vendors[] = {
static const uint32_t mii_products[] = {
MII_OUI_AGERE, MII_MODEL_AGERE_ET1011,
- 473, 480, 497, 0,
+ 480, 487, 504, 0,
MII_OUI_AGERE, MII_MODEL_AGERE_ET1011C,
- 501, 480, 497, 0,
+ 508, 487, 504, 0,
MII_OUI_xxASIX, MII_MODEL_xxASIX_AX88X9X,
- 509, 517, 497, 0,
+ 516, 524, 504, 0,
MII_OUI_yyASIX, MII_MODEL_yyASIX_AX88772,
- 526, 517, 497, 0,
+ 533, 524, 504, 0,
MII_OUI_yyASIX, MII_MODEL_yyASIX_AX88772A,
- 534, 517, 497, 0,
+ 541, 524, 504, 0,
MII_OUI_yyASIX, MII_MODEL_yyASIX_AX88772B,
- 543, 517, 497, 0,
+ 550, 524, 504, 0,
MII_OUI_ALTIMA, MII_MODEL_ALTIMA_ACXXX,
- 552, 558, 565, 571, 0,
+ 559, 565, 572, 578, 0,
MII_OUI_ALTIMA, MII_MODEL_ALTIMA_AC101L,
- 581, 558, 565, 571, 0,
+ 588, 565, 572, 578, 0,
MII_OUI_ALTIMA, MII_MODEL_ALTIMA_AC101,
- 588, 558, 565, 571, 0,
+ 595, 565, 572, 578, 0,
MII_OUI_ALTIMA, MII_MODEL_ALTIMA_Am79C875,
- 594, 558, 565, 571, 0,
+ 601, 565, 572, 578, 0,
MII_OUI_ALTIMA, MII_MODEL_ALTIMA_Am79C874,
- 603, 558, 565, 571, 0,
+ 610, 565, 572, 578, 0,
MII_OUI_AMLOGIC, MII_MODEL_AMLOGIC_GXL,
- 612, 618, 517, 497, 0,
+ 619, 625, 524, 504, 0,
MII_OUI_xxAMLOGIC, MII_MODEL_xxAMLOGIC_GXL,
- 612, 618, 517, 497, 0,
+ 619, 625, 524, 504, 0,
MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_L1,
- 622, 625, 497, 0,
+ 629, 632, 504, 0,
MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_L2,
- 637, 558, 497, 0,
+ 644, 565, 504, 0,
MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_AR8021,
- 640, 648, 625, 497, 0,
+ 647, 655, 632, 504, 0,
MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_AR8035,
- 640, 655, 625, 497, 0,
+ 647, 662, 632, 504, 0,
MII_OUI_yyAMD, MII_MODEL_yyAMD_79C972_10T,
- 662, 517, 671, 571, 0,
+ 669, 524, 678, 578, 0,
MII_OUI_yyAMD, MII_MODEL_yyAMD_79c973phy,
-
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Oct 6 15:38:31 UTC 2024 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.159 -r1.160 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Oct 6 15:38:11 UTC 2024 Modified Files: src/sys/dev/mii: miidevs Log Message: Add ADMTek. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.172 src/sys/dev/mii/miidevs:1.173 --- src/sys/dev/mii/miidevs:1.172 Wed Jul 17 13:37:05 2024 +++ src/sys/dev/mii/miidevs Sun Oct 6 15:38:11 2024 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.172 2024/07/17 13:37:05 msaitoh Exp $ +$NetBSD: miidevs,v 1.173 2024/10/06 15:38:11 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -106,6 +106,7 @@ oui xxDAVICOM 0x000676 Davicom Semicon oui xxAMLOGIC 0x00068a Amlogic oui xxQUALSEMI 0x00068a Quality Semiconductor oui xxREALTEK 0x000732 Realtek +oui xxADMTEK 0x000749 ADMTek oui xxBROADCOM 0x000818 Broadcom Corporation oui xxPMCSIERRA 0x0009c0 PMC-Sierra oui xxICPLUS 0x0009c3 IC Plus Corp.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Sun Oct 6 15:38:11 UTC 2024 Modified Files: src/sys/dev/mii: miidevs Log Message: Add ADMTek. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Sun Oct 6 15:36:05 UTC 2024 Modified Files: src/sys/arch/x86/x86: procfs_machdep.c Log Message: Add AMD svsm bit for x86's /proc/cpuinfo To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/x86/x86/procfs_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/procfs_machdep.c diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.48 src/sys/arch/x86/x86/procfs_machdep.c:1.49 --- src/sys/arch/x86/x86/procfs_machdep.c:1.48 Mon Aug 7 09:27:14 2023 +++ src/sys/arch/x86/x86/procfs_machdep.c Sun Oct 6 15:36:05 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_machdep.c,v 1.48 2023/08/07 09:27:14 msaitoh Exp $ */ +/* $NetBSD: procfs_machdep.c,v 1.49 2024/10/06 15:36:05 msaitoh Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.48 2023/08/07 09:27:14 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.49 2024/10/06 15:36:05 msaitoh Exp $"); #include #include @@ -202,7 +202,7 @@ static const char * const x86_features[] "sme", "sev", NULL, "sev_es", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + NULL, NULL, NULL, NULL, "svsm", NULL, NULL, NULL}, }; static int procfs_getonecpu(int, struct cpu_info *, char *, size_t *);
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Sun Oct 6 15:36:05 UTC 2024 Modified Files: src/sys/arch/x86/x86: procfs_machdep.c Log Message: Add AMD svsm bit for x86's /proc/cpuinfo To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/x86/x86/procfs_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jakllsch Date: Sun Oct 6 14:08:58 UTC 2024 Modified Files: src/sys/dev/usb: uhci.c Log Message: Simplify/optimize usb_syncmem() in uhci_device_isoc_done() Matches ohci(4) To generate a diff of this commit: cvs rdiff -u -r1.318 -r1.319 src/sys/dev/usb/uhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Sun Oct 6 14:08:58 UTC 2024
Modified Files:
src/sys/dev/usb: uhci.c
Log Message:
Simplify/optimize usb_syncmem() in uhci_device_isoc_done()
Matches ohci(4)
To generate a diff of this commit:
cvs rdiff -u -r1.318 -r1.319 src/sys/dev/usb/uhci.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/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.318 src/sys/dev/usb/uhci.c:1.319
--- src/sys/dev/usb/uhci.c:1.318 Fri Apr 5 18:57:10 2024
+++ src/sys/dev/usb/uhci.c Sun Oct 6 14:08:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.318 2024/04/05 18:57:10 riastradh Exp $ */
+/* $NetBSD: uhci.c,v 1.319 2024/10/06 14:08:58 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2016, 2020 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.318 2024/04/05 18:57:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.319 2024/10/06 14:08:58 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -3132,7 +3132,6 @@ uhci_device_isoc_done(struct usbd_xfer *
uhci_softc_t *sc __diagused = UHCI_XFER2SC(xfer);
struct uhci_pipe *upipe = UHCI_PIPE2UPIPE(xfer->ux_pipe);
struct uhci_xfer *ux = UHCI_XFER2UXFER(xfer);
- int i, offs;
int rd = UE_GET_DIR(upipe->pipe.up_endpoint->ue_edesc->bEndpointAddress) == UE_DIR_IN;
UHCIHIST_FUNC(); UHCIHIST_CALLED();
@@ -3164,12 +3163,9 @@ uhci_device_isoc_done(struct usbd_xfer *
sizeof(ux->ux_stdend->td.td_status),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
- offs = 0;
- for (i = 0; i < xfer->ux_nframes; i++) {
- usb_syncmem(&xfer->ux_dmabuf, offs, xfer->ux_frlengths[i],
+ if (xfer->ux_length)
+ usb_syncmem(&xfer->ux_dmabuf, 0, xfer->ux_length,
rd ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
- offs += xfer->ux_frlengths[i];
- }
}
void
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Sun Oct 6 09:32:31 UTC 2024 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add some unknown CPUID bits for AMD. To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Sun Oct 6 09:32:31 UTC 2024 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add some unknown CPUID bits for AMD. To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.213 src/sys/arch/x86/include/specialreg.h:1.214 --- src/sys/arch/x86/include/specialreg.h:1.213 Sun Oct 6 08:49:12 2024 +++ src/sys/arch/x86/include/specialreg.h Sun Oct 6 09:32:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.213 2024/10/06 08:49:12 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.214 2024/10/06 09:32:31 msaitoh Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -956,7 +956,8 @@ "\21" "VGIF" "\22" "GMET" "\23x2AVIC" "\24SSSCHECK" \ "\25" "SPEC_CTRL" "\26" "ROGPT" "\30HOST_MCE_OVERRIDE" \ "\31" "TLBICTL" "\32VNMI" "\33IBSVIRT" "\34ExtLvtOffsetFaultChg" \ - "\35VmcbAddrChkChg" "\36BusLockThreshold" "\37IdleHltIntercept" + "\35VmcbAddrChkChg" "\36BusLockThreshold" "\37IdleHltIntercept" \ + "\40B31" /* * AMD Instruction-Based Sampling Capabilities. @@ -980,7 +981,9 @@ "\1IBSFFV" "\2FetchSam" "\3OpSam" "\4RdWrOpCnt" \ "\5OpCnt" "\6BrnTrgt" "\7OpCntExt" "\10RipInvalidChk" \ "\11OpBrnFuse" "\12IbsFetchCtlExtd" "\13IbsOpData4" \ - "\14IbsL3MissFiltering" + "\14IbsL3MissFiltering" \ + "\15B12" \ + "\24B19" /* * AMD Cache Topology Information. @@ -1084,8 +1087,11 @@ "\3LfenceAlwaysSerialize" "\4SmmPgCfgLock"\ "\7NullSelectClearsBase" "\10UpperAddressIgnore" \ "\11AutomaticIBRS" "\12NoSmmCtlMSR" "\13FSRS" "\14FSRC" \ - "\16PrefetchCtlMSR" \ - "\22CpuidUserDis" "\23EPSF" + "\15B12" "\16PrefetchCtlMSR" "\17B14" "\20B15" \ + "\21B16" "\22CpuidUserDis" "\23EPSF" "\24B19" \ + "\25B20" "\26B21" \ + "\31B24" "\34B27" \ + "\35B28""\37B30" /* * AMD Extended Performance Monitoring and Debug
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Sun Oct 6 08:49:12 UTC 2024 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add some CPUID bits for AMD. To generate a diff of this commit: cvs rdiff -u -r1.212 -r1.213 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Sun Oct 6 08:49:12 UTC 2024 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add some CPUID bits for AMD. To generate a diff of this commit: cvs rdiff -u -r1.212 -r1.213 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.212 src/sys/arch/x86/include/specialreg.h:1.213 --- src/sys/arch/x86/include/specialreg.h:1.212 Mon Jul 1 19:40:03 2024 +++ src/sys/arch/x86/include/specialreg.h Sun Oct 6 08:49:12 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.212 2024/07/01 19:40:03 andvar Exp $ */ +/* $NetBSD: specialreg.h,v 1.213 2024/10/06 08:49:12 msaitoh Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -883,6 +883,7 @@ #define CPUID_CAPEX_PREFER_IBRS __BIT(18) /* IBRS preferred */ #define CPUID_CAPEX_IBRS_SAMEMODE __BIT(19) /* IBRS same speculation limits */ #define CPUID_CAPEX_EFER_LSMSLE_UN __BIT(20) /* EFER.LMSLE is unsupported */ +#define CPUID_CAPEX_INVLPGB_NEST __BIT(21) /* INVLPGB nested translation */ #define CPUID_CAPEX_AMD_PPIN __BIT(23) /* Protected Processor Inventory Number */ #define CPUID_CAPEX_SSBD __BIT(24) /* Speculation Control SSBD */ #define CPUID_CAPEX_VIRT_SSBD __BIT(25) /* Virt Spec Control SSBD */ @@ -899,7 +900,7 @@ "\15IBPB" "\16INT_WBINVD" "\17IBRS" "\20STIBP" \ "\21IBRS_ALWAYSON" "\22STIBP_ALWAYSON" "\23PREFER_IBRS" \ "\24IBRS_SAMEMODE" \ - "\25EFER_LSMSLE_UN""\30PPIN" \ + "\25EFER_LSMSLE_UN" "\26INVLPGB_NEST" "\30PPIN" \ "\31SSBD" "\32VIRT_SSBD" "\33SSB_NO" "\34CPPC" \ "\35PSFD" "\36BTC_NO" "\37IBPB_RET" @@ -925,6 +926,7 @@ #define CPUID_AMD_SVM_VMCBCleanBits __BIT(5) /* VMCB Clean Bits support */ #define CPUID_AMD_SVM_FlushByASID __BIT(6) /* Flush by ASID */ #define CPUID_AMD_SVM_DecodeAssist__BIT(7) /* Decode Assists support */ +#define CPUID_AMD_SVM_PmcVirt __BIT(8) /* PMC Virtualization */ #define CPUID_AMD_SVM_PauseFilter __BIT(10) /* PAUSE intercept filter */ #define CPUID_AMD_SVM_PFThreshold __BIT(12) /* PAUSE filter threshold */ #define CPUID_AMD_SVM_AVIC __BIT(13) /* Advanced Virt. Intr. Ctrl */ @@ -932,7 +934,7 @@ #define CPUID_AMD_SVM_vGIF __BIT(16) /* Virtualized GIF */ #define CPUID_AMD_SVM_GMET __BIT(17) /* Guest Mode Execution Trap */ #define CPUID_AMD_SVM_X2AVIC __BIT(18) /* Virt. Intr. Ctrl 4 x2APIC */ -#define CPUID_AMD_SVM_SSSCHECK __BIT(19) /* Shadow Stack restrictions */ +#define CPUID_AMD_SVM_SSSCHECK __BIT(19) /* Shadow Stack restrictions */ #define CPUID_AMD_SVM_SPEC_CTRL __BIT(20) /* SPEC_CTRL virtualization */ #define CPUID_AMD_SVM_ROGPT __BIT(21) /* Read-Only Guest PTable */ #define CPUID_AMD_SVM_HOST_MCE_OVERRIDE __BIT(23) /* #MC intercept */ @@ -942,19 +944,19 @@ #define CPUID_AMD_SVM_XLVTOFFFLTCHG __BIT(27) /* Ext LVToffset FLT changed */ #define CPUID_AMD_SVM_VMCBADRCHKCHG __BIT(28) /* VMCB addr check changed */ #define CPUID_AMD_SVM_BUSLOCKTHRESH __BIT(29) /* Bus Lock Threshold */ - +#define CPUID_AMD_SVM_IDLEHLTINTERCEPT __BIT(30) /* Idle HLT Intercept */ #define CPUID_AMD_SVM_FLAGS "\20" \ "\1" "NP" "\2" "LbrVirt" "\3" "SVML" "\4" "NRIPS" \ "\5" "TSCRate" "\6" "VMCBCleanBits" \ "\7" "FlushByASID" "\10" "DecodeAssist" \ - "\11" "B08" "\12" "B09" "\13" "PauseFilter" "\14" "B11" \ + "\11PmcVirt" "\12" "B09" "\13" "PauseFilter" "\14" "B11" \ "\15" "PFThreshold" "\16" "AVIC" "\17" "B14" \ "\20" "V_VMSAVE_VMLOAD" \ "\21" "VGIF" "\22" "GMET" "\23x2AVIC" "\24SSSCHECK" \ "\25" "SPEC_CTRL" "\26" "ROGPT" "\30HOST_MCE_OVERRIDE" \ "\31" "TLBICTL" "\32VNMI" "\33IBSVIRT" "\34ExtLvtOffsetFaultChg" \ - "\35VmcbAddrChkChg" "\36BusLockThreshold" + "\35VmcbAddrChkChg" "\36BusLockThreshold" "\37IdleHltIntercept" /* * AMD Instruction-Based Sampling Capabilities. @@ -1024,7 +1026,7 @@ #define CPUID_AMD_ENCMEM_RMPQUERY __BIT(6) /* RMPQUERY instruction */ #define CPUID_AMD_ENCMEM_VMPLSSS __BIT(7) /* VMPL Secure Shadow Stack */ #define CPUID_AMD_ENCMEM_SECTSC __BIT(8) /* Secure TSC */ -#define CPUID_AMD_ENCMEM_TSCAUX_V __BIT(9) /* TSC AUX Virtualization */ +#define CPUID_AMD_ENCMEM_TSCAUX_V __BIT(9) /* TSC AUX Virtualization */ #define CPUID_AMD_ENCMEM_HECC __BIT(10) /* HW Enf Cache Coh across enc dom */ #define CPUID_AMD_ENCMEM_64BH __BIT(11) /* 64Bit Host */ #define CPUID_AMD_ENCMEM_RSTRINJ __BIT(12) /* Restricted Injection */ @@ -1032,14 +1034,19 @@ #define CPUID_AMD_ENCMEM_DBGSWAP __BIT(14) /* Debug Swap */ #define CPUID_AMD_ENCMEM_PREVHOSTIBS __BIT(15) /* Prevent Host IBS */ #define CPUID_AMD_ENCMEM_VTE __BIT(16) /* Virtual Transparent Encryption */ - #define CPUID_AMD_ENCMEM_VMGEXITP __BIT(17) /* VMGEXIT Parameter */ #define
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Sun Oct 6 08:07:58 UTC 2024 Modified Files: src/doc: CHANGES.prev Log Message: s/currentry/currently/ To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES.prev diff -u src/doc/CHANGES.prev:1.183 src/doc/CHANGES.prev:1.184 --- src/doc/CHANGES.prev:1.183 Sun May 12 23:53:45 2024 +++ src/doc/CHANGES.prev Sun Oct 6 08:07:58 2024 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.183 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.184 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -5779,7 +5779,7 @@ Changes from NetBSD 1.4 to NetBSD 1.5: mountd, nfsd: Make them more AF-independent, to handle IPv6. [fvdl 2608] compat/pecoff: Add PE/COFF (Win32) binary compatibility support. - This is currentry supports only i386. [oki 2609] + This is currently supports only i386. [oki 2609] vax: Support for spinning up the slave CPUs on a multiprocessor VAX8200 system. [ragge 2610] net: Import latest KAME ipsec policy engine. This includes
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Sun Oct 6 08:07:58 UTC 2024 Modified Files: src/doc: CHANGES.prev Log Message: s/currentry/currently/ To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/kern
On Sat, 5 Oct 2024, Michael van Elst wrote: Module Name:src Committed By: mlelstv Date: Sat Oct 5 18:04:53 UTC 2024 Modified Files: src/sys/kern: syscalls.master Log Message: New syscall requires SYSVSEM build option. Seems to me that the new syscall should be part of the SYSV module... +-+--+--+ | Paul Goyette (.sig) | PGP Key fingerprint: | E-mail addresses:| | (Retired) | 1B11 1849 721C 56C8 F63A | p...@whooppee.com| | Software Developer | 6E2E 05FD 15CE 9F2D 5102 | pgoye...@netbsd.org | | & Network Engineer | | pgoyett...@gmail.com | +-+--+--+
CVS commit: src/sys/dev/ic
Module Name:src Committed By: andvar Date: Sat Oct 5 20:20:38 UTC 2024 Modified Files: src/sys/dev/ic: mc68450reg.h Log Message: s/channes/channel/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/mc68450reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/mc68450reg.h diff -u src/sys/dev/ic/mc68450reg.h:1.5 src/sys/dev/ic/mc68450reg.h:1.6 --- src/sys/dev/ic/mc68450reg.h:1.5 Mon Apr 28 20:23:50 2008 +++ src/sys/dev/ic/mc68450reg.h Sat Oct 5 20:20:38 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: mc68450reg.h,v 1.5 2008/04/28 20:23:50 martin Exp $ */ +/* $NetBSD: mc68450reg.h,v 1.6 2024/10/05 20:20:38 andvar Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #define DMAC_NCHAN 4 /* Number of channels */ -#define DMAC_CHAN_SIZE 0x40 /* I/O area size per channes */ +#define DMAC_CHAN_SIZE 0x40 /* I/O area size per channel */ /* register location per channel */ #define DMAC_REG_CSR 0x00 /* Channel Status Register */
CVS commit: src/sys/dev/ic
Module Name:src Committed By: andvar Date: Sat Oct 5 20:20:38 UTC 2024 Modified Files: src/sys/dev/ic: mc68450reg.h Log Message: s/channes/channel/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/mc68450reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: mlelstv
Date: Sat Oct 5 18:06:42 UTC 2024
Modified Files:
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.344 -r1.345 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.332 -r1.333 src/sys/kern/syscalls.c
cvs rdiff -u -r1.48 -r1.49 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.54 -r1.55 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.131 -r1.132 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.162 -r1.163 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.327 -r1.328 src/sys/sys/syscall.h
cvs rdiff -u -r1.310 -r1.311 src/sys/sys/syscallargs.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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.344 src/sys/kern/init_sysent.c:1.345
--- src/sys/kern/init_sysent.c:1.344 Thu Oct 3 16:51:34 2024
+++ src/sys/kern/init_sysent.c Sat Oct 5 18:06:42 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.344 2024/10/03 16:51:34 christos Exp $ */
+/* $NetBSD: init_sysent.c,v 1.345 2024/10/05 18:06:42 mlelstv Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp
+ * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.344 2024/10/03 16:51:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.345 2024/10/05 18:06:42 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -2477,11 +2477,13 @@ struct sysent sysent[] = {
ns(struct sys___dup3100_args),
.sy_call = (sy_call_t *)sys___dup3100
}, /* 505 = __dup3100 */
+#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
{
ns(struct sys_semtimedop_args),
.sy_flags = SYCALL_ARG_PTR,
.sy_call = (sy_call_t *)sys_semtimedop
}, /* 506 = semtimedop */
+#endif
{
.sy_call = sys_nosys,
}, /* 507 = filler */
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.332 src/sys/kern/syscalls.c:1.333
--- src/sys/kern/syscalls.c:1.332 Thu Oct 3 16:51:35 2024
+++ src/sys/kern/syscalls.c Sat Oct 5 18:06:42 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.332 2024/10/03 16:51:35 christos Exp $ */
+/* $NetBSD: syscalls.c,v 1.333 2024/10/05 18:06:42 mlelstv Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp
+ * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.332 2024/10/03 16:51:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.333 2024/10/05 18:06:42 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#ifdef _KERNEL_OPT
@@ -556,7 +556,9 @@ const char *const syscallnames[] = {
/* 503 */ "epoll_ctl",
/* 504 */ "epoll_pwait2",
/* 505 */ "__dup3100",
+#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 506 */ "semtimedop",
+#endif
/* 507 */ "# filler",
/* 508 */ "# filler",
/* 509 */ "# filler",
@@ -1093,7 +1095,9 @@ const char *const altsyscallnames[] = {
/* 503 */ NULL, /* epoll_ctl */
/* 504 */ NULL, /* epoll_pwait2 */
/* 505 */ "dup3",
+#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 506 */ NULL, /* semtimedop */
+#endif
/* 507 */ NULL, /* filler */
/* 508 */ NULL, /* filler */
/* 509 */ NULL, /* filler */
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.48 src/sys/kern/syscalls_autoload.c:1.49
--- src/sys/kern/syscalls_autoload.c:1.48 Thu Oct 3 16:51:35 2024
+++ src/sys/kern/syscalls_autoload.c Sat Oct 5 18:06:42 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.48 2024/10/03 16:51:35 christos Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.49 2024/10/05 18:06:42 mlelstv Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp
+ * created from NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.48 2024/10/03 16:51:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.49 2024/10/05 18:06:42 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -209,5 +209,7 @@ static struct sc_autoload netbsd_syscall
#else
#endif
{ SYS_compat_100_dup3, "compat_100" },
+#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
+#endif
{ 0, NULL }
};
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_
CVS commit: src/sys
Module Name:src Committed By: mlelstv Date: Sat Oct 5 18:06:42 UTC 2024 Modified Files: src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.344 -r1.345 src/sys/kern/init_sysent.c cvs rdiff -u -r1.332 -r1.333 src/sys/kern/syscalls.c cvs rdiff -u -r1.48 -r1.49 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.54 -r1.55 src/sys/kern/systrace_args.c cvs rdiff -u -r1.131 -r1.132 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.162 -r1.163 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.327 -r1.328 src/sys/sys/syscall.h cvs rdiff -u -r1.310 -r1.311 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: mlelstv
Date: Sat Oct 5 18:04:53 UTC 2024
Modified Files:
src/sys/kern: syscalls.master
Log Message:
New syscall requires SYSVSEM build option.
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/sys/kern/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.314 src/sys/kern/syscalls.master:1.315
--- src/sys/kern/syscalls.master:1.314 Thu Oct 3 16:50:52 2024
+++ src/sys/kern/syscalls.master Sat Oct 5 18:04:53 2024
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.314 2024/10/03 16:50:52 christos Exp $
+ $NetBSD: syscalls.master,v 1.315 2024/10/05 18:04:53 mlelstv Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1065,6 +1065,8 @@
const struct timespec *timeout, \
const sigset_t *sigmask); }
505 STD RUMP { int|sys|100|dup3(int from, int to, int flags); }
+#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
506 STD { int|sys||semtimedop(int semid, \
struct sembuf *sops, size_t nsops, \
struct timespec *timeout); }
+#endif
CVS commit: src/sys/kern
Module Name:src Committed By: mlelstv Date: Sat Oct 5 18:04:53 UTC 2024 Modified Files: src/sys/kern: syscalls.master Log Message: New syscall requires SYSVSEM build option. To generate a diff of this commit: cvs rdiff -u -r1.314 -r1.315 src/sys/kern/syscalls.master 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: jdolecek Date: Sat Oct 5 14:25:45 UTC 2024 Modified Files: src/share/man/man4: nvme.4 Log Message: nvme(4) also works under Parallels Desktop, adjust the note also add hint for the Parallels Desktop VM configuration - it needs to be configured with NVMe disks starting as 'NVMe 1', otherwise namespace is not correctly configured and ld(4) is not attached To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/nvme.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/nvme.4 diff -u src/share/man/man4/nvme.4:1.11 src/share/man/man4/nvme.4:1.12 --- src/share/man/man4/nvme.4:1.11 Sat Sep 7 20:33:53 2024 +++ src/share/man/man4/nvme.4 Sat Oct 5 14:25:45 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: nvme.4,v 1.11 2024/09/07 20:33:53 rillig Exp $ +.\" $NetBSD: nvme.4,v 1.12 2024/10/05 14:25:45 jdolecek Exp $ .\" $OpenBSD: nvme.4,v 1.2 2016/04/14 11:53:37 jmc Exp $ .\" .\" Copyright (c) 2016 David Gwynne @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 27, 2017 +.Dd October 5, 2024 .Dt NVME 4 .Os .Sh NAME @@ -135,7 +135,18 @@ into older generation slot. .Pp The driver was also tested and confirmed working fine for emulated .Nm -devices under QEMU 2.8.0 and +devices under QEMU 2.8.0, .Tn Oracle .Tn VirtualBox -5.1.20. +5.1.20, +and +.Tn Parallels +Desktop 16. +.Pp +For +.Tn Parallels +Desktop, it's important the virtual machine has the NVMe disks configured +starting from 'NVMe 1', in order for the NVMe namespaces to be correctly +initialized and +.Xr ld 4 +devices to be attached.
CVS commit: src/share/man/man4
Module Name:src Committed By: jdolecek Date: Sat Oct 5 14:25:45 UTC 2024 Modified Files: src/share/man/man4: nvme.4 Log Message: nvme(4) also works under Parallels Desktop, adjust the note also add hint for the Parallels Desktop VM configuration - it needs to be configured with NVMe disks starting as 'NVMe 1', otherwise namespace is not correctly configured and ld(4) is not attached To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/nvme.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet6
Module Name:src
Committed By: roy
Date: Sat Oct 5 09:10:53 UTC 2024
Modified Files:
src/sys/netinet6: nd6_nbr.c
Log Message:
ND6: only ignore messages from the receving interface
Sync with ARP behaviour, reverts r1.163 slightly.
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/netinet6/nd6_nbr.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/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.183 src/sys/netinet6/nd6_nbr.c:1.184
--- src/sys/netinet6/nd6_nbr.c:1.183 Wed Mar 29 13:01:44 2023
+++ src/sys/netinet6/nd6_nbr.c Sat Oct 5 09:10:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.183 2023/03/29 13:01:44 kardel Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.184 2024/10/05 09:10:53 roy Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.183 2023/03/29 13:01:44 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.184 2024/10/05 09:10:53 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -677,23 +677,21 @@ nd6_na_input(struct mbuf *m, int off, in
}
if (ndopts.nd_opts_tgt_lladdr != NULL) {
- struct ifnet *ifp_ll;
- struct psref psref_ll;
-
lladdr = (char *)(ndopts.nd_opts_tgt_lladdr + 1);
lladdrlen = ndopts.nd_opts_tgt_lladdr->nd_opt_len << 3;
+ }
- if (lladdr && ((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) {
+ if (lladdr != NULL) {
+ if (((ifp->if_addrlen + 2 + 7) & ~7) != lladdrlen) {
nd6log(LOG_INFO, "lladdrlen mismatch for %s "
- "(if %d, NA packet %d)\n", IN6_PRINT(ip6buf, &taddr6),
+ "(if %d, NA packet %d)\n",
+ IN6_PRINT(ip6buf, &taddr6),
ifp->if_addrlen, lladdrlen - 2);
goto bad;
}
- ifp_ll = if_get_bylla(lladdr, ifp->if_addrlen, &psref_ll);
- if (ifp_ll != NULL) {
+ if (!memcmp(lladdr, CLLADDR(ifp->if_sadl), ifp->if_addrlen)) {
/* it's from me, ignore it. */
- if_put(ifp_ll, &psref_ll);
goto freeit;
}
}
CVS commit: src/sys/netinet6
Module Name:src Committed By: roy Date: Sat Oct 5 09:10:53 UTC 2024 Modified Files: src/sys/netinet6: nd6_nbr.c Log Message: ND6: only ignore messages from the receving interface Sync with ARP behaviour, reverts r1.163 slightly. To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/sys/netinet6/nd6_nbr.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/cadence
Module Name:src
Committed By: skrll
Date: Sat Oct 5 07:37:22 UTC 2024
Modified Files:
src/sys/dev/cadence: if_cemac.c if_cemacvar.h
Log Message:
Make cemac(4) MP safe.
Tested with qemu and
qemu-system-arm \
-kernel netbsd.ub \
-dtb zynq-zc702.dtb \
-M xilinx-zynq-a9 \
-sd armv7.img \
-append "root=ld0a -x -v" \
-serial null -serial mon:stdio \
-nographic
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/cadence/if_cemac.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/cadence/if_cemacvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.42 src/sys/dev/cadence/if_cemac.c:1.43
--- src/sys/dev/cadence/if_cemac.c:1.42 Sun Sep 29 09:13:14 2024
+++ src/sys/dev/cadence/if_cemac.c Sat Oct 5 07:37:22 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.42 2024/09/29 09:13:14 skrll Exp $ */
+/* $NetBSD: if_cemac.c,v 1.43 2024/10/05 07:37:22 skrll Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -39,8 +39,16 @@
* used by arm/at91, arm/zynq SoC
*/
+/*
+ * Lock order:
+ *
+ * IFNET_LOCK -> sc_mcast_lock
+ * IFNET_LOCK -> sc_intr_lock
+ */
+
+
#include
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.42 2024/09/29 09:13:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.43 2024/10/05 07:37:22 skrll Exp $");
#include
#include
@@ -73,6 +81,11 @@ __KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v
#include
#include
+#ifndef CEMAC_WATCHDOG_TIMEOUT
+#define CEMAC_WATCHDOG_TIMEOUT 5
+#endif
+static int cemac_watchdog_timeout = CEMAC_WATCHDOG_TIMEOUT;
+
#define DEFAULT_MDCDIV 32
#define CEMAC_READ(x) \
@@ -97,6 +110,7 @@ static void cemac_statchg(struct ifnet *
static void cemac_tick(void *);
static int cemac_ifioctl(struct ifnet *, u_long, void *);
static void cemac_ifstart(struct ifnet *);
+static void cemac_ifstart_locked(struct ifnet *);
static void cemac_ifwatchdog(struct ifnet *);
static int cemac_ifinit(struct ifnet *);
static void cemac_ifstop(struct ifnet *, int);
@@ -109,6 +123,36 @@ int cemac_debug = CEMAC_DEBUG;
#define DPRINTFN(n, fmt)
#endif
+/*
+ * Perform an interface watchdog reset.
+ */
+static void
+cemac_handle_reset_work(struct work *work, void *arg)
+{
+ struct cemac_softc * const sc = arg;
+ struct ifnet * const ifp = &sc->sc_ethercom.ec_if;
+
+ printf("%s: watchdog timeout -- resetting\n", ifp->if_xname);
+
+ /* Don't want ioctl operations to happen */
+ IFNET_LOCK(ifp);
+
+ /* reset the interface. */
+ cemac_ifinit(ifp);
+
+ IFNET_UNLOCK(ifp);
+
+ /*
+ * There are still some upper layer processing which call
+ * ifp->if_start(). e.g. ALTQ or one CPU system
+ */
+ /* Try to get more packets going. */
+ ifp->if_start(ifp);
+
+ atomic_store_relaxed(&sc->sc_reset_pending, 0);
+}
+
+
void
cemac_attach_common(struct cemac_softc *sc)
{
@@ -217,16 +261,29 @@ cemac_intr(void *arg)
#endif
int bi;
+ mutex_enter(sc->sc_intr_lock);
+ if (sc->sc_stopping) {
+ mutex_exit(sc->sc_intr_lock);
+ return 0;
+ }
+
imr = ~CEMAC_READ(ETH_IMR);
if (!(imr & (ETH_ISR_RCOM | ETH_ISR_TBRE | ETH_ISR_TIDLE |
ETH_ISR_RBNA | ETH_ISR_ROVR | ETH_ISR_TCOM))) {
// interrupt not enabled, can't be us
+ mutex_exit(sc->sc_intr_lock);
return 0;
}
isr = CEMAC_READ(ETH_ISR);
CEMAC_WRITE(ETH_ISR, isr);
isr &= imr;
+
+ if (isr == 0) {
+ mutex_exit(sc->sc_intr_lock);
+ return 0;
+ }
+
#ifdef CEMAC_DEBUG
rsr = CEMAC_READ(ETH_RSR); // get receive status register
#endif
@@ -338,10 +395,36 @@ cemac_intr(void *arg)
goto begin;
#endif
+ mutex_exit(sc->sc_intr_lock);
+
return 1;
}
+static int
+cemac_ifflags_cb(struct ethercom *ec)
+{
+ struct ifnet * const ifp = &ec->ec_if;
+ struct cemac_softc * const sc = ifp->if_softc;
+ int ret = 0;
+
+ KASSERT(IFNET_LOCKED(ifp));
+ mutex_enter(sc->sc_mcast_lock);
+
+ u_short change = ifp->if_flags ^ sc->sc_if_flags;
+ sc->sc_if_flags = ifp->if_flags;
+
+ if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
+ ret = ENETRESET;
+ } else if ((change & IFF_PROMISC) != 0) {
+ if ((sc->sc_if_flags & IFF_RUNNING) != 0)
+ cemac_setaddr(ifp);
+ }
+ mutex_exit(sc->sc_mcast_lock);
+
+ return ret;
+}
+
static void
cemac_init(struct cemac_softc *sc)
{
@@ -354,7 +437,8 @@ cemac_init(struct cemac_softc *sc)
int mdcdiv = DEFAULT_MDCDIV;
#endif
- callout_init(&sc->cemac_tick_ch, 0);
+ callout_init(&sc->cemac_tick_ch, CALLOUT_MPSAFE);
+ callout_setfunc(&sc->cemac_tick_ch, cemac_tick, sc);
// ok...
CEMAC_WRITE(ETH_CTL, ETH_CTL_MPE); // disable everything
@@ -401,6 +485,17 @@ cemac_init(struct cemac_softc *sc)
CEMAC_GEM_WRITE(SA4L, 0);
CEMAC_GEM_WRITE(SA4H, 0);
+ char wqname[MAXCOMLEN];
+ snprintf(wqname, sizeof(wqname), "%sReset", device_xname(sc->sc_dev));
+ int error = workqueue_create(&sc->sc_reset
CVS commit: src/sys/arch/x68k
Module Name:src Committed By: isaki Date: Sat Oct 5 03:56:54 UTC 2024 Modified Files: src/sys/arch/x68k/conf: GENERIC files.x68k src/sys/arch/x68k/dev: ite.c ite_tv.c itevar.h Log Message: x68k: Add SIXEL graphics sequence support. - The palette definition is fixed to the same color as the text (currently, it's RGB 8 colors). Any palette definition sent will be ignored. - Aspect ratio and bg color mode is not supported (yet). - An OR mode is supported. This is proposed by Y.Sugahara in this implementation and then the mlterm also supports it. It's an advantageous way for the multi plane color VRAM. - ITE_SIXEL kernel option is added and is disabled by default for now. It was first written by me in 2014 and has been demonstrated in Open Source Conference Hiroshima every year since then. In this year, it's also demonstrated on real X68030 at Japan NetBSD Users Group booth in OSC 2024 Hiroshima, last week. https://x.com/OSC_official/status/1841381234804498608 It's useful for showing and explaining about the possibility of NetBSD and old machines for younger (than X68030) engineers or students. To generate a diff of this commit: cvs rdiff -u -r1.209 -r1.210 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.84 -r1.85 src/sys/arch/x68k/conf/files.x68k cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x68k/dev/ite.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x68k/dev/ite_tv.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/dev/itevar.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/x68k/conf/GENERIC diff -u src/sys/arch/x68k/conf/GENERIC:1.209 src/sys/arch/x68k/conf/GENERIC:1.210 --- src/sys/arch/x68k/conf/GENERIC:1.209 Sun Jan 7 07:58:33 2024 +++ src/sys/arch/x68k/conf/GENERIC Sat Oct 5 03:56:54 2024 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.209 2024/01/07 07:58:33 isaki Exp $ +# $NetBSD: GENERIC,v 1.210 2024/10/05 03:56:54 isaki Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.209 $" +#ident "GENERIC-$Revision: 1.210 $" makeoptions COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer" # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for @@ -229,6 +229,7 @@ kbd0 at mfp0# standard keyboard ite0 at grf0 grfaddr 0 # internal terminal emulator options ITE_KERNEL_ATTR=4 # bold for kernel messages # see /sys/arch/x68k/dev/itevar.h +#options ITE_SIXEL ## floppy disks fdc0 at intio0 addr 0xe94000 intr 96 dma 0 dmaintr 100 # floppy controller Index: src/sys/arch/x68k/conf/files.x68k diff -u src/sys/arch/x68k/conf/files.x68k:1.84 src/sys/arch/x68k/conf/files.x68k:1.85 --- src/sys/arch/x68k/conf/files.x68k:1.84 Tue Jan 9 04:16:27 2024 +++ src/sys/arch/x68k/conf/files.x68k Sat Oct 5 03:56:54 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files.x68k,v 1.84 2024/01/09 04:16:27 thorpej Exp $ +# $NetBSD: files.x68k,v 1.85 2024/10/05 03:56:54 isaki Exp $ # # new style config file for x68k architecture # @@ -68,6 +68,7 @@ file arch/x68k/dev/grf_tv.c grf | ite file arch/x68k/dev/grf_gv.c grf | ite defparam opt_ite.h ITE_KERNEL_ATTR +defflag opt_ite.h ITE_SIXEL device ite : tty attach ite at grf file arch/x68k/dev/ite.c ite needs-flag Index: src/sys/arch/x68k/dev/ite.c diff -u src/sys/arch/x68k/dev/ite.c:1.71 src/sys/arch/x68k/dev/ite.c:1.72 --- src/sys/arch/x68k/dev/ite.c:1.71 Sun Jan 7 07:58:33 2024 +++ src/sys/arch/x68k/dev/ite.c Sat Oct 5 03:56:54 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: ite.c,v 1.71 2024/01/07 07:58:33 isaki Exp $ */ +/* $NetBSD: ite.c,v 1.72 2024/10/05 03:56:54 isaki Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -45,7 +45,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.71 2024/01/07 07:58:33 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.72 2024/10/05 03:56:54 isaki Exp $"); #include "ite.h" #if NITE > 0 @@ -91,6 +91,9 @@ void opm_bell(void); #define SUBR_CLEAR(ip,sy,sx,h,w) ip->isw->ite_clear(ip,sy,sx,h,w) #define SUBR_SCROLL(ip,sy,sx,count,dir) \ ip->isw->ite_scroll(ip,sy,sx,count,dir) +#if defined(ITE_SIXEL) +#define SUBR_SIXEL(ip,sy,sx) ip->isw->ite_sixel(ip,sy,sx) +#endif struct consdev; @@ -151,6 +154,9 @@ static u_char cons_tabs[MAX_TABS]; static void itestart(struct tty *); static void iteputchar(int, struct ite_softc *); +#if defined(ITE_SIXEL) +static int ite_dcs(const int, struct ite_softc *); +#endif static void ite_putstr(const u_char *, int, dev_t); static int itematch(device_t, cfdata_t, void *); @@ -1207,10 +1213,18 @@ ite_putstr(const u_char *s, int len, dev if ((ip->flags & (ITE_ACTIVE|ITE_INGRF)) != ITE_ACTIVE) return; +#if defined(ITE_SIXEL) + /* avoid flicking cursor */ + if (ip->escape == 0) +#endif SUBR_CURSOR(ip, START_CURSOROPT); for (i = 0; i < len; i++) if (s[i] != 0)
CVS commit: src/sys/arch/x68k
Module Name:src Committed By: isaki Date: Sat Oct 5 03:56:54 UTC 2024 Modified Files: src/sys/arch/x68k/conf: GENERIC files.x68k src/sys/arch/x68k/dev: ite.c ite_tv.c itevar.h Log Message: x68k: Add SIXEL graphics sequence support. - The palette definition is fixed to the same color as the text (currently, it's RGB 8 colors). Any palette definition sent will be ignored. - Aspect ratio and bg color mode is not supported (yet). - An OR mode is supported. This is proposed by Y.Sugahara in this implementation and then the mlterm also supports it. It's an advantageous way for the multi plane color VRAM. - ITE_SIXEL kernel option is added and is disabled by default for now. It was first written by me in 2014 and has been demonstrated in Open Source Conference Hiroshima every year since then. In this year, it's also demonstrated on real X68030 at Japan NetBSD Users Group booth in OSC 2024 Hiroshima, last week. https://x.com/OSC_official/status/1841381234804498608 It's useful for showing and explaining about the possibility of NetBSD and old machines for younger (than X68030) engineers or students. To generate a diff of this commit: cvs rdiff -u -r1.209 -r1.210 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.84 -r1.85 src/sys/arch/x68k/conf/files.x68k cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x68k/dev/ite.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x68k/dev/ite_tv.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/dev/itevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: roy
Date: Fri Oct 4 23:31:06 UTC 2024
Modified Files:
src/sys/netinet: if_arp.c
Log Message:
ARP: only ignore messages from the receving interface
This means that you can no longer share the same IP addresses
on different interfaces connected to the same subnet.
This was a very non standard solution and you can now
get the same functionality by using lagg(4) instead.
While here, flip log movements sysctl back to 1.
This reverts r1.253 and r1.286.
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/sys/netinet/if_arp.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/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.315 src/sys/netinet/if_arp.c:1.316
--- src/sys/netinet/if_arp.c:1.315 Mon Sep 9 07:25:32 2024
+++ src/sys/netinet/if_arp.c Fri Oct 4 23:31:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.315 2024/09/09 07:25:32 ozaki-r Exp $ */
+/* $NetBSD: if_arp.c,v 1.316 2024/10/04 23:31:06 roy Exp $ */
/*
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.315 2024/09/09 07:25:32 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.316 2024/10/04 23:31:06 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -217,7 +217,7 @@ static struct ifnet *myip_ifp = NULL;
static int arp_drainwanted;
-static int log_movements = 0;
+static int log_movements = 1;
static int log_permanent_modify = 1;
static int log_wrong_iface = 1;
@@ -793,14 +793,6 @@ in_arpinput(struct mbuf *m)
if (ah->ar_pln != sizeof(struct in_addr))
goto out;
- ifp = if_get_bylla(ar_sha(ah), ah->ar_hln, &psref);
- if (ifp) {
- /* it's from me, ignore it. */
- if_put(ifp, &psref);
- ARP_STATINC(ARP_STAT_RCVLOCALSHA);
- goto out;
- }
-
rcvif = ifp = m_get_rcvif_psref(m, &psref);
if (__predict_false(rcvif == NULL))
goto out;
@@ -911,6 +903,12 @@ again:
myaddr = ia->ia_addr.sin_addr;
/* XXX checks for bridge case? */
+ if (!memcmp(ar_sha(ah), CLLADDR(ifp->if_sadl), ifp->if_addrlen)) {
+ ARP_STATINC(ARP_STAT_RCVLOCALSHA);
+ goto out; /* it's from me, ignore it. */
+ }
+
+ /* XXX checks for bridge case? */
if (!memcmp(ar_sha(ah), ifp->if_broadcastaddr, ifp->if_addrlen)) {
ARP_STATINC(ARP_STAT_RCVBCASTSHA);
log(LOG_ERR,
CVS commit: src/sys/netinet
Module Name:src Committed By: roy Date: Fri Oct 4 23:31:06 UTC 2024 Modified Files: src/sys/netinet: if_arp.c Log Message: ARP: only ignore messages from the receving interface This means that you can no longer share the same IP addresses on different interfaces connected to the same subnet. This was a very non standard solution and you can now get the same functionality by using lagg(4) instead. While here, flip log movements sysctl back to 1. This reverts r1.253 and r1.286. To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/sys/netinet/if_arp.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/compiler_rt
Module Name:src
Committed By: christos
Date: Fri Oct 4 20:35:58 UTC 2024
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
more clang lint appeasing
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.50 src/lib/libc/compiler_rt/Makefile.inc:1.51
--- src/lib/libc/compiler_rt/Makefile.inc:1.50 Fri Jun 7 16:50:27 2024
+++ src/lib/libc/compiler_rt/Makefile.inc Fri Oct 4 16:35:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.50 2024/06/07 20:50:27 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.51 2024/10/04 20:35:58 christos Exp $
COMPILER_RT_DIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt
COMPILER_RT_SRCDIR= ${COMPILER_RT_DIR}/dist
@@ -434,5 +434,6 @@ LINTFLAGS.udivsi3.c += -X 117
LINTFLAGS.udivti3.c += -X 351
LINTFLAGS.umodsi3.c += -X 351
LINTFLAGS.umodti3.c += -X 351
+LINTFLAGS.gcc_personality_v0.c += ${${ACTIVE_CC} == "clang":? -X 298:}
.include "${COMPILER_RT_DIR}/abi.mk"
CVS commit: src/lib/libc/compiler_rt
Module Name:src Committed By: christos Date: Fri Oct 4 20:35:58 UTC 2024 Modified Files: src/lib/libc/compiler_rt: Makefile.inc Log Message: more clang lint appeasing To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/lib/libc/compiler_rt/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/pwd_mkdb
Module Name:src Committed By: christos Date: Fri Oct 4 20:32:20 UTC 2024 Modified Files: src/usr.sbin/pwd_mkdb: pwd_mkdb.c Log Message: add some static. remove trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/pwd_mkdb/pwd_mkdb.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/pwd_mkdb
Module Name:src
Committed By: christos
Date: Fri Oct 4 20:32:20 UTC 2024
Modified Files:
src/usr.sbin/pwd_mkdb: pwd_mkdb.c
Log Message:
add some static. remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/pwd_mkdb/pwd_mkdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/pwd_mkdb/pwd_mkdb.c
diff -u src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.60 src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.61
--- src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.60 Fri Jan 19 14:08:49 2024
+++ src/usr.sbin/pwd_mkdb/pwd_mkdb.c Fri Oct 4 16:32:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pwd_mkdb.c,v 1.60 2024/01/19 19:08:49 christos Exp $ */
+/* $NetBSD: pwd_mkdb.c,v 1.61 2024/10/04 20:32:20 christos Exp $ */
/*
* Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@ __COPYRIGHT("@(#) Copyright (c) 2000, 20
The NetBSD Foundation, Inc. All rights reserved.\
Copyright (c) 1991, 1993, 1994\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: pwd_mkdb.c,v 1.60 2024/01/19 19:08:49 christos Exp $");
+__RCSID("$NetBSD: pwd_mkdb.c,v 1.61 2024/10/04 20:32:20 christos Exp $");
#endif /* not lint */
#if HAVE_NBTOOL_CONFIG_H
@@ -166,23 +166,23 @@ static int warning;
static struct pwddb sdb, idb;
-void bailout(void) __dead;
-void cp(const char *, const char *, mode_t);
-void deldbent(struct pwddb *, int, void *);
-void mkpw_error(const char *, ...) __dead;
-void mkpw_warning(const char *, ...);
-int getdbent(struct pwddb *, int, void *, struct passwd **);
-void inconsistency(void) __dead;
-void install(const char *, const char *);
-void putdbents(struct pwddb *, struct passwd *, const char *, int, int,
-u_int, u_int);
-void putyptoken(struct pwddb *);
-void rm(const char *);
-int scan(FILE *, struct passwd *, int *, int *);
-void usage(void) __dead;
-void wr_error(const char *) __dead;
-uint32_t getversion(const char *);
-void setversion(struct pwddb *);
+static void bailout(void) __dead;
+static void cp(const char *, const char *, mode_t);
+static void deldbent(struct pwddb *, int, void *);
+static void mkpw_error(const char *, ...) __dead;
+static void mkpw_warning(const char *, ...);
+static int getdbent(struct pwddb *, int, void *, struct passwd **);
+static void inconsistency(void) __dead;
+static void install(const char *, const char *);
+static void putdbents(struct pwddb *, struct passwd *, const char *, int,
+int, u_int, u_int);
+static void putyptoken(struct pwddb *);
+static void rm(const char *);
+static int scan(FILE *, struct passwd *, int *, int *);
+static void usage(void) __dead;
+static void wr_error(const char *) __dead;
+static uint32_t getversion(const char *);
+static void setversion(struct pwddb *);
#ifndef __lint__
#define SWAP(sw) \
@@ -381,7 +381,7 @@ main(int argc, char *argv[])
flags, PERM_INSECURE);
clean |= FILE_INSECURE;
}
-
+
/* Open the temporary encrypted password database. */
opendb(&sdb, _PATH_SMP_DB, username, req_version, flags, PERM_SECURE);
@@ -581,7 +581,7 @@ main(int argc, char *argv[])
/* NOTREACHED */
}
-int
+static int
scan(FILE *fp, struct passwd *pw, int *flags, int *lineno)
{
static char line[LINE_MAX];
@@ -616,7 +616,7 @@ scan(FILE *fp, struct passwd *pw, int *f
return (1);
}
-void
+static void
install(const char *from, const char *to)
{
char buf[MAXPATHLEN];
@@ -626,7 +626,7 @@ install(const char *from, const char *to
mkpw_error("Cannot rename `%s' to `%s'", from, buf);
}
-void
+static void
rm(const char *victim)
{
@@ -634,9 +634,9 @@ rm(const char *victim)
warn("unlink(%s)", victim);
}
-void
-cp(const char *from, const char *to, mode_t mode)
-{
+static void
+cp(const char *from, const char *to, mode_t mode)
+{
static char buf[MAXBSIZE];
int from_fd, to_fd;
ssize_t rcount, wcount;
@@ -667,13 +667,13 @@ on_error:
mkpw_error("Cannot copy `%s' to `%s'", from, to);
}
-void
+static void
wr_error(const char *str)
{
mkpw_error("Cannot write `%s'", str);
}
-void
+static void
mkpw_error(const char *fmt, ...)
{
va_list ap;
@@ -690,7 +690,7 @@ mkpw_error(const char *fmt, ...)
bailout();
}
-void
+static void
mkpw_warning(const char *fmt, ...)
{
va_list ap;
@@ -702,7 +702,7 @@ mkpw_warning(const char *fmt, ...)
va_end(ap);
}
-void
+static void
inconsistency(void)
{
@@ -711,7 +711,7 @@ inconsistency(void)
bailout();
}
-void
+static void
bailout(void)
{
@@ -725,7 +725,7 @@ bailout(void)
exit(EXIT_FAILURE);
}
-uint32_t
+static uint32_t
getversion(const char *fname)
{
DBT data, key;
@@ -772,7 +772,7 @@ out:
/*NOTREACHED*/
}
-void
+static void
setversion(struct pwddb *db)
{
DBT data, key;
@@ -790,7 +790,7 @@ setversion(struct pwddb *db)
/*
- * Write entries to a database for a single user.
+ * Write entries
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: christos
Date: Fri Oct 4 18:06:53 UTC 2024
Modified Files:
src/usr.bin/ftp: extern.h ftp.c
Log Message:
remove const when string gets overwritten.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/ftp/extern.h
cvs rdiff -u -r1.177 -r1.178 src/usr.bin/ftp/ftp.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/ftp/extern.h
diff -u src/usr.bin/ftp/extern.h:1.83 src/usr.bin/ftp/extern.h:1.84
--- src/usr.bin/ftp/extern.h:1.83 Sat Feb 25 07:07:25 2023
+++ src/usr.bin/ftp/extern.h Fri Oct 4 14:06:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.83 2023/02/25 12:07:25 mlelstv Exp $ */
+/* $NetBSD: extern.h,v 1.84 2024/10/04 18:06:53 christos Exp $ */
/*-
* Copyright (c) 1996-2023 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@ char *getoptionvalue(const char *);
void getremoteinfo(void);
int getreply(int);
char *globulize(const char *);
-char *gunique(const char *);
+char *gunique(char *);
void help(int, char **);
char *hookup(const char *, const char *);
void idlecmd(int, char **);
@@ -176,7 +176,7 @@ void quit(int, char **);
void justquit(void) __dead;
void quote(int, char **);
void quote1(const char *, int, char **);
-void recvrequest(const char *, const char *, const char *,
+void recvrequest(const char *, char *, const char *,
const char *, int, int);
void reget(int, char **);
char *remglob(char **, int, const char **);
Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.177 src/usr.bin/ftp/ftp.c:1.178
--- src/usr.bin/ftp/ftp.c:1.177 Wed Sep 25 12:53:58 2024
+++ src/usr.bin/ftp/ftp.c Fri Oct 4 14:06:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.177 2024/09/25 16:53:58 christos Exp $ */
+/* $NetBSD: ftp.c,v 1.178 2024/10/04 18:06:53 christos Exp $ */
/*-
* Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID("$NetBSD: ftp.c,v 1.177 2024/09/25 16:53:58 christos Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.178 2024/10/04 18:06:53 christos Exp $");
#endif
#endif /* not lint */
@@ -925,7 +925,7 @@ sendrequest(const char *cmd, const char
}
void
-recvrequest(const char *cmd, const char *volatile local, const char *remote,
+recvrequest(const char *cmd, char *volatile local, const char *remote,
const char *lmode, int printnames, int ignorespecial)
{
FILE *volatile fout;
@@ -2037,7 +2037,7 @@ reset(int argc, char *argv[])
}
char *
-gunique(const char *local)
+gunique(char *local)
{
static char new[MAXPATHLEN];
char *cp = strrchr(local, '/');
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: christos Date: Fri Oct 4 18:06:53 UTC 2024 Modified Files: src/usr.bin/ftp: extern.h ftp.c Log Message: remove const when string gets overwritten. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/usr.bin/ftp/extern.h cvs rdiff -u -r1.177 -r1.178 src/usr.bin/ftp/ftp.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/ftp
Module Name:src
Committed By: christos
Date: Fri Oct 4 18:06:19 UTC 2024
Modified Files:
src/usr.bin/ftp: progressbar.c
Log Message:
use unsigned when doing shifts.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/ftp/progressbar.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/ftp/progressbar.c
diff -u src/usr.bin/ftp/progressbar.c:1.26 src/usr.bin/ftp/progressbar.c:1.27
--- src/usr.bin/ftp/progressbar.c:1.26 Wed Sep 25 12:53:58 2024
+++ src/usr.bin/ftp/progressbar.c Fri Oct 4 14:06:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: progressbar.c,v 1.26 2024/09/25 16:53:58 christos Exp $ */
+/* $NetBSD: progressbar.c,v 1.27 2024/10/04 18:06:19 christos Exp $ */
/*-
* Copyright (c) 1997-2024 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: progressbar.c,v 1.26 2024/09/25 16:53:58 christos Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.27 2024/10/04 18:06:19 christos Exp $");
#endif /* not lint */
/*
@@ -123,12 +123,12 @@ static struct timeval lastupdate;
void
progressmeter(int flag)
{
- static off_t lastsize;
- off_t cursize;
+ static uint64_t lastsize;
+ uint64_t cursize;
struct timeval now, wait;
#ifndef NO_PROGRESS
struct timeval td;
- off_t abbrevsize, bytespersec;
+ uint64_t abbrevsize, bytespersec;
double elapsed;
int ratio, i, remaining, barlength;
@@ -261,7 +261,7 @@ progressmeter(int flag)
suffixes[i]);
if (filesize > 0) {
- if (bytes <= 0 || elapsed <= 0.0 || cursize > filesize) {
+ if (bytes <= 0 || elapsed <= 0.0 || cursize > (uint64_t)filesize) {
len += snprintf(buf + len, BUFLEFT, " --:-- ETA");
} else if (wait.tv_sec >= STALLTIME) {
len += snprintf(buf + len, BUFLEFT, " - stalled -");
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: christos Date: Fri Oct 4 18:06:19 UTC 2024 Modified Files: src/usr.bin/ftp: progressbar.c Log Message: use unsigned when doing shifts. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/ftp/progressbar.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/ftp
Module Name:src Committed By: christos Date: Fri Oct 4 18:05:44 UTC 2024 Modified Files: src/usr.bin/ftp: cmds.c Log Message: Check bounds when copying to destination. Remove const where the const string ended up being overwritten. To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/usr.bin/ftp/cmds.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/ftp
Module Name:src
Committed By: christos
Date: Fri Oct 4 18:05:44 UTC 2024
Modified Files:
src/usr.bin/ftp: cmds.c
Log Message:
Check bounds when copying to destination.
Remove const where the const string ended up being overwritten.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/usr.bin/ftp/cmds.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/ftp/cmds.c
diff -u src/usr.bin/ftp/cmds.c:1.143 src/usr.bin/ftp/cmds.c:1.144
--- src/usr.bin/ftp/cmds.c:1.143 Wed Sep 25 12:53:58 2024
+++ src/usr.bin/ftp/cmds.c Fri Oct 4 14:05:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.143 2024/09/25 16:53:58 christos Exp $ */
+/* $NetBSD: cmds.c,v 1.144 2024/10/04 18:05:43 christos Exp $ */
/*-
* Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: cmds.c,v 1.143 2024/09/25 16:53:58 christos Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.144 2024/10/04 18:05:43 christos Exp $");
#endif
#endif /* not lint */
@@ -147,10 +147,10 @@ __dead static void mintr(int);
static void mabort(const char *);
static void set_type(const char *);
-static const char *doprocess(char *, size_t, const char *, int, int, int);
-static const char *domap(char *, size_t, const char *);
-static const char *docase(char *, size_t, const char *);
-static const char *dotrans(char *, size_t, const char *);
+static char *doprocess(char *, size_t, char *, int, int, int);
+static char *domap(char *, size_t, const char *);
+static char *docase(char *, size_t, const char *);
+static char *dotrans(char *, size_t, const char *);
/*
* Confirm if "cmd" is to be performed upon "file".
@@ -407,7 +407,7 @@ put(int argc, char *argv[])
const char *cmd;
int loc = 0;
char *locfile;
- const char *remfile;
+ char *remfile;
if (argc == 2) {
argc++;
@@ -437,8 +437,8 @@ put(int argc, char *argv[])
free(locfile);
}
-static const char *
-doprocess(char *dst, size_t dlen, const char *src,
+static char *
+doprocess(char *dst, size_t dlen, char *src,
int casef, int transf, int mapf)
{
if (casef)
@@ -576,8 +576,7 @@ int
getit(int argc, char *argv[], int restartit, const char *gmode)
{
int loc, rval;
- char *remfile, *olocfile;
- const char *locfile;
+ char *remfile, *olocfile, *locfile;
char buf[MAXPATHLEN];
loc = rval = 0;
@@ -684,8 +683,7 @@ mget(int argc, char *argv[])
{
sigfunc oldintr;
int ointer;
- char *cp;
- const char *tp;
+ char *cp, *tp;
int volatile restartit;
if (argc == 0 ||
@@ -1290,13 +1288,11 @@ void
ls(int argc, char *argv[])
{
const char *cmd;
- char *remdir, *locbuf;
- const char *locfile;
+ char *remdir, *locbuf, *locfile;
int pagecmd, mlsdcmd;
remdir = NULL;
locbuf = NULL;
- locfile = "-";
pagecmd = mlsdcmd = 0;
/*
* the only commands that start with `p' are
@@ -1326,6 +1322,8 @@ ls(int argc, char *argv[])
remdir = argv[1];
if (argc > 2)
locfile = argv[2];
+ else
+ locfile = locbuf = ftp_strdup("-");
if (argc > 3 || ((pagecmd | mlsdcmd) && argc > 2)) {
usage:
if (pagecmd || mlsdcmd)
@@ -1345,11 +1343,12 @@ ls(int argc, char *argv[])
if (EMPTYSTRING(p))
p = DEFAULTPAGER;
len = strlen(p) + 2;
+ free(locbuf);
locbuf = ftp_malloc(len);
locbuf[0] = '|';
(void)strlcpy(locbuf + 1, p, len - 1);
locfile = locbuf;
- } else if ((strcmp(locfile, "-") != 0) && *locfile != '|') {
+ } else if (locfile != locbuf) {
if ((locbuf = globulize(locfile)) == NULL ||
!confirm("output to local-file:", locbuf)) {
code = -1;
@@ -1920,7 +1919,7 @@ setcase(int argc, char *argv[])
* convert the given name to lower case if it's all upper case, into
* a static buffer which is returned to the caller
*/
-static const char *
+static char *
docase(char *dst, size_t dlen, const char *src)
{
size_t i;
@@ -1973,7 +1972,14 @@ setntrans(int argc, char *argv[])
(void)strlcpy(ntout, argv[2], sizeof(ntout));
}
-static const char *
+#define ADDC(x) \
+ do { \
+ *cp2++ = x; \
+ if (cp2 - dst >= (ptrdiff_t)(dlen - 1)) \
+ goto out; \
+ } while (0)
+
+static char *
dotrans(char *dst, size_t dlen, const char *src)
{
const char *cp1;
@@ -1988,15 +1994,13 @@ dotrans(char *dst, size_t dlen, const ch
if (*cp1 == ntin[i]) {
found++;
if (i < ostop) {
- *cp2++ = ntout[i];
- if (cp2 - dst >= (ptrdiff_t)(dlen - 1))
- goto out;
+ ADDC(ntout[i]);
}
break;
}
}
if (!found) {
- *cp2++ = *cp1;
+ ADDC(*cp1);
}
}
out:
@@ -2037,8 +2041,8 @@ setnmap(int argc, char *argv[])
(void)strlcpy(mapout, cp, MAXPATHLEN);
}
-static const char *
-domap(char *dst, size_t dlen __unused, const char *src)
+static char *
+domap(char *dst, size_t dlen, const char *src)
{
const char *cp1 = src;
char *cp2 = mapin;
@@ -2093,7 +2097,7 @@ domap(char *dst,
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: christos Date: Fri Oct 4 18:04:06 UTC 2024 Modified Files: src/usr.bin/ftp: ruserpass.c Log Message: extract duplicate code into a function. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/usr.bin/ftp/ruserpass.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/ftp
Module Name:src
Committed By: christos
Date: Fri Oct 4 18:04:06 UTC 2024
Modified Files:
src/usr.bin/ftp: ruserpass.c
Log Message:
extract duplicate code into a function.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/ftp/ruserpass.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/ftp/ruserpass.c
diff -u src/usr.bin/ftp/ruserpass.c:1.34 src/usr.bin/ftp/ruserpass.c:1.35
--- src/usr.bin/ftp/ruserpass.c:1.34 Thu Jul 18 23:53:13 2024
+++ src/usr.bin/ftp/ruserpass.c Fri Oct 4 14:04:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ruserpass.c,v 1.34 2024/07/19 03:53:13 lukem Exp $ */
+/* $NetBSD: ruserpass.c,v 1.35 2024/10/04 18:04:06 christos Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: ruserpass.c,v 1.34 2024/07/19 03:53:13 lukem Exp $");
+__RCSID("$NetBSD: ruserpass.c,v 1.35 2024/10/04 18:04:06 christos Exp $");
#endif
#endif /* not lint */
@@ -79,6 +79,20 @@ static struct toktab {
{ NULL, 0 }
};
+static int
+match_host_domain(const char *host, const char *domain, const char *tokv)
+{
+ const char *tmp;
+
+ if (strcasecmp(host, tokval) == 0)
+ return 1;
+
+ return (tmp = strchr(host, '.')) != NULL &&
+ strcasecmp(tmp, domain) == 0 &&
+ strncasecmp(host, tokv, tmp - host) == 0 &&
+ tokv[tmp - host] == '\0';
+}
+
int
ruserpass(const char *host, char **aname, char **apass, char **aacct)
{
@@ -119,19 +133,9 @@ ruserpass(const char *host, char **aname
* or official hostname. Also allow match of
* incompletely-specified host in local domain.
*/
- if (strcasecmp(host, tokval) == 0)
-goto match;
- if (strcasecmp(hostname, tokval) == 0)
-goto match;
- if ((tmp = strchr(hostname, '.')) != NULL &&
- strcasecmp(tmp, mydomain) == 0 &&
- strncasecmp(hostname, tokval, tmp-hostname) == 0 &&
- tokval[tmp - hostname] == '\0')
+ if (match_host_domain(hostname, mydomain, tokval))
goto match;
- if ((tmp = strchr(host, '.')) != NULL &&
- strcasecmp(tmp, mydomain) == 0 &&
- strncasecmp(host, tokval, tmp - host) == 0 &&
- tokval[tmp - host] == '\0')
+ if (match_host_domain(host, mydomain, tokval))
goto match;
continue;
}
CVS commit: src/usr.bin/config
Module Name:src
Committed By: rillig
Date: Fri Oct 4 16:18:45 UTC 2024
Modified Files:
src/usr.bin/config: mkmakefile.c
Log Message:
config: fix lint warning about "effectively discards 'const'"
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/config/mkmakefile.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/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.73 src/usr.bin/config/mkmakefile.c:1.74
--- src/usr.bin/config/mkmakefile.c:1.73 Fri Apr 5 00:43:42 2024
+++ src/usr.bin/config/mkmakefile.c Fri Oct 4 16:18:45 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.73 2024/04/05 00:43:42 riastradh Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.74 2024/10/04 16:18:45 rillig Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include
-__RCSID("$NetBSD: mkmakefile.c,v 1.73 2024/04/05 00:43:42 riastradh Exp $");
+__RCSID("$NetBSD: mkmakefile.c,v 1.74 2024/10/04 16:18:45 rillig Exp $");
#include
#include
@@ -78,7 +78,7 @@ static void emitload(FILE *);
static void emitincludes(FILE *);
static void emitappmkoptions(FILE *);
static void emitmkoption(FILE *, const char *, const struct nvlist *);
-static void emitsubs(FILE *, const char *, const char *, int);
+static void emitsubs(FILE *, char *, const char *, int);
static int selectopt(const char *, void *);
int has_build_kernel;
@@ -226,7 +226,7 @@ emitmkoption(FILE *fp, const char *ass,
}
static void
-emitsubs(FILE *fp, const char *line, const char *file, int lineno)
+emitsubs(FILE *fp, char *line, const char *file, int lineno)
{
char *nextpct;
const char *optname;
CVS commit: src/usr.bin/config
Module Name:src Committed By: rillig Date: Fri Oct 4 16:18:45 UTC 2024 Modified Files: src/usr.bin/config: mkmakefile.c Log Message: config: fix lint warning about "effectively discards 'const'" No binary change. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/usr.bin/config/mkmakefile.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/altq
Module Name:src
Committed By: rillig
Date: Fri Oct 4 15:37:01 UTC 2024
Modified Files:
src/usr.sbin/altq/altqstat: quip_client.c
src/usr.sbin/altq/libaltq: quip_server.c
Log Message:
altq: fix lint warnings about "effectively discards 'const'"
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/altq/altqstat/quip_client.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/altq/libaltq/quip_server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/altq/altqstat/quip_client.c
diff -u src/usr.sbin/altq/altqstat/quip_client.c:1.15 src/usr.sbin/altq/altqstat/quip_client.c:1.16
--- src/usr.sbin/altq/altqstat/quip_client.c:1.15 Sun May 7 11:41:49 2023
+++ src/usr.sbin/altq/altqstat/quip_client.c Fri Oct 4 15:37:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: quip_client.c,v 1.15 2023/05/07 11:41:49 andvar Exp $ */
+/* $NetBSD: quip_client.c,v 1.16 2024/10/04 15:37:00 rillig Exp $ */
/* $KAME: quip_client.c,v 1.9 2003/05/17 05:59:00 itojun Exp $ */
/*
* Copyright (C) 1999-2000
@@ -144,7 +144,8 @@ quip_closeserver(void)
void
quip_sendrequest(FILE *fp, const char *request)
{
- char buf[QUIPMSG_MAXSIZE], *cp;
+ char buf[QUIPMSG_MAXSIZE];
+ const char *cp;
int n;
if ((cp = strstr(request, "QUIP")) == NULL) {
@@ -445,7 +446,7 @@ quip_printfilter(const char *ifname, con
static char *
extract_ifname(const char *name)
{
- char *cp;
+ const char *cp;
int len;
static char ifname[64];
Index: src/usr.sbin/altq/libaltq/quip_server.c
diff -u src/usr.sbin/altq/libaltq/quip_server.c:1.6 src/usr.sbin/altq/libaltq/quip_server.c:1.7
--- src/usr.sbin/altq/libaltq/quip_server.c:1.6 Sat Oct 19 17:16:37 2013
+++ src/usr.sbin/altq/libaltq/quip_server.c Fri Oct 4 15:37:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: quip_server.c,v 1.6 2013/10/19 17:16:37 christos Exp $ */
+/* $NetBSD: quip_server.c,v 1.7 2024/10/04 15:37:00 rillig Exp $ */
/* $KAME: quip_server.c,v 1.6 2001/08/20 06:41:32 kjc Exp $ */
/*
* Copyright (C) 1999-2000
@@ -431,6 +431,7 @@ string_match(const char *s1, const char
static int
query_list(const char *cmd, const char *arg, char *msg, size_t maxmsg)
{
+ const char *colon;
char tmp[256], *cp, *ep;
struct ifinfo *ifinfo;
struct classinfo *clinfo;
@@ -442,9 +443,9 @@ query_list(const char *cmd, const char *
print_if = print_class = print_fltr = 1;
} else {
print_if = print_class = print_fltr = 0;
- if ((cp = strchr(arg, ':')) == NULL)
+ if ((colon = strchr(arg, ':')) == NULL)
print_if = 1;
- else if (strchr(cp+1, ':') == NULL)
+ else if (strchr(colon+1, ':') == NULL)
print_class = 1;
else
print_fltr = 1;
CVS commit: src/usr.sbin/altq
Module Name:src Committed By: rillig Date: Fri Oct 4 15:37:01 UTC 2024 Modified Files: src/usr.sbin/altq/altqstat: quip_client.c src/usr.sbin/altq/libaltq: quip_server.c Log Message: altq: fix lint warnings about "effectively discards 'const'" No binary change. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/altq/altqstat/quip_client.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/altq/libaltq/quip_server.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: rillig
Date: Fri Oct 4 15:11:09 UTC 2024
Modified Files:
src/usr.sbin/sysinst: disklabel.c run.c
Log Message:
sysinst: fix lint warning about "effectively discards 'const'"
No binary change except for assertion line numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/usr.sbin/sysinst/disklabel.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/disklabel.c
diff -u src/usr.sbin/sysinst/disklabel.c:1.52 src/usr.sbin/sysinst/disklabel.c:1.53
--- src/usr.sbin/sysinst/disklabel.c:1.52 Thu Feb 8 20:51:24 2024
+++ src/usr.sbin/sysinst/disklabel.c Fri Oct 4 15:11:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.52 2024/02/08 20:51:24 andvar Exp $ */
+/* $NetBSD: disklabel.c,v 1.53 2024/10/04 15:11:09 rillig Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -1278,7 +1278,8 @@ disklabel_find_by_name(struct disk_parti
{
const struct disklabel_disk_partitions *parts =
(const struct disklabel_disk_partitions*)arg;
- char *sl, part;
+ const char *sl;
+ char part;
ptrdiff_t n;
part_id pno, id, i;
Index: src/usr.sbin/sysinst/run.c
diff -u src/usr.sbin/sysinst/run.c:1.15 src/usr.sbin/sysinst/run.c:1.16
--- src/usr.sbin/sysinst/run.c:1.15 Thu Apr 21 17:30:15 2022
+++ src/usr.sbin/sysinst/run.c Fri Oct 4 15:11:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.15 2022/04/21 17:30:15 martin Exp $ */
+/* $NetBSD: run.c,v 1.16 2024/10/04 15:11:09 rillig Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -284,12 +284,11 @@ do_system(const char *execstr)
}
static char **
-make_argv(const char *cmd)
+make_argv(char *cmd)
{
char **argv = 0;
int argc = 0;
- const char *cp;
- char *dp, *fn;
+ char *cp, *dp, *fn;
DIR *dir;
struct dirent *dirent;
int l;
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: rillig Date: Fri Oct 4 15:11:09 UTC 2024 Modified Files: src/usr.sbin/sysinst: disklabel.c run.c Log Message: sysinst: fix lint warning about "effectively discards 'const'" No binary change except for assertion line numbers. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/usr.sbin/sysinst/disklabel.c cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/run.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/dump
Module Name:src
Committed By: rillig
Date: Fri Oct 4 11:38:45 UTC 2024
Modified Files:
src/sbin/dump: main.c
Log Message:
dump: suppress lint warning about "effectively discards 'const'"
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sbin/dump/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump/main.c
diff -u src/sbin/dump/main.c:1.78 src/sbin/dump/main.c:1.79
--- src/sbin/dump/main.c:1.78 Thu Dec 3 08:25:57 2020
+++ src/sbin/dump/main.c Fri Oct 4 11:38:44 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.78 2020/12/03 08:25:57 kre Exp $ */
+/* $NetBSD: main.c,v 1.79 2024/10/04 11:38:44 rillig Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: main.c,v 1.78 2020/12/03 08:25:57 kre Exp $");
+__RCSID("$NetBSD: main.c,v 1.79 2024/10/04 11:38:44 rillig Exp $");
#endif
#endif /* not lint */
@@ -409,6 +409,7 @@ main(int argc, char *argv[])
tsize = cartridge ? 1700L*120L : 2300L*120L;
}
+ /* LINTED 346 "call to 'strchr' effectively discards 'const'" */
if ((cp = strchr(tape, ':')) != NULL) {
host = tape;
/* This is fine, because all the const strings don't have : */
CVS commit: src/sbin/dump
Module Name:src Committed By: rillig Date: Fri Oct 4 11:38:45 UTC 2024 Modified Files: src/sbin/dump: main.c Log Message: dump: suppress lint warning about "effectively discards 'const'" To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sbin/dump/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Fri Oct 4 11:38:03 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: lex_comment.c
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: fix suppressed warnings after if-else-if statement
Seen in sbin/dump/main.c, the "cp = strchr" line.
The bug had been there since at least 2002.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/lex_comment.c
cvs rdiff -u -r1.511 -r1.512 src/usr.bin/xlint/lint1/cgram.y
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/lex_comment.c
diff -u src/tests/usr.bin/xlint/lint1/lex_comment.c:1.2 src/tests/usr.bin/xlint/lint1/lex_comment.c:1.3
--- src/tests/usr.bin/xlint/lint1/lex_comment.c:1.2 Fri Oct 4 11:24:13 2024
+++ src/tests/usr.bin/xlint/lint1/lex_comment.c Fri Oct 4 11:38:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lex_comment.c,v 1.2 2024/10/04 11:24:13 rillig Exp $ */
+/* $NetBSD: lex_comment.c,v 1.3 2024/10/04 11:38:03 rillig Exp $ */
# 3 "lex_comment.c"
/*
@@ -68,14 +68,12 @@ lint_comment(void)
} else if (s8 == 1)
;
/* LINTED 132 */
- /* expect+1: warning: conversion from 'long long' to 'signed char' may lose accuracy [132] */
s8 = s64;
if (s8 == 0) {
} else if (s8 == 1) {
}
/* LINTED 132 */
- /* expect+1: warning: conversion from 'long long' to 'signed char' may lose accuracy [132] */
s8 = s64;
}
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.511 src/usr.bin/xlint/lint1/cgram.y:1.512
--- src/usr.bin/xlint/lint1/cgram.y:1.511 Sat Sep 28 16:09:23 2024
+++ src/usr.bin/xlint/lint1/cgram.y Fri Oct 4 11:38:03 2024
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.511 2024/09/28 16:09:23 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.512 2024/10/04 11:38:03 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.511 2024/09/28 16:09:23 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.512 2024/10/04 11:38:03 rillig Exp $");
#endif
#include
@@ -2158,7 +2158,7 @@ selection_statement:
save_warning_flags();
stmt_if_then_stmt();
} statement {
- clear_warning_flags();
+ restore_warning_flags();
stmt_if_else_stmt(true);
}
| if_without_else T_ELSE error {
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Oct 4 11:38:03 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: lex_comment.c src/usr.bin/xlint/lint1: cgram.y Log Message: lint: fix suppressed warnings after if-else-if statement Seen in sbin/dump/main.c, the "cp = strchr" line. The bug had been there since at least 2002. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/lex_comment.c cvs rdiff -u -r1.511 -r1.512 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Fri Oct 4 11:24:13 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: lex_comment.c
Log Message:
tests/lint: demonstrate ignored LINTED comment after if-else-if
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/lex_comment.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/lex_comment.c
diff -u src/tests/usr.bin/xlint/lint1/lex_comment.c:1.1 src/tests/usr.bin/xlint/lint1/lex_comment.c:1.2
--- src/tests/usr.bin/xlint/lint1/lex_comment.c:1.1 Sat Jun 19 20:25:58 2021
+++ src/tests/usr.bin/xlint/lint1/lex_comment.c Fri Oct 4 11:24:13 2024
@@ -1,13 +1,91 @@
-/* $NetBSD: lex_comment.c,v 1.1 2021/06/19 20:25:58 rillig Exp $ */
+/* $NetBSD: lex_comment.c,v 1.2 2024/10/04 11:24:13 rillig Exp $ */
# 3 "lex_comment.c"
/*
+ * Tests for comments, including lint-style comments that
+ * suppress a single diagnostic.
+ */
+
+/* lint1-extra-flags: -X 351 -aa */
+
+signed char s8;
+signed long long s64;
+
+// A "LINTED" comment suppresses a single warning until the end of the next
+// statement.
+void
+lint_comment(void)
+{
+ /* expect+1: warning: conversion from 'long long' to 'signed char' may lose accuracy [132] */
+ s8 = s64;
+
+ /* LINTED 132 */
+ s8 = s64;
+
+ /* expect+1: warning: conversion from 'long long' to 'signed char' may lose accuracy [132] */
+ s8 = s64;
+
+ /* LINTED 132 "comment" */
+ s8 = s64;
+
+ /* LINTED 132 */
+ {
+ }
+ /* expect+1: warning: conversion from 'long long' to 'signed char' may lose accuracy [132] */
+ s8 = s64;
+
+ /* LINTED 132 */
+ {
+ s8 = s64;
+ }
+ /* expect+1: warning: conversion from 'long long' to 'signed char' may lose accuracy [132] */
+ s8 = s64;
+
+ if (s8 == 0)
+ ;
+ /* LINTED 132 */
+ s8 = s64;
+
+ if (s8 == 0) {
+ }
+ /* LINTED 132 */
+ s8 = s64;
+
+ if (s8 == 0)
+ ;
+ else
+ ;
+ /* LINTED 132 */
+ s8 = s64;
+
+ if (s8 == 0) {
+ } else {
+ }
+ /* LINTED 132 */
+ s8 = s64;
+
+ if (s8 == 0) {
+ } else if (s8 == 1)
+ ;
+ /* LINTED 132 */
+ /* expect+1: warning: conversion from 'long long' to 'signed char' may lose accuracy [132] */
+ s8 = s64;
+
+ if (s8 == 0) {
+ } else if (s8 == 1) {
+ }
+ /* LINTED 132 */
+ /* expect+1: warning: conversion from 'long long' to 'signed char' may lose accuracy [132] */
+ s8 = s64;
+}
+
+
+/*
* Before lex.c 1.41 from 2021-06-19, lint ran into an endless loop when it
* saw an unclosed comment at the end of the translation unit. In practice
* this was not relevant since the translation unit always comes from the C
* preprocessor, which always emits a well-formed token sequence.
*/
-/* expect+3: error: unterminated comment [256] */
-/* expect+2: warning: empty translation unit [272] */
+/* expect+2: error: unterminated comment [256] */
/* unclosed comment
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Fri Oct 4 11:24:13 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: lex_comment.c Log Message: tests/lint: demonstrate ignored LINTED comment after if-else-if To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/lex_comment.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/ic
Module Name:src
Committed By: skrll
Date: Fri Oct 4 10:42:12 UTC 2024
Modified Files:
src/sys/dev/ic: dwc_eqos.c dwc_eqos_var.h
Log Message:
Fix a problem noted by Taylor...
touching if_flags is forbidden in this context (no IFNET_LOCK guaranteed)
sc_promisc should be cached when if_flags changes, not when
SIOCADDMULTI/SIOCDELMULTI runs
by caching if_flags in sc_if_flags via a ifflags_cb.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/dwc_eqos_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.39 src/sys/dev/ic/dwc_eqos.c:1.40
--- src/sys/dev/ic/dwc_eqos.c:1.39 Sat Sep 14 07:30:41 2024
+++ src/sys/dev/ic/dwc_eqos.c Fri Oct 4 10:42:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.39 2024/09/14 07:30:41 skrll Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.40 2024/10/04 10:42:12 skrll Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.39 2024/09/14 07:30:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.40 2024/10/04 10:42:12 skrll Exp $");
#include
#include
@@ -458,7 +458,7 @@ eqos_tick(void *softc)
EQOS_LOCK(sc);
mii_tick(mii);
- if (sc->sc_running)
+ if ((sc->sc_if_flags & IFF_RUNNING) != 0)
callout_schedule(&sc->sc_stat_ch, hz);
EQOS_UNLOCK(sc);
}
@@ -496,7 +496,7 @@ eqos_setup_rxfilter(struct eqos_softc *s
hash[0] = hash[1] = ~0U;
ETHER_LOCK(ec);
- if (sc->sc_promisc) {
+ if ((sc->sc_if_flags & IFF_PROMISC) != 0) {
ec->ec_flags |= ETHER_F_ALLMULTI;
pfil |= GMAC_MAC_PACKET_FILTER_PR |
GMAC_MAC_PACKET_FILTER_PCF_ALL;
@@ -614,7 +614,7 @@ eqos_init_locked(struct eqos_softc *sc)
eqos_init_rings(sc, 0);
/* Setup RX filter */
- sc->sc_promisc = ifp->if_flags & IFF_PROMISC;
+ sc->sc_if_flags = ifp->if_flags;
eqos_setup_rxfilter(sc);
WR4(sc, GMAC_MAC_1US_TIC_COUNTER, (sc->sc_csr_clock / 100) - 1);
@@ -699,8 +699,8 @@ eqos_init_locked(struct eqos_softc *sc)
EQOS_ASSERT_TXLOCKED(sc);
sc->sc_txrunning = true;
- sc->sc_running = true;
ifp->if_flags |= IFF_RUNNING;
+ sc->sc_if_flags |= IFF_RUNNING;
mii_mediachg(mii);
callout_schedule(&sc->sc_stat_ch, hz);
@@ -736,7 +736,6 @@ eqos_stop_locked(struct eqos_softc *sc,
sc->sc_txrunning = false;
EQOS_TXUNLOCK(sc);
- sc->sc_running = false;
callout_halt(&sc->sc_stat_ch, &sc->sc_lock);
mii_down(&sc->sc_mii);
@@ -783,6 +782,7 @@ eqos_stop_locked(struct eqos_softc *sc,
/* Disable interrupts */
eqos_disable_intr(sc);
+ sc->sc_if_flags &= ~IFF_RUNNING;
ifp->if_flags &= ~IFF_RUNNING;
}
@@ -1234,8 +1234,7 @@ eqos_ioctl(struct ifnet *ifp, u_long cmd
error = (*ifp->if_init)(ifp);
else if (cmd == SIOCADDMULTI || cmd == SIOCDELMULTI) {
EQOS_LOCK(sc);
- sc->sc_promisc = ifp->if_flags & IFF_PROMISC;
- if (sc->sc_running)
+ if ((sc->sc_if_flags & IFF_RUNNING) != 0)
eqos_setup_rxfilter(sc);
EQOS_UNLOCK(sc);
}
@@ -1246,6 +1245,31 @@ eqos_ioctl(struct ifnet *ifp, u_long cmd
return error;
}
+static int
+eqos_ifflags_cb(struct ethercom *ec)
+{
+ struct ifnet * const ifp = &ec->ec_if;
+ struct eqos_softc * const sc = ifp->if_softc;
+ int ret = 0;
+
+ KASSERT(IFNET_LOCKED(ifp));
+ EQOS_LOCK(sc);
+
+ u_short change = ifp->if_flags ^ sc->sc_if_flags;
+ sc->sc_if_flags = ifp->if_flags;
+
+ if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
+ ret = ENETRESET;
+ } else if ((change & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+ if ((sc->sc_if_flags & IFF_RUNNING) != 0)
+ eqos_setup_rxfilter(sc);
+ }
+ EQOS_UNLOCK(sc);
+
+ return ret;
+}
+
+
static void
eqos_get_eaddr(struct eqos_softc *sc, uint8_t *eaddr)
{
@@ -1629,6 +1653,7 @@ eqos_attach(struct eqos_softc *sc)
/* Attach ethernet interface */
ether_ifattach(ifp, eaddr);
+ ether_set_ifflags_cb(&sc->sc_ec, eqos_ifflags_cb);
eqos_init_sysctls(sc);
Index: src/sys/dev/ic/dwc_eqos_var.h
diff -u src/sys/dev/ic/dwc_eqos_var.h:1.10 src/sys/dev/ic/dwc_eqos_var.h:1.11
--- src/sys/dev/ic/dwc_eqos_var.h:1.10 Sun Sep 15 07:33:33 2024
+++ src/sys/dev/ic/dwc_eqos_var.h Fri Oct 4 10:42:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos_var.h,v 1.10 2024/09/15 07:33:33 skrll Exp $ */
+/* $NetBSD: dwc_eqos_var.h,v 1.11 2024/10/04 10:42:12 skrll Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -70,9 +70,8 @@ struct eqos_softc {
callout_t sc_stat_ch;
kmutex_t sc_lock;
kmutex_t sc_txlock;
- bool sc_running;
+ u_short sc_if_flags;
bool sc_txrunning;
- bool sc_promisc;
struct eqos_ring sc_tx;
struct eqos_ring sc_rx;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Fri Oct 4 10:42:12 UTC 2024 Modified Files: src/sys/dev/ic: dwc_eqos.c dwc_eqos_var.h Log Message: Fix a problem noted by Taylor... touching if_flags is forbidden in this context (no IFNET_LOCK guaranteed) sc_promisc should be cached when if_flags changes, not when SIOCADDMULTI/SIOCDELMULTI runs by caching if_flags in sc_if_flags via a ifflags_cb. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/dwc_eqos.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/dwc_eqos_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: skrll
Date: Fri Oct 4 10:41:58 UTC 2024
Modified Files:
src/sys/dev/ic: bcmgenet.c bcmgenetvar.h
Log Message:
Fix a problem noted by Taylor...
touching if_flags is forbidden in this context (no IFNET_LOCK guaranteed)
sc_promisc should be cached when if_flags changes, not when
SIOCADDMULTI/SIOCDELMULTI runs
by caching if_flags in sc_if_flags via a ifflags_cb.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/bcmgenet.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/bcmgenetvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/bcmgenet.c
diff -u src/sys/dev/ic/bcmgenet.c:1.20 src/sys/dev/ic/bcmgenet.c:1.21
--- src/sys/dev/ic/bcmgenet.c:1.20 Sun Sep 15 07:38:08 2024
+++ src/sys/dev/ic/bcmgenet.c Fri Oct 4 10:41:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgenet.c,v 1.20 2024/09/15 07:38:08 skrll Exp $ */
+/* $NetBSD: bcmgenet.c,v 1.21 2024/10/04 10:41:58 skrll Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill
@@ -33,7 +33,7 @@
#include "opt_ddb.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.20 2024/09/15 07:38:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.21 2024/10/04 10:41:58 skrll Exp $");
#include
#include
@@ -319,7 +319,7 @@ genet_tick(void *softc)
GENET_LOCK(sc);
mii_tick(mii);
- if (sc->sc_running)
+ if ((sc->sc_if_flags & IFF_RUNNING) != 0)
callout_schedule(&sc->sc_stat_ch, hz);
GENET_UNLOCK(sc);
}
@@ -570,7 +570,7 @@ genet_init_locked(struct genet_softc *sc
WR4(sc, GENET_UMAC_MAC1, val);
/* Setup RX filter */
- sc->sc_promisc = ifp->if_flags & IFF_PROMISC;
+ sc->sc_if_flags = ifp->if_flags;
genet_setup_rxfilter(sc);
/* Setup TX/RX rings */
@@ -588,8 +588,8 @@ genet_init_locked(struct genet_softc *sc
GENET_ASSERT_TXLOCKED(sc);
sc->sc_txrunning = true;
- sc->sc_running = true;
ifp->if_flags |= IFF_RUNNING;
+ sc->sc_if_flags |= IFF_RUNNING;
mii_mediachg(mii);
callout_schedule(&sc->sc_stat_ch, hz);
@@ -646,7 +646,6 @@ genet_stop_locked(struct genet_softc *sc
sc->sc_txrunning = false;
GENET_TXUNLOCK(sc);
- sc->sc_running = false;
callout_halt(&sc->sc_stat_ch, &sc->sc_lock);
mii_down(&sc->sc_mii);
@@ -683,6 +682,7 @@ genet_stop_locked(struct genet_softc *sc
for (i=0; isc_if_flags &= ~IFF_RUNNING;
ifp->if_flags &= ~IFF_RUNNING;
}
@@ -902,6 +902,14 @@ genet_ioctl(struct ifnet *ifp, u_long cm
struct genet_softc *sc = ifp->if_softc;
int error;
+ switch (cmd) {
+ case SIOCADDMULTI:
+ case SIOCDELMULTI:
+ break;
+ default:
+ KASSERT(IFNET_LOCKED(ifp));
+ }
+
const int s = splnet();
error = ether_ioctl(ifp, cmd, data);
splx(s);
@@ -915,14 +923,37 @@ genet_ioctl(struct ifnet *ifp, u_long cm
error = if_init(ifp);
else if (cmd == SIOCADDMULTI || cmd == SIOCDELMULTI) {
GENET_LOCK(sc);
- sc->sc_promisc = ifp->if_flags & IFF_PROMISC;
- if (sc->sc_running)
+ if ((sc->sc_if_flags & IFF_RUNNING) != 0)
genet_setup_rxfilter(sc);
GENET_UNLOCK(sc);
}
return error;
}
+static int
+genet_ifflags_cb(struct ethercom *ec)
+{
+ struct ifnet * const ifp = &ec->ec_if;
+ struct genet_softc * const sc = ifp->if_softc;
+ int ret = 0;
+
+ KASSERT(IFNET_LOCKED(ifp));
+ GENET_LOCK(sc);
+
+ u_short change = ifp->if_flags ^ sc->sc_if_flags;
+ sc->sc_if_flags = ifp->if_flags;
+
+ if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
+ ret = ENETRESET;
+ } else if ((change & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+ if ((sc->sc_if_flags & IFF_RUNNING) != 0)
+ genet_setup_rxfilter(sc);
+ }
+ GENET_UNLOCK(sc);
+
+ return ret;
+}
+
static void
genet_get_eaddr(struct genet_softc *sc, uint8_t *eaddr)
{
@@ -1116,6 +1147,8 @@ genet_attach(struct genet_softc *sc)
/* Attach ethernet interface */
ether_ifattach(ifp, eaddr);
+ ether_set_ifflags_cb(&sc->sc_ec, genet_ifflags_cb);
+
/* MBUFTRACE */
genet_claim_rxring(sc, GENET_DMA_DEFAULT_QUEUE);
Index: src/sys/dev/ic/bcmgenetvar.h
diff -u src/sys/dev/ic/bcmgenetvar.h:1.5 src/sys/dev/ic/bcmgenetvar.h:1.6
--- src/sys/dev/ic/bcmgenetvar.h:1.5 Sun Sep 15 07:38:08 2024
+++ src/sys/dev/ic/bcmgenetvar.h Fri Oct 4 10:41:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgenetvar.h,v 1.5 2024/09/15 07:38:08 skrll Exp $ */
+/* $NetBSD: bcmgenetvar.h,v 1.6 2024/10/04 10:41:58 skrll Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill
@@ -68,9 +68,8 @@ struct genet_softc {
kmutex_t sc_lock;
kmutex_t sc_txlock;
- bool sc_running;
+ u_short sc_if_flags;
bool sc_txrunning;
- bool sc_promisc;
struct genet_ring sc_tx;
struct genet_ring sc_rx;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Fri Oct 4 10:41:58 UTC 2024 Modified Files: src/sys/dev/ic: bcmgenet.c bcmgenetvar.h Log Message: Fix a problem noted by Taylor... touching if_flags is forbidden in this context (no IFNET_LOCK guaranteed) sc_promisc should be cached when if_flags changes, not when SIOCADDMULTI/SIOCDELMULTI runs by caching if_flags in sc_if_flags via a ifflags_cb. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/bcmgenet.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/bcmgenetvar.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: Fri Oct 4 10:25:51 UTC 2024
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
G/C ehci_dump_qh_qtd
To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.328 src/sys/dev/usb/ehci.c:1.329
--- src/sys/dev/usb/ehci.c:1.328 Thu Oct 3 12:58:10 2024
+++ src/sys/dev/usb/ehci.c Fri Oct 4 10:25:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.328 2024/10/03 12:58:10 hannken Exp $ */
+/* $NetBSD: ehci.c,v 1.329 2024/10/04 10:25:51 skrll Exp $ */
/*
* Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.328 2024/10/03 12:58:10 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.329 2024/10/04 10:25:51 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -294,7 +294,6 @@ void ehci_dump(void);
Static void ehci_dump_regs(ehci_softc_t *);
Static void ehci_dump_sqtds(ehci_soft_qtd_t *);
Static void ehci_dump_sqtd(ehci_soft_qtd_t *);
-Static void ehci_dump_qh_qtd(ehci_qtd_t *);
Static void ehci_dump_qtd(ehci_qtd_t *);
Static void ehci_dump_sqh(ehci_soft_qh_t *);
Static void ehci_dump_sitd(struct ehci_soft_itd *);
@@ -1770,23 +1769,6 @@ ehci_dump_sqtd(ehci_soft_qtd_t *sqtd)
sizeof(*sqtd->qtd), BUS_DMASYNC_PREREAD);
}
-Static void
-ehci_dump_qh_qtd(ehci_qtd_t *qh_qtd)
-{
- ehci_qtd_t qtd = {
- .qtd_next = qh_qtd->qtd_next,
- .qtd_altnext = qh_qtd->qtd_altnext,
- .qtd_status = qh_qtd->qtd_status,
- };
-
- /* Manually memcpy(), because of volatile. */
- for (unsigned i = 0; i < EHCI_QTD_NBUFFERS; i++) {
- qtd.qtd_buffer[i] = qh_qtd->qtd_buffer[i];
- qtd.qtd_buffer_hi[i] = qh_qtd->qtd_buffer_hi[i];
- }
-
- ehci_dump_qtd(&qtd);
-}
Static void
ehci_dump_qtd(ehci_qtd_t *qtd)
@@ -1864,7 +1846,7 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh)
link = le32toh(qh->qh_curqtd);
ehci_dump_link(link, false);
DPRINTFN(10, "Overlay qTD:", 0, 0, 0, 0);
- ehci_dump_qh_qtd(&qh->qh_qtd);
+ ehci_dump_qtd(&qh->qh_qtd);
usb_syncmem(&sqh->dma, sqh->offs, sizeof(*sqh->qh),
BUS_DMASYNC_PREREAD);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Fri Oct 4 10:25:51 UTC 2024 Modified Files: src/sys/dev/usb: ehci.c Log Message: G/C ehci_dump_qh_qtd To generate a diff of this commit: cvs rdiff -u -r1.328 -r1.329 src/sys/dev/usb/ehci.c 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: rillig
Date: Fri Oct 4 08:45:46 UTC 2024
Modified Files:
src/libexec/httpd: Makefile bozohttpd.c
Log Message:
libexec/httpd: fix or suppress lint warnings
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/libexec/httpd/Makefile
cvs rdiff -u -r1.147 -r1.148 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/Makefile
diff -u src/libexec/httpd/Makefile:1.32 src/libexec/httpd/Makefile:1.33
--- src/libexec/httpd/Makefile:1.32 Tue May 9 01:47:21 2023
+++ src/libexec/httpd/Makefile Fri Oct 4 08:45:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2023/05/09 01:47:21 christos Exp $
+# $NetBSD: Makefile,v 1.33 2024/10/04 08:45:46 rillig Exp $
#
# $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
#
@@ -39,6 +39,9 @@ LDADD= -lblocklist -lcrypt -llua -lm
DPADD= ${LIBBLOCKLIST} ${LIBCRYPT} ${LIBLUA} ${LIBM}
WARNS?= 4
+LINTFLAGS+= -X 161 # constant in conditional context
+LINTFLAGS+= -X 193 # statement not reached
+LINTFLAGS+= -X 239 # constant operand to '!'
.if defined(.OS.MAKE)
OPSYS= ${.OS.MAKE}
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.147 src/libexec/httpd/bozohttpd.c:1.148
--- src/libexec/httpd/bozohttpd.c:1.147 Sun Apr 28 17:12:30 2024
+++ src/libexec/httpd/bozohttpd.c Fri Oct 4 08:45:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.147 2024/04/28 17:12:30 maya Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.148 2024/10/04 08:45:46 rillig Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -1083,7 +1083,7 @@ handle_redirect(bozo_httpreq_t *request,
#endif /* !NO_USER_SUPPORT */
if (absolute) {
- char *sep = NULL;
+ const char *sep = NULL;
const char *s;
/*
CVS commit: src/libexec/httpd
Module Name:src Committed By: rillig Date: Fri Oct 4 08:45:46 UTC 2024 Modified Files: src/libexec/httpd: Makefile bozohttpd.c Log Message: libexec/httpd: fix or suppress lint warnings No binary change. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/libexec/httpd/Makefile cvs rdiff -u -r1.147 -r1.148 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/lib/libwrap
Module Name:src
Committed By: rillig
Date: Fri Oct 4 08:37:20 UTC 2024
Modified Files:
src/lib/libwrap: expandm.c
Log Message:
libwrap: fix lint warning about "effectively discards 'const'"
lib/libwrap/expandm.c(57): warning: call to 'strstr' effectively
discards 'const' from argument [346]
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libwrap/expandm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libwrap/expandm.c
diff -u src/lib/libwrap/expandm.c:1.12 src/lib/libwrap/expandm.c:1.13
--- src/lib/libwrap/expandm.c:1.12 Thu Jan 24 22:07:14 2019
+++ src/lib/libwrap/expandm.c Fri Oct 4 08:37:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: expandm.c,v 1.12 2019/01/24 22:07:14 mrg Exp $ */
+/* $NetBSD: expandm.c,v 1.13 2024/10/04 08:37:20 rillig Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: expandm.c,v 1.12 2019/01/24 22:07:14 mrg Exp $");
+__RCSID("$NetBSD: expandm.c,v 1.13 2024/10/04 08:37:20 rillig Exp $");
#include
#include
@@ -50,15 +50,15 @@ expandm(const char *fmt, const char *sf,
{
const int err = errno;
const char *e = NULL;
- char *buf, *m, *nbuf;
- const char *ptr;
+ char *buf, *nbuf;
+ const char *ptr, *m;
buf = NULL;
for (ptr = fmt; (m = strstr(ptr, "%m")) != NULL; ptr = m + 2) {
size_t cnt = 0;
size_t nlen;
- for (char *p = m; p >= ptr && *p == '%'; p--)
+ for (const char *p = m; p >= ptr && *p == '%'; p--)
cnt++;
nlen = (size_t)(m - ptr);
CVS commit: src/lib/libwrap
Module Name:src Committed By: rillig Date: Fri Oct 4 08:37:20 UTC 2024 Modified Files: src/lib/libwrap: expandm.c Log Message: libwrap: fix lint warning about "effectively discards 'const'" lib/libwrap/expandm.c(57): warning: call to 'strstr' effectively discards 'const' from argument [346] No binary change. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libwrap/expandm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src Committed By: msaitoh Date: Fri Oct 4 05:56:03 UTC 2024 Modified Files: src/tests/kernel: Makefile Log Message: tests: Fix build error. Set TESTS_SH correctly. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/tests/kernel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src
Committed By: msaitoh
Date: Fri Oct 4 05:56:03 UTC 2024
Modified Files:
src/tests/kernel: Makefile
Log Message:
tests: Fix build error. Set TESTS_SH correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/tests/kernel/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/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.80 src/tests/kernel/Makefile:1.81
--- src/tests/kernel/Makefile:1.80 Thu Oct 3 17:11:14 2024
+++ src/tests/kernel/Makefile Fri Oct 4 05:56:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2024/10/03 17:11:14 christos Exp $
+# $NetBSD: Makefile,v 1.81 2024/10/04 05:56:03 msaitoh Exp $
NOMAN= # defined
@@ -32,7 +32,7 @@ TESTS_C+= t_unmount
.endif
TESTS_C+= t_zombie
-TESTS_SH+= t_fexecve
+TESTS_SH= t_fexecve
TESTS_SH+= t_fpufork
TESTS_SH+= t_interp
TESTS_SH+= t_magic_symlinks
@@ -45,7 +45,7 @@ TESTS_SH+= t_simplehook
.endif
TESTS_SH+= t_trapsignal
TESTS_SH+= t_umountstress
-TESTS_SH= t_umount
+TESTS_SH+= t_umount
BINDIR= ${TESTSDIR}
PROGS= h_fexecve
CVS commit: src/lib
Module Name:src
Committed By: rillig
Date: Fri Oct 4 03:18:02 UTC 2024
Modified Files:
src/lib/libc/time: zic.c
src/lib/libcompat/4.3: ruserpass.c
Log Message:
libc, libcompat: fix lint warning about "effectively discards 'const'"
lib/libc/time/zic.c(2810): warning: call to 'strchr' effectively
discards 'const' from argument [346]
lib/libcompat/4.3/ruserpass.c(145): warning: call to 'strchr'
effectively discards 'const' from argument [346]
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/lib/libc/time/zic.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libcompat/4.3/ruserpass.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/zic.c
diff -u src/lib/libc/time/zic.c:1.92 src/lib/libc/time/zic.c:1.93
--- src/lib/libc/time/zic.c:1.92 Wed Sep 11 13:50:34 2024
+++ src/lib/libc/time/zic.c Fri Oct 4 03:18:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zic.c,v 1.92 2024/09/11 13:50:34 christos Exp $ */
+/* $NetBSD: zic.c,v 1.93 2024/10/04 03:18:01 rillig Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2006-07-17 by Arthur David Olson.
@@ -11,7 +11,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.92 2024/09/11 13:50:34 christos Exp $");
+__RCSID("$NetBSD: zic.c,v 1.93 2024/10/04 03:18:01 rillig Exp $");
#endif /* !defined lint */
/* Use the system 'time' function, instead of any private replacement.
@@ -2803,9 +2803,9 @@ doabbr(char *abbr, size_t abbrlen, struc
bool isdst, zic_t save, bool doquotes)
{
char * cp;
- char * slashp;
+ const char *slashp;
ptrdiff_t len;
- char const *format = zp->z_format;
+ const char *format = zp->z_format;
slashp = strchr(format, '/');
if (slashp == NULL) {
Index: src/lib/libcompat/4.3/ruserpass.c
diff -u src/lib/libcompat/4.3/ruserpass.c:1.10 src/lib/libcompat/4.3/ruserpass.c:1.11
--- src/lib/libcompat/4.3/ruserpass.c:1.10 Tue Oct 21 00:16:55 2003
+++ src/lib/libcompat/4.3/ruserpass.c Fri Oct 4 03:18:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ruserpass.c,v 1.10 2003/10/21 00:16:55 fvdl Exp $ */
+/* $NetBSD: ruserpass.c,v 1.11 2024/10/04 03:18:02 rillig Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: ruserpass.c,v 1.10 2003/10/21 00:16:55 fvdl Exp $");
+__RCSID("$NetBSD: ruserpass.c,v 1.11 2024/10/04 03:18:02 rillig Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -95,6 +95,7 @@ ruserpass(host, aname, apass)
char **aname, **apass;
{
char *hdir, buf[BUFSIZ], *tmp;
+ const char *ctmp;
char myname[MAXHOSTNAMELEN + 1], *mydomain;
int t, i, c, usedefault = 0;
struct stat stb;
@@ -142,11 +143,11 @@ next:
*/
if (strcasecmp(host, tokval) == 0)
goto match;
- if ((tmp = strchr(host, '.')) != NULL &&
- strcasecmp(tmp, mydomain) == 0 &&
+ if ((ctmp = strchr(host, '.')) != NULL &&
+ strcasecmp(ctmp, mydomain) == 0 &&
strncasecmp(host, tokval,
- (size_t)(tmp - host)) == 0 &&
- tokval[tmp - host] == '\0')
+ (size_t)(ctmp - host)) == 0 &&
+ tokval[ctmp - host] == '\0')
goto match;
continue;
}
CVS commit: src/lib
Module Name:src Committed By: rillig Date: Fri Oct 4 03:18:02 UTC 2024 Modified Files: src/lib/libc/time: zic.c src/lib/libcompat/4.3: ruserpass.c Log Message: libc, libcompat: fix lint warning about "effectively discards 'const'" lib/libc/time/zic.c(2810): warning: call to 'strchr' effectively discards 'const' from argument [346] lib/libcompat/4.3/ruserpass.c(145): warning: call to 'strchr' effectively discards 'const' from argument [346] No binary change. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/lib/libc/time/zic.c cvs rdiff -u -r1.10 -r1.11 src/lib/libcompat/4.3/ruserpass.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: msaitoh
Date: Fri Oct 4 03:04:40 UTC 2024
Modified Files:
src/sys/arch/x86/pci: amdzentemp.c
Log Message:
amdzentemp(4): Add support for CPU family 0x1a model 0x40...0x4f (Zen 5)
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/pci/amdzentemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/amdzentemp.c
diff -u src/sys/arch/x86/pci/amdzentemp.c:1.20 src/sys/arch/x86/pci/amdzentemp.c:1.21
--- src/sys/arch/x86/pci/amdzentemp.c:1.20 Fri Jul 28 02:05:26 2023
+++ src/sys/arch/x86/pci/amdzentemp.c Fri Oct 4 03:04:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amdzentemp.c,v 1.20 2023/07/28 02:05:26 msaitoh Exp $ */
+/* $NetBSD: amdzentemp.c,v 1.21 2024/10/04 03:04:40 msaitoh Exp $ */
/* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */
/*
@@ -53,7 +53,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: amdzentemp.c,v 1.20 2023/07/28 02:05:26 msaitoh Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdzentemp.c,v 1.21 2024/10/04 03:04:40 msaitoh Exp $ ");
#include
#include
@@ -208,6 +208,7 @@ amdzentemp_attach(device_t parent, devic
break;
case 0x17:
case 0x19:
+ case 0x1a:
sc->sc_sme->sme_refresh = amdzentemp_family17_refresh;
break;
default:
@@ -429,6 +430,25 @@ amdzentemp_probe_ccd_sensors19h(struct a
}
static int
+amdzentemp_probe_ccd_sensors1ah(struct amdzentemp_softc *sc, int model)
+{
+ int maxreg;
+
+ switch (model) {
+ case 0x40 ... 0x4f: /* Zen5 */
+ sc->sc_ccd_offset = 0x300;
+ maxreg = 8;
+ break;
+ default:
+ aprint_error_dev(sc->sc_dev,
+ "Unrecognized Family 19h Model: %02xh\n", model);
+ return 0;
+ }
+
+ return maxreg;
+}
+
+static int
amdzentemp_probe_ccd_sensors(struct amdzentemp_softc *sc, int family, int model)
{
int nccd;
@@ -440,6 +460,9 @@ amdzentemp_probe_ccd_sensors(struct amdz
case 0x19:
nccd = amdzentemp_probe_ccd_sensors19h(sc, model);
break;
+ case 0x1a:
+ nccd = amdzentemp_probe_ccd_sensors1ah(sc, model);
+ break;
default:
return 0;
}
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: msaitoh Date: Fri Oct 4 03:04:40 UTC 2024 Modified Files: src/sys/arch/x86/pci: amdzentemp.c Log Message: amdzentemp(4): Add support for CPU family 0x1a model 0x40...0x4f (Zen 5) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/pci/amdzentemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: andvar Date: Thu Oct 3 20:19:55 UTC 2024 Modified Files: src/sys/kern: kern_ksyms.c Log Message: s/preudo/pseudo/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/kern/kern_ksyms.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_ksyms.c diff -u src/sys/kern/kern_ksyms.c:1.108 src/sys/kern/kern_ksyms.c:1.109 --- src/sys/kern/kern_ksyms.c:1.108 Tue Feb 21 11:40:00 2023 +++ src/sys/kern/kern_ksyms.c Thu Oct 3 20:19:55 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_ksyms.c,v 1.108 2023/02/21 11:40:00 riastradh Exp $ */ +/* $NetBSD: kern_ksyms.c,v 1.109 2024/10/03 20:19:55 andvar Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.108 2023/02/21 11:40:00 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.109 2024/10/03 20:19:55 andvar Exp $"); #if defined(_KERNEL) && defined(_KERNEL_OPT) #include "opt_copy_symtab.h" @@ -244,7 +244,7 @@ findsym(const char *name, struct ksyms_s /* * ksyms can be loaded even if the kernel has a missing "pseudo-device ksyms" * statement because ddb and modules require it. Fixing it properly requires - * fixing config to warn about required, but missing preudo-devices. For now, + * fixing config to warn about required, but missing pseudo-devices. For now, * if we don't have the pseudo-device we don't need the attach function; this * is fine, as it does nothing. */
CVS commit: src/sys/kern
Module Name:src Committed By: andvar Date: Thu Oct 3 20:19:55 UTC 2024 Modified Files: src/sys/kern: kern_ksyms.c Log Message: s/preudo/pseudo/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/kern/kern_ksyms.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin
Module Name:src Committed By: rillig Date: Thu Oct 3 20:14:01 UTC 2024 Modified Files: src/bin/ed: io.c src/bin/ksh: edit.c eval.c misc.c src/bin/pax: getoldopt.c src/bin/sh: expand.c output.c parser.c Log Message: bin: fix lint warning "effectively discards 'const'" For example: src/bin/ed/io.c(339): warning: call to 'strchr' effectively discards 'const' from argument [346] No binary change. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/bin/ed/io.c cvs rdiff -u -r1.35 -r1.36 src/bin/ksh/edit.c cvs rdiff -u -r1.26 -r1.27 src/bin/ksh/eval.c cvs rdiff -u -r1.25 -r1.26 src/bin/ksh/misc.c cvs rdiff -u -r1.23 -r1.24 src/bin/pax/getoldopt.c cvs rdiff -u -r1.144 -r1.145 src/bin/sh/expand.c cvs rdiff -u -r1.41 -r1.42 src/bin/sh/output.c cvs rdiff -u -r1.182 -r1.183 src/bin/sh/parser.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin
Module Name:src
Committed By: rillig
Date: Thu Oct 3 20:14:01 UTC 2024
Modified Files:
src/bin/ed: io.c
src/bin/ksh: edit.c eval.c misc.c
src/bin/pax: getoldopt.c
src/bin/sh: expand.c output.c parser.c
Log Message:
bin: fix lint warning "effectively discards 'const'"
For example: src/bin/ed/io.c(339): warning: call to 'strchr' effectively
discards 'const' from argument [346]
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/bin/ed/io.c
cvs rdiff -u -r1.35 -r1.36 src/bin/ksh/edit.c
cvs rdiff -u -r1.26 -r1.27 src/bin/ksh/eval.c
cvs rdiff -u -r1.25 -r1.26 src/bin/ksh/misc.c
cvs rdiff -u -r1.23 -r1.24 src/bin/pax/getoldopt.c
cvs rdiff -u -r1.144 -r1.145 src/bin/sh/expand.c
cvs rdiff -u -r1.41 -r1.42 src/bin/sh/output.c
cvs rdiff -u -r1.182 -r1.183 src/bin/sh/parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ed/io.c
diff -u src/bin/ed/io.c:1.10 src/bin/ed/io.c:1.11
--- src/bin/ed/io.c:1.10 Sun Mar 23 05:06:42 2014
+++ src/bin/ed/io.c Thu Oct 3 20:14:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.10 2014/03/23 05:06:42 dholland Exp $ */
+/* $NetBSD: io.c,v 1.11 2024/10/03 20:14:01 rillig Exp $ */
/* io.c: This file contains the i/o routines for the ed line editor */
/*-
@@ -32,7 +32,7 @@
#if 0
static char *rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
#else
-__RCSID("$NetBSD: io.c,v 1.10 2014/03/23 05:06:42 dholland Exp $");
+__RCSID("$NetBSD: io.c,v 1.11 2024/10/03 20:14:01 rillig Exp $");
#endif
#endif /* not lint */
@@ -307,7 +307,7 @@ int
put_tty_line(char *s, int l, long n, int gflag)
{
int col = 0;
- char *cp;
+ const char *cp;
#ifndef BACKWARDS
int lc = 0;
#endif
Index: src/bin/ksh/edit.c
diff -u src/bin/ksh/edit.c:1.35 src/bin/ksh/edit.c:1.36
--- src/bin/ksh/edit.c:1.35 Sun Jun 3 12:18:29 2018
+++ src/bin/ksh/edit.c Thu Oct 3 20:14:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: edit.c,v 1.35 2018/06/03 12:18:29 kamil Exp $ */
+/* $NetBSD: edit.c,v 1.36 2024/10/03 20:14:01 rillig Exp $ */
/*
* Command line editing - common code
@@ -7,7 +7,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: edit.c,v 1.35 2018/06/03 12:18:29 kamil Exp $");
+__RCSID("$NetBSD: edit.c,v 1.36 2024/10/03 20:14:01 rillig Exp $");
#endif
#include
@@ -375,7 +375,7 @@ set_editmode(ed)
FVI,
#endif
};
- char *rcp;
+ const char *rcp;
size_t i;
if ((rcp = ksh_strrchr_dirsep(ed)))
Index: src/bin/ksh/eval.c
diff -u src/bin/ksh/eval.c:1.26 src/bin/ksh/eval.c:1.27
--- src/bin/ksh/eval.c:1.26 Thu Sep 26 11:01:09 2019
+++ src/bin/ksh/eval.c Thu Oct 3 20:14:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.26 2019/09/26 11:01:09 mlelstv Exp $ */
+/* $NetBSD: eval.c,v 1.27 2024/10/03 20:14:01 rillig Exp $ */
/*
* Expansion - quoting, separation, substitution, globbing
@@ -6,7 +6,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: eval.c,v 1.26 2019/09/26 11:01:09 mlelstv Exp $");
+__RCSID("$NetBSD: eval.c,v 1.27 2024/10/03 20:14:01 rillig Exp $");
#endif
#include
@@ -1179,7 +1179,8 @@ debunk(dp, sp, dlen)
const char *sp;
size_t dlen;
{
- char *d, *s;
+ char *d;
+ const char *s;
if ((s = strchr(sp, MAGIC))) {
if (s - sp >= (ptrdiff_t)dlen)
Index: src/bin/ksh/misc.c
diff -u src/bin/ksh/misc.c:1.25 src/bin/ksh/misc.c:1.26
--- src/bin/ksh/misc.c:1.25 Tue Oct 29 16:19:59 2019
+++ src/bin/ksh/misc.c Thu Oct 3 20:14:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.25 2019/10/29 16:19:59 joerg Exp $ */
+/* $NetBSD: misc.c,v 1.26 2024/10/03 20:14:01 rillig Exp $ */
/*
* Miscellaneous functions
@@ -6,7 +6,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: misc.c,v 1.25 2019/10/29 16:19:59 joerg Exp $");
+__RCSID("$NetBSD: misc.c,v 1.26 2024/10/03 20:14:01 rillig Exp $");
#endif
@@ -978,7 +978,7 @@ ksh_getopt(argv, go, options)
const char *options;
{
char c;
- char *o;
+ const char *o;
if (go->p == 0 || (c = argv[go->optind - 1][go->p]) == '\0') {
char *arg = argv[go->optind], flag = arg ? *arg : '\0';
Index: src/bin/pax/getoldopt.c
diff -u src/bin/pax/getoldopt.c:1.23 src/bin/pax/getoldopt.c:1.24
--- src/bin/pax/getoldopt.c:1.23 Thu Aug 9 11:05:59 2012
+++ src/bin/pax/getoldopt.c Thu Oct 3 20:14:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getoldopt.c,v 1.23 2012/08/09 11:05:59 christos Exp $ */
+/* $NetBSD: getoldopt.c,v 1.24 2024/10/03 20:14:01 rillig Exp $ */
/*
* Plug-compatible replacement for getopt() for parsing tar-like
@@ -15,7 +15,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: getoldopt.c,v 1.23 2012/08/09 11:05:59 christos Exp $");
+__RCSID("$NetBSD: getoldopt.c,v 1.24 2024/10/03 20:14:01 rillig Exp $");
#endif /* not lint */
#if HAVE_NBTOOL_CONFIG_H
@@ -39,7 +39,7 @@ getoldopt(int argc, char **argv, const c
static char *key; /* Points to next keyletter */
static char use_getopt; /* !=0 if argv[1][0] was '-' */
char c;
- char *place;
+ const
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Oct 3 17:14:12 UTC 2024 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: new semtimedop(2) GSoC 2024 (Shivraj Jamgade) To generate a diff of this commit: cvs rdiff -u -r1.2473 -r1.2474 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.449 -r1.450 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1339 -r1.1340 src/distrib/sets/lists/tests/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2473 src/distrib/sets/lists/comp/mi:1.2474 --- src/distrib/sets/lists/comp/mi:1.2473 Mon Sep 9 07:30:05 2024 +++ src/distrib/sets/lists/comp/mi Thu Oct 3 13:14:12 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2473 2024/09/09 11:30:05 riastradh Exp $ +# $NetBSD: mi,v 1.2474 2024/10/03 17:14:12 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -5018,6 +5018,7 @@ ./usr/share/man/cat2/semctl.0 comp-c-catman .cat ./usr/share/man/cat2/semget.0 comp-c-catman .cat ./usr/share/man/cat2/semop.0 comp-c-catman .cat +./usr/share/man/cat2/semtimedop.0 comp-c-catman .cat ./usr/share/man/cat2/send.0 comp-c-catman .cat ./usr/share/man/cat2/sendmmsg.0 comp-c-catman .cat ./usr/share/man/cat2/sendmsg.0 comp-c-catman .cat @@ -13592,6 +13593,7 @@ ./usr/share/man/html2/semctl.html comp-c-htmlman html ./usr/share/man/html2/semget.html comp-c-htmlman html ./usr/share/man/html2/semop.html comp-c-htmlman html +./usr/share/man/html2/semtimedop.html comp-c-htmlman html ./usr/share/man/html2/send.html comp-c-htmlman html ./usr/share/man/html2/sendmmsg.html comp-c-htmlman html ./usr/share/man/html2/sendmsg.html comp-c-htmlman html @@ -22006,6 +22008,7 @@ ./usr/share/man/man2/semctl.2 comp-c-man .man ./usr/share/man/man2/semget.2 comp-c-man .man ./usr/share/man/man2/semop.2 comp-c-man .man +./usr/share/man/man2/semtimedop.2 comp-c-man .man ./usr/share/man/man2/send.2 comp-c-man .man ./usr/share/man/man2/sendmmsg.2 comp-c-man .man ./usr/share/man/man2/sendmsg.2 comp-c-man .man Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.449 src/distrib/sets/lists/debug/mi:1.450 --- src/distrib/sets/lists/debug/mi:1.449 Thu Sep 19 15:43:13 2024 +++ src/distrib/sets/lists/debug/mi Thu Oct 3 13:14:12 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.449 2024/09/19 19:43:13 gdt Exp $ +# $NetBSD: mi,v 1.450 2024/10/03 17:14:12 christos Exp $ # ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir @@ -1825,6 +1825,7 @@ ./usr/libdata/debug/usr/tests/kernel/t_ptrace_waitpid.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_pty.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_rnd.debug tests-kernel-tests debug,atf,rump +./usr/libdata/debug/usr/tests/kernel/t_semtimedop.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_sigaction.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_signal_and_sp.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_subr_prf.debug tests-kernel-tests debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1339 src/distrib/sets/lists/tests/mi:1.1340 --- src/distrib/sets/lists/tests/mi:1.1339 Thu Sep 19 15:43:13 2024 +++ src/distrib/sets/lists/tests/mi Thu Oct 3 13:14:12 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1339 2024/09/19 19:43:13 gdt Exp $ +# $NetBSD: mi,v 1.1340 2024/10/03 17:14:12 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2351,6 +2351,7 @@ ./usr/tests/kernel/t_ptrace_waitpid tests-obsolete obsolete ./usr/tests/kernel/t_ptytests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_rndtests-kernel-tests atf,rump +./usr/tests/kernel/t_semtimedoptests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_sigactiontests-obsolete obsolete ./usr/tests/kernel/t_signal_and_sp tests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_simplehooktests-kernel-tests atf,rump
