CVS commit: src/tests/lib/libc/setjmp
Module Name:src
Committed By: riastradh
Date: Mon Feb 19 04:33:21 UTC 2024
Modified Files:
src/tests/lib/libc/setjmp: t_sigstack.c
Log Message:
longjmp(3): Paranoia: more error checking in PR lib/57946 test.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/setjmp/t_sigstack.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/lib/libc/setjmp/t_sigstack.c
diff -u src/tests/lib/libc/setjmp/t_sigstack.c:1.1 src/tests/lib/libc/setjmp/t_sigstack.c:1.2
--- src/tests/lib/libc/setjmp/t_sigstack.c:1.1 Mon Feb 19 04:30:39 2024
+++ src/tests/lib/libc/setjmp/t_sigstack.c Mon Feb 19 04:33:21 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sigstack.c,v 1.1 2024/02/19 04:30:39 riastradh Exp $ */
+/* $NetBSD: t_sigstack.c,v 1.2 2024/02/19 04:33:21 riastradh Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_sigstack.c,v 1.1 2024/02/19 04:30:39 riastradh Exp $");
+__RCSID("$NetBSD: t_sigstack.c,v 1.2 2024/02/19 04:33:21 riastradh Exp $");
#include
#include
@@ -140,7 +140,7 @@ ATF_TC_BODY(setjmp, tc)
*/
memset(, 0, sizeof(sa));
sa.sa_sigaction = _sigusr1;
- sigemptyset(_mask);
+ RL(sigemptyset(_mask));
sa.sa_flags = SA_SIGINFO|SA_ONSTACK;
RL(sigaction(SIGUSR1, , NULL));
@@ -155,7 +155,7 @@ ATF_TC_BODY(setjmp, tc)
/*
* Raise the signal to enter the signal handler the first time.
*/
- raise(SIGUSR1);
+ RL(raise(SIGUSR1));
/*
* If we ever reach this point, something went seriously wrong.
CVS commit: src/tests/lib/libc/setjmp
Module Name:src Committed By: riastradh Date: Mon Feb 19 04:33:21 UTC 2024 Modified Files: src/tests/lib/libc/setjmp: t_sigstack.c Log Message: longjmp(3): Paranoia: more error checking in PR lib/57946 test. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/setjmp/t_sigstack.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: riastradh
Date: Mon Feb 19 04:30:39 UTC 2024
Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/tests/lib/libc/setjmp: Makefile
Added Files:
src/tests/lib/libc/setjmp: t_sigstack.c
Log Message:
longjmp(3): Add test for PR lib/57946.
To generate a diff of this commit:
cvs rdiff -u -r1.424 -r1.425 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1305 -r1.1306 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/setjmp/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/setjmp/t_sigstack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.424 src/distrib/sets/lists/debug/mi:1.425
--- src/distrib/sets/lists/debug/mi:1.424 Fri Nov 24 16:21:17 2023
+++ src/distrib/sets/lists/debug/mi Mon Feb 19 04:30:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.424 2023/11/24 16:21:17 riastradh Exp $
+# $NetBSD: mi,v 1.425 2024/02/19 04:30:38 riastradh Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -2092,6 +2092,7 @@
./usr/libdata/debug/usr/tests/lib/libc/rpc/t_rpc.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libc/rpc/t_xdr.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_setjmp.debug tests-lib-debug debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_sigstack.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_threadjmp.debug tests-lib-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/lib/libc/ssp/h_fgets.debug tests-lib-debug debug,atf,ssp,compattestfile
./usr/libdata/debug/usr/tests/lib/libc/ssp/h_getcwd.debug tests-lib-debug debug,atf,ssp,compattestfile
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1305 src/distrib/sets/lists/tests/mi:1.1306
--- src/distrib/sets/lists/tests/mi:1.1305 Sat Feb 3 20:10:10 2024
+++ src/distrib/sets/lists/tests/mi Mon Feb 19 04:30:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1305 2024/02/03 20:10:10 rillig Exp $
+# $NetBSD: mi,v 1.1306 2024/02/19 04:30:38 riastradh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3160,6 +3160,7 @@
./usr/tests/lib/libc/setjmp/Atffile tests-lib-tests compattestfile,atf
./usr/tests/lib/libc/setjmp/Kyuafile tests-lib-tests compattestfile,atf,kyua
./usr/tests/lib/libc/setjmp/t_setjmp tests-lib-tests compattestfile,atf
+./usr/tests/lib/libc/setjmp/t_sigstack tests-lib-tests compattestfile,atf
./usr/tests/lib/libc/setjmp/t_threadjmp tests-lib-tests compattestfile,atf
./usr/tests/lib/libc/ssptests-lib-tests compattestfile,atf
./usr/tests/lib/libc/ssp/Atffile tests-lib-tests compattestfile,atf,ssp
Index: src/tests/lib/libc/setjmp/Makefile
diff -u src/tests/lib/libc/setjmp/Makefile:1.2 src/tests/lib/libc/setjmp/Makefile:1.3
--- src/tests/lib/libc/setjmp/Makefile:1.2 Thu Apr 21 18:58:20 2011
+++ src/tests/lib/libc/setjmp/Makefile Mon Feb 19 04:30:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/21 18:58:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2024/02/19 04:30:39 riastradh Exp $
NOMAN= # defined
@@ -9,6 +9,7 @@ WARNS= 4
TESTSDIR= ${TESTSBASE}/lib/libc/setjmp
TESTS_C+= t_setjmp
+TESTS_C+= t_sigstack
TESTS_C+= t_threadjmp
LDFLAGS.t_threadjmp+= -pthread
Added files:
Index: src/tests/lib/libc/setjmp/t_sigstack.c
diff -u /dev/null src/tests/lib/libc/setjmp/t_sigstack.c:1.1
--- /dev/null Mon Feb 19 04:30:39 2024
+++ src/tests/lib/libc/setjmp/t_sigstack.c Mon Feb 19 04:30:39 2024
@@ -0,0 +1,173 @@
+/* $NetBSD: t_sigstack.c,v 1.1 2024/02/19 04:30:39 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2024 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *
CVS commit: src
Module Name:src Committed By: riastradh Date: Mon Feb 19 04:30:39 UTC 2024 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/tests/lib/libc/setjmp: Makefile Added Files: src/tests/lib/libc/setjmp: t_sigstack.c Log Message: longjmp(3): Add test for PR lib/57946. To generate a diff of this commit: cvs rdiff -u -r1.424 -r1.425 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1305 -r1.1306 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/setjmp/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/setjmp/t_sigstack.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: Mon Feb 19 00:15:21 UTC 2024
Modified Files:
src/usr.bin/ftp: ftp.1 ssl.c
Log Message:
default is now 16K
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/usr.bin/ftp/ftp.1
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/ftp/ssl.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/ftp.1
diff -u src/usr.bin/ftp/ftp.1:1.152 src/usr.bin/ftp/ftp.1:1.153
--- src/usr.bin/ftp/ftp.1:1.152 Sun Feb 18 17:29:56 2024
+++ src/usr.bin/ftp/ftp.1 Sun Feb 18 19:15:20 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.152 2024/02/18 22:29:56 christos Exp $
+.\" $NetBSD: ftp.1,v 1.153 2024/02/19 00:15:20 christos Exp $
.\"
.\" Copyright (c) 1996-2023 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -205,6 +205,8 @@ to bypass normal login procedure, and us
.It Fl b Ar bufsize
Change the input buffer size to
.Ar bufsize .
+The default is
+.Dv 16K .
.It Fl d
Enables debugging.
.It Fl e
Index: src/usr.bin/ftp/ssl.c
diff -u src/usr.bin/ftp/ssl.c:1.17 src/usr.bin/ftp/ssl.c:1.18
--- src/usr.bin/ftp/ssl.c:1.17 Sun Feb 18 17:29:56 2024
+++ src/usr.bin/ftp/ssl.c Sun Feb 18 19:15:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ssl.c,v 1.17 2024/02/18 22:29:56 christos Exp $ */
+/* $NetBSD: ssl.c,v 1.18 2024/02/19 00:15:20 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
@@ -35,7 +35,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ssl.c,v 1.17 2024/02/18 22:29:56 christos Exp $");
+__RCSID("$NetBSD: ssl.c,v 1.18 2024/02/19 00:15:20 christos Exp $");
#endif
#include
@@ -579,7 +579,7 @@ fetch_getline(struct fetch_connect *conn
break;
}
if (errormsg)
- *errormsg = "Input line is too long (specify -b > 4K)";
+ *errormsg = "Input line is too long (specify -b > 16K)";
fetch_clearerr(conn);
return -3;
}
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: christos Date: Mon Feb 19 00:15:21 UTC 2024 Modified Files: src/usr.bin/ftp: ftp.1 ssl.c Log Message: default is now 16K To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/usr.bin/ftp/ftp.1 cvs rdiff -u -r1.17 -r1.18 src/usr.bin/ftp/ssl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.bin/ftp
In article <20240218223315.800aff...@cvs.netbsd.org>, Thomas Klausner wrote: >-=-=-=-=-=- > >Module Name: src >Committed By: wiz >Date: Sun Feb 18 22:33:15 UTC 2024 > >Modified Files: > src/usr.bin/ftp: ftp_var.h > >Log Message: >ftp: bump FTPBUFLEN from 4kB to 16kB > >sourceforge.net returns a 5kB content-security-policy. >Analyzed by mlelstv@ who reports usual limits are between 4kB and 48kB. This is used in two other places unrelated to fetch (one in getline on the stack and one static for completions). While it is ok to increase the default now because I've made it dynamically allocated in the fetch cases, we should probably use a different buffer constant for the other two... christos
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: wiz
Date: Sun Feb 18 22:33:15 UTC 2024
Modified Files:
src/usr.bin/ftp: ftp_var.h
Log Message:
ftp: bump FTPBUFLEN from 4kB to 16kB
sourceforge.net returns a 5kB content-security-policy.
Analyzed by mlelstv@ who reports usual limits are between 4kB and 48kB.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/ftp/ftp_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/usr.bin/ftp/ftp_var.h
diff -u src/usr.bin/ftp/ftp_var.h:1.87 src/usr.bin/ftp/ftp_var.h:1.88
--- src/usr.bin/ftp/ftp_var.h:1.87 Sun Feb 18 22:29:56 2024
+++ src/usr.bin/ftp/ftp_var.h Sun Feb 18 22:33:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp_var.h,v 1.87 2024/02/18 22:29:56 christos Exp $ */
+/* $NetBSD: ftp_var.h,v 1.88 2024/02/18 22:33:15 wiz Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -169,7 +169,7 @@ enum {
/*
* Global defines
*/
-#define FTPBUFLEN (4 * MAXPATHLEN)
+#define FTPBUFLEN (16 * 1024)
#define MAX_IN_PORT_T 0xU
#define HASHBYTES 1024 /* default mark for `hash' command */
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: wiz Date: Sun Feb 18 22:33:15 UTC 2024 Modified Files: src/usr.bin/ftp: ftp_var.h Log Message: ftp: bump FTPBUFLEN from 4kB to 16kB sourceforge.net returns a 5kB content-security-policy. Analyzed by mlelstv@ who reports usual limits are between 4kB and 48kB. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/usr.bin/ftp/ftp_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: christos
Date: Sun Feb 18 22:29:56 UTC 2024
Modified Files:
src/usr.bin/ftp: fetch.c ftp.1 ftp.c ftp_var.h main.c ssl.c
Log Message:
Add -b to specify the buffer size.
To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.151 -r1.152 src/usr.bin/ftp/ftp.1
cvs rdiff -u -r1.175 -r1.176 src/usr.bin/ftp/ftp.c
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/ftp/ftp_var.h
cvs rdiff -u -r1.129 -r1.130 src/usr.bin/ftp/main.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/ftp/ssl.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/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.238 src/usr.bin/ftp/fetch.c:1.239
--- src/usr.bin/ftp/fetch.c:1.238 Sat Aug 12 03:40:13 2023
+++ src/usr.bin/ftp/fetch.c Sun Feb 18 17:29:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.238 2023/08/12 07:40:13 mlelstv Exp $ */
+/* $NetBSD: fetch.c,v 1.239 2024/02/18 22:29:56 christos Exp $ */
/*-
* Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.238 2023/08/12 07:40:13 mlelstv Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.239 2024/02/18 22:29:56 christos Exp $");
#endif /* not lint */
/*
@@ -1116,15 +1116,17 @@ negotiate_connection(FETCH *fin, const c
char **auth, struct urlinfo *ui)
{
int len, hcode, rv;
- char buf[FTPBUFLEN], *ep;
+ char *buf = NULL, *ep;
const char *cp, *token;
char *location, *message;
*auth = message = location = NULL;
+ buf = ftp_malloc(ftp_buflen);
+
/* Read the response */
ep = buf;
- switch (getresponse(fin, , sizeof(buf), )) {
+ switch (getresponse(fin, , ftp_buflen, )) {
case C_CLEANUP:
goto cleanup_fetch_url;
case C_IMPROPER:
@@ -1137,7 +1139,7 @@ negotiate_connection(FETCH *fin, const c
/* Read the rest of the header. */
for (;;) {
- if ((rv = getresponseline(fin, buf, sizeof(buf), )) != C_OK)
+ if ((rv = getresponseline(fin, buf, ftp_buflen, )) != C_OK)
goto cleanup_fetch_url;
if (len == 0)
break;
@@ -1265,6 +1267,7 @@ improper:
rv = C_IMPROPER;
goto out;
out:
+ FREEPTR(buf);
FREEPTR(message);
FREEPTR(location);
return rv;
@@ -1279,7 +1282,7 @@ connectmethod(FETCH *fin, const char *ur
void *ssl;
int hcode, rv;
const char *cp;
- char buf[FTPBUFLEN], *ep;
+ char *buf = NULL, *ep;
char *message = NULL;
print_connect(fin, oui);
@@ -1299,9 +1302,11 @@ connectmethod(FETCH *fin, const char *ur
}
alarmtimer(0);
+ buf = ftp_malloc(ftp_buflen);
+
/* Read the response */
ep = buf;
- switch (getresponse(fin, , sizeof(buf), )) {
+ switch (getresponse(fin, , ftp_buflen, )) {
case C_CLEANUP:
goto cleanup_fetch_url;
case C_IMPROPER:
@@ -1313,7 +1318,7 @@ connectmethod(FETCH *fin, const char *ur
for (;;) {
int len;
- if (getresponseline(fin, buf, sizeof(buf), ) != C_OK)
+ if (getresponseline(fin, buf, ftp_buflen, ) != C_OK)
goto cleanup_fetch_url;
if (len == 0)
break;
@@ -1364,6 +1369,7 @@ cleanup_fetch_url:
rv = C_CLEANUP;
goto out;
out:
+ FREEPTR(buf);
FREEPTR(message);
return rv;
}
Index: src/usr.bin/ftp/ftp.1
diff -u src/usr.bin/ftp/ftp.1:1.151 src/usr.bin/ftp/ftp.1:1.152
--- src/usr.bin/ftp/ftp.1:1.151 Fri Dec 8 21:15:11 2023
+++ src/usr.bin/ftp/ftp.1 Sun Feb 18 17:29:56 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.151 2023/12/09 02:15:11 lukem Exp $
+.\" $NetBSD: ftp.1,v 1.152 2024/02/18 22:29:56 christos Exp $
.\"
.\" Copyright (c) 1996-2023 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -57,7 +57,7 @@
.\"
.\" @(#)ftp.1 8.3 (Berkeley) 10/9/94
.\"
-.Dd December 9, 2023
+.Dd February 18, 2024
.Dt FTP 1
.Os
.Sh NAME
@@ -69,6 +69,7 @@
.Op Fl N Ar netrc
.Op Fl o Ar output
.Op Fl P Ar port
+.Op Fl b Ar bufsize
.Op Fl q Ar quittime
.Op Fl r Ar retry
.Op Fl s Ar srcaddr
@@ -201,6 +202,9 @@ implement passive mode properly.
Causes
.Nm
to bypass normal login procedure, and use an anonymous login instead.
+.It Fl b Ar bufsize
+Change the input buffer size to
+.Ar bufsize .
.It Fl d
Enables debugging.
.It Fl e
Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.175 src/usr.bin/ftp/ftp.c:1.176
--- src/usr.bin/ftp/ftp.c:1.175 Fri May 5 11:46:06 2023
+++ src/usr.bin/ftp/ftp.c Sun Feb 18 17:29:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.175 2023/05/05 15:46:06 lukem Exp $ */
+/* $NetBSD: ftp.c,v 1.176 2024/02/18 22:29:56 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.175 2023/05/05 15:46:06 lukem Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.176 2024/02/18 22:29:56 christos Exp $");
#endif
#endif /* not lint */
@@ -130,6 +130,7 @@ sigjmp_buf ptabort;
int ptabflg;
int ptflag = 0;
char pasv[BUFSIZ]; /* passive port for proxy data connection */
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: christos Date: Sun Feb 18 22:29:56 UTC 2024 Modified Files: src/usr.bin/ftp: fetch.c ftp.1 ftp.c ftp_var.h main.c ssl.c Log Message: Add -b to specify the buffer size. To generate a diff of this commit: cvs rdiff -u -r1.238 -r1.239 src/usr.bin/ftp/fetch.c cvs rdiff -u -r1.151 -r1.152 src/usr.bin/ftp/ftp.1 cvs rdiff -u -r1.175 -r1.176 src/usr.bin/ftp/ftp.c cvs rdiff -u -r1.86 -r1.87 src/usr.bin/ftp/ftp_var.h cvs rdiff -u -r1.129 -r1.130 src/usr.bin/ftp/main.c cvs rdiff -u -r1.16 -r1.17 src/usr.bin/ftp/ssl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/dhcp
Module Name:src Committed By: christos Date: Sun Feb 18 20:58:01 UTC 2024 Modified Files: src/external/mpl/dhcp: Makefile Makefile.inc Added Files: src/external/mpl/dhcp/bind: Makefile Makefile.inc src/external/mpl/dhcp/bind/dist: version src/external/mpl/dhcp/bind/dist/lib/dns: Kyuafile Makefile.in acl.c adb.c badcache.c byaddr.c cache.c callbacks.c catz.c client.c clientinfo.c compress.c db.c dbiterator.c dbtable.c diff.c dispatch.c dlz.c dns64.c dnsrps.c dnssec.c dnstap.c dnstap.proto ds.c dst_api.c dst_internal.h dst_openssl.h dst_parse.c dst_parse.h dst_pkcs11.h dst_result.c dyndb.c ecdb.c ecs.c fixedname.c forward.c gen-unix.h gen-win32.h gen.c geoip2.c gssapi_link.c gssapictx.c hmac_link.c ipkeylist.c iptable.c journal.c kasp.c key.c keydata.c keymgr.c keytable.c lib.c log.c lookup.c mapapi master.c masterdump.c message.c name.c ncache.c nsec.c nsec3.c nta.c openssl_link.c openssldh_link.c opensslecdsa_link.c openssleddsa_link.c opensslrsa_link.c order.c peer.c pkcs11.c pkcs11ecdsa_link.c pkcs11eddsa_link.c pkcs11rsa_link.c portlist.c private.c rbt.c rbtdb.c rbtdb.h rcode.c rdata.c rdatalist.c rdatalist_p.h rdataset.c rdatasetiter.c rdataslab.c request.c resolver.c result.c rootns.c rpz.c rriterator.c rrl.c sdb.c sdlz.c soa.c ssu.c ssu_external.c stats.c tcpmsg.c time.c timer.c tkey.c tsec.c tsig.c tsig_p.h ttl.c update.c validator.c version.c view.c xfrin.c zone.c zone_p.h zonekey.c zoneverify.c zt.c src/external/mpl/dhcp/bind/dist/lib/dns/include: Makefile.in src/external/mpl/dhcp/bind/dist/lib/dns/include/dns: Makefile.in acl.h adb.h badcache.h bit.h byaddr.h cache.h callbacks.h catz.h cert.h client.h clientinfo.h compress.h db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dlz_dlopen.h dns64.h dnsrps.h dnssec.h dnstap.h ds.h dsdigest.h dyndb.h ecdb.h ecs.h edns.h events.h fixedname.h forward.h geoip.h ipkeylist.h iptable.h journal.h kasp.h keydata.h keyflags.h keymgr.h keytable.h keyvalues.h lib.h librpz.h lmdb.h log.h lookup.h master.h masterdump.h message.h name.h ncache.h nsec.h nsec3.h nta.h opcode.h order.h peer.h portlist.h private.h rbt.h rcode.h rdata.h rdataclass.h rdatalist.h rdataset.h rdatasetiter.h rdataslab.h rdatatype.h request.h resolver.h result.h rootns.h rpz.h rriterator.h rrl.h sdb.h sdlz.h secalg.h secproto.h soa.h ssu.h stats.h tcpmsg.h time.h timer.h tkey.h tsec.h tsig.h ttl.h types.h update.h validator.h version.h view.h xfrin.h zone.h zonekey.h zoneverify.h zt.h src/external/mpl/dhcp/bind/dist/lib/dns/include/dst: Makefile.in dst.h gssapi.h result.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata: rdatastructpre.h rdatastructsuf.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata/any_255: tsig_250.c tsig_250.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata/ch_3: a_1.c a_1.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata/generic: afsdb_18.c afsdb_18.h amtrelay_260.c amtrelay_260.h avc_258.c avc_258.h caa_257.c caa_257.h cdnskey_60.c cdnskey_60.h cds_59.c cds_59.h cert_37.c cert_37.h cname_5.c cname_5.h csync_62.c csync_62.h dlv_32769.c dlv_32769.h dname_39.c dname_39.h dnskey_48.c dnskey_48.h doa_259.c doa_259.h ds_43.c ds_43.h eui48_108.c eui48_108.h eui64_109.c eui64_109.h gpos_27.c gpos_27.h hinfo_13.c hinfo_13.h hip_55.c hip_55.h ipseckey_45.c ipseckey_45.h isdn_20.c isdn_20.h key_25.c key_25.h keydata_65533.c keydata_65533.h l32_105.c l32_105.h l64_106.c l64_106.h loc_29.c loc_29.h lp_107.c lp_107.h mb_7.c mb_7.h md_3.c md_3.h mf_4.c mf_4.h mg_8.c mg_8.h minfo_14.c minfo_14.h mr_9.c mr_9.h mx_15.c mx_15.h naptr_35.c naptr_35.h nid_104.c nid_104.h ninfo_56.c ninfo_56.h ns_2.c ns_2.h nsec3_50.c nsec3_50.h nsec3param_51.c nsec3param_51.h nsec_47.c nsec_47.h null_10.c null_10.h nxt_30.c nxt_30.h openpgpkey_61.c openpgpkey_61.h opt_41.c opt_41.h proforma.c proforma.h ptr_12.c ptr_12.h rkey_57.c rkey_57.h rp_17.c rp_17.h rrsig_46.c rrsig_46.h rt_21.c rt_21.h sig_24.c sig_24.h sink_40.c sink_40.h smimea_53.c smimea_53.h soa_6.c soa_6.h spf_99.c spf_99.h sshfp_44.c sshfp_44.h ta_32768.c ta_32768.h talink_58.c talink_58.h tkey_249.c tkey_249.h tlsa_52.c tlsa_52.h txt_16.c txt_16.h uri_256.c uri_256.h x25_19.c x25_19.h zonemd_63.c zonemd_63.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata/hs_4: a_1.c a_1.h
CVS commit: src/external/mpl/dhcp
Module Name:src Committed By: christos Date: Sun Feb 18 20:58:01 UTC 2024 Modified Files: src/external/mpl/dhcp: Makefile Makefile.inc Added Files: src/external/mpl/dhcp/bind: Makefile Makefile.inc src/external/mpl/dhcp/bind/dist: version src/external/mpl/dhcp/bind/dist/lib/dns: Kyuafile Makefile.in acl.c adb.c badcache.c byaddr.c cache.c callbacks.c catz.c client.c clientinfo.c compress.c db.c dbiterator.c dbtable.c diff.c dispatch.c dlz.c dns64.c dnsrps.c dnssec.c dnstap.c dnstap.proto ds.c dst_api.c dst_internal.h dst_openssl.h dst_parse.c dst_parse.h dst_pkcs11.h dst_result.c dyndb.c ecdb.c ecs.c fixedname.c forward.c gen-unix.h gen-win32.h gen.c geoip2.c gssapi_link.c gssapictx.c hmac_link.c ipkeylist.c iptable.c journal.c kasp.c key.c keydata.c keymgr.c keytable.c lib.c log.c lookup.c mapapi master.c masterdump.c message.c name.c ncache.c nsec.c nsec3.c nta.c openssl_link.c openssldh_link.c opensslecdsa_link.c openssleddsa_link.c opensslrsa_link.c order.c peer.c pkcs11.c pkcs11ecdsa_link.c pkcs11eddsa_link.c pkcs11rsa_link.c portlist.c private.c rbt.c rbtdb.c rbtdb.h rcode.c rdata.c rdatalist.c rdatalist_p.h rdataset.c rdatasetiter.c rdataslab.c request.c resolver.c result.c rootns.c rpz.c rriterator.c rrl.c sdb.c sdlz.c soa.c ssu.c ssu_external.c stats.c tcpmsg.c time.c timer.c tkey.c tsec.c tsig.c tsig_p.h ttl.c update.c validator.c version.c view.c xfrin.c zone.c zone_p.h zonekey.c zoneverify.c zt.c src/external/mpl/dhcp/bind/dist/lib/dns/include: Makefile.in src/external/mpl/dhcp/bind/dist/lib/dns/include/dns: Makefile.in acl.h adb.h badcache.h bit.h byaddr.h cache.h callbacks.h catz.h cert.h client.h clientinfo.h compress.h db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dlz_dlopen.h dns64.h dnsrps.h dnssec.h dnstap.h ds.h dsdigest.h dyndb.h ecdb.h ecs.h edns.h events.h fixedname.h forward.h geoip.h ipkeylist.h iptable.h journal.h kasp.h keydata.h keyflags.h keymgr.h keytable.h keyvalues.h lib.h librpz.h lmdb.h log.h lookup.h master.h masterdump.h message.h name.h ncache.h nsec.h nsec3.h nta.h opcode.h order.h peer.h portlist.h private.h rbt.h rcode.h rdata.h rdataclass.h rdatalist.h rdataset.h rdatasetiter.h rdataslab.h rdatatype.h request.h resolver.h result.h rootns.h rpz.h rriterator.h rrl.h sdb.h sdlz.h secalg.h secproto.h soa.h ssu.h stats.h tcpmsg.h time.h timer.h tkey.h tsec.h tsig.h ttl.h types.h update.h validator.h version.h view.h xfrin.h zone.h zonekey.h zoneverify.h zt.h src/external/mpl/dhcp/bind/dist/lib/dns/include/dst: Makefile.in dst.h gssapi.h result.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata: rdatastructpre.h rdatastructsuf.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata/any_255: tsig_250.c tsig_250.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata/ch_3: a_1.c a_1.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata/generic: afsdb_18.c afsdb_18.h amtrelay_260.c amtrelay_260.h avc_258.c avc_258.h caa_257.c caa_257.h cdnskey_60.c cdnskey_60.h cds_59.c cds_59.h cert_37.c cert_37.h cname_5.c cname_5.h csync_62.c csync_62.h dlv_32769.c dlv_32769.h dname_39.c dname_39.h dnskey_48.c dnskey_48.h doa_259.c doa_259.h ds_43.c ds_43.h eui48_108.c eui48_108.h eui64_109.c eui64_109.h gpos_27.c gpos_27.h hinfo_13.c hinfo_13.h hip_55.c hip_55.h ipseckey_45.c ipseckey_45.h isdn_20.c isdn_20.h key_25.c key_25.h keydata_65533.c keydata_65533.h l32_105.c l32_105.h l64_106.c l64_106.h loc_29.c loc_29.h lp_107.c lp_107.h mb_7.c mb_7.h md_3.c md_3.h mf_4.c mf_4.h mg_8.c mg_8.h minfo_14.c minfo_14.h mr_9.c mr_9.h mx_15.c mx_15.h naptr_35.c naptr_35.h nid_104.c nid_104.h ninfo_56.c ninfo_56.h ns_2.c ns_2.h nsec3_50.c nsec3_50.h nsec3param_51.c nsec3param_51.h nsec_47.c nsec_47.h null_10.c null_10.h nxt_30.c nxt_30.h openpgpkey_61.c openpgpkey_61.h opt_41.c opt_41.h proforma.c proforma.h ptr_12.c ptr_12.h rkey_57.c rkey_57.h rp_17.c rp_17.h rrsig_46.c rrsig_46.h rt_21.c rt_21.h sig_24.c sig_24.h sink_40.c sink_40.h smimea_53.c smimea_53.h soa_6.c soa_6.h spf_99.c spf_99.h sshfp_44.c sshfp_44.h ta_32768.c ta_32768.h talink_58.c talink_58.h tkey_249.c tkey_249.h tlsa_52.c tlsa_52.h txt_16.c txt_16.h uri_256.c uri_256.h x25_19.c x25_19.h zonemd_63.c zonemd_63.h src/external/mpl/dhcp/bind/dist/lib/dns/rdata/hs_4: a_1.c a_1.h
CVS commit: src/usr.bin/getconf
Module Name:src Committed By: jkoshy Date: Sun Feb 18 19:35:38 UTC 2024 Modified Files: src/usr.bin/getconf: getconf.1 Log Message: getconf.1: Note that leading underscores in configuration variable names are ignored by getconf(1). While here, add a section with examples, and make the synopsis more concise. PR bin/57875 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/getconf/getconf.1 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/getconf/getconf.1 diff -u src/usr.bin/getconf/getconf.1:1.13 src/usr.bin/getconf/getconf.1:1.14 --- src/usr.bin/getconf/getconf.1:1.13 Sun Apr 13 01:45:34 2014 +++ src/usr.bin/getconf/getconf.1 Sun Feb 18 19:35:38 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: getconf.1,v 1.13 2014/04/13 01:45:34 snj Exp $ +.\" $NetBSD: getconf.1,v 1.14 2024/02/18 19:35:38 jkoshy Exp $ .\" .\" Copyright (c) 1996 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 August 9, 2011 +.Dd February 18, 2024 .Dt GETCONF 1 .Os .Sh NAME @@ -37,13 +37,10 @@ .Nm .Ar system_var .Nm -.Fl a -.Nm .Ar path_var .Ar pathname .Nm -.Fl a -.Ar pathname +.Fl a Op Ar pathname .Sh DESCRIPTION The .Nm @@ -80,8 +77,28 @@ standard output, in the format = .Va value .Dc . +.Pp +For compatibility with other operating systems, +.Nm +will ignore leading underscores in the names specified in the +.Ar system_var +and +.Ar path_var +arguments. .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +To retrieve the number of configured processors, use: +.Bd -literal -offset indent +$ getconf NPROCESSORS_CONF +.Ed +.Pp +To retrieve the maximum number of bytes (excluding the trailing +.Dv NUL ) +for a filename in the current directory, use: +.Bd -literal -offset indent +$ getconf NAME_MAX . +.Ed .Sh SEE ALSO .Xr pathconf 2 , .Xr confstr 3 ,
CVS commit: src/usr.bin/getconf
Module Name:src Committed By: jkoshy Date: Sun Feb 18 19:35:38 UTC 2024 Modified Files: src/usr.bin/getconf: getconf.1 Log Message: getconf.1: Note that leading underscores in configuration variable names are ignored by getconf(1). While here, add a section with examples, and make the synopsis more concise. PR bin/57875 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/getconf/getconf.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Sun Feb 18 16:59:16 UTC 2024
Modified Files:
src/usr.sbin/makefs: makefs.c makefs.h
Log Message:
Add an options pretty-printer, pass some lint.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/makefs/makefs.c
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/makefs/makefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/makefs.c
diff -u src/usr.sbin/makefs/makefs.c:1.56 src/usr.sbin/makefs/makefs.c:1.57
--- src/usr.sbin/makefs/makefs.c:1.56 Thu Dec 28 07:13:55 2023
+++ src/usr.sbin/makefs/makefs.c Sun Feb 18 11:59:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: makefs.c,v 1.56 2023/12/28 12:13:55 tsutsui Exp $ */
+/* $NetBSD: makefs.c,v 1.57 2024/02/18 16:59:16 christos Exp $ */
/*
* Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: makefs.c,v 1.56 2023/12/28 12:13:55 tsutsui Exp $");
+__RCSID("$NetBSD: makefs.c,v 1.57 2024/02/18 16:59:16 christos Exp $");
#endif /* !__lint */
#include
@@ -100,7 +100,8 @@ main(int argc, char *argv[])
fstype_t *fstype;
fsinfo_t fsoptions;
fsnode *root;
- int ch, i, len;
+ int ch, i;
+ size_t len;
char *specfile;
setprogname(argv[0]);
@@ -156,7 +157,7 @@ main(int argc, char *argv[])
len = strlen(optarg) - 1;
if (optarg[len] == '%') {
optarg[len] = '\0';
-fsoptions.freeblockpc =
+fsoptions.freeblockpc = (int)
strsuftoll("free block percentage",
optarg, 0, 99);
} else {
@@ -167,14 +168,14 @@ main(int argc, char *argv[])
break;
case 'd':
- debug = strtoll(optarg, NULL, 0);
+ debug = (int)strtoll(optarg, NULL, 0);
break;
case 'f':
len = strlen(optarg) - 1;
if (optarg[len] == '%') {
optarg[len] = '\0';
-fsoptions.freefilepc =
+fsoptions.freefilepc = (int)
strsuftoll("free file percentage",
optarg, 0, 99);
} else {
@@ -351,6 +352,45 @@ set_option(const option_t *options, cons
return retval;
}
+void
+print_options(FILE *fp, const option_t *options)
+{
+ for (size_t i = 0; options[i].name != NULL; i++) {
+ fprintf(fp, "%s=", options[i].name);
+ switch (options[i].type) {
+ case OPT_BOOL:
+ fputs(*(bool *)options[i].value ? "true\n" : "false\n",
+ fp);
+ break;
+ case OPT_STRARRAY:
+ case OPT_STRPTR:
+ case OPT_STRBUF:
+ fprintf(fp, "%s\n", *(const char **)options[i].value);
+ break;
+ case OPT_INT64:
+ fprintf(fp, "%" PRIu64 "\n",
+ *(uint64_t *)options[i].value);
+ break;
+ case OPT_INT32:
+ fprintf(fp, "%" PRIu32 "\n",
+ *(uint32_t *)options[i].value);
+ break;
+ case OPT_INT16:
+ fprintf(fp, "%" PRIu16 "\n",
+ *(uint16_t *)options[i].value);
+ break;
+ case OPT_INT8:
+ fprintf(fp, "%" PRIu8 "\n",
+ *(uint8_t *)options[i].value);
+ break;
+ default:
+ warnx("Unknown type %d in option %s", options[i].type,
+ options[i].name);
+ return;
+ }
+ }
+}
+
int
set_option_var(const option_t *options, const char *var, const char *val,
char *buf, size_t len)
@@ -402,7 +442,7 @@ set_option_var(const option_t *options,
val);
return 0;
}
- return i;
+ return (int)i;
}
warnx("Unknown option `%s'", var);
return -1;
Index: src/usr.sbin/makefs/makefs.h
diff -u src/usr.sbin/makefs/makefs.h:1.40 src/usr.sbin/makefs/makefs.h:1.41
--- src/usr.sbin/makefs/makefs.h:1.40 Sun May 8 17:29:20 2022
+++ src/usr.sbin/makefs/makefs.h Sun Feb 18 11:59:16 2024
@@ -49,6 +49,7 @@
#define HAVE_FSTATVFS 1
#endif
+#include
#include
#include
@@ -179,6 +180,7 @@ void apply_specfile(const char *, const
void dump_fsnodes(fsnode *);
const char * inode_type(mode_t);
int set_option(const option_t *, const char *, char *, size_t);
+void print_options(FILE *, const option_t *);
int set_option_var(const option_t *, const char *, const char *,
char *, size_t);
fsnode * walk_dir(const char *, const char *, fsnode *, fsnode *, int,
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Sun Feb 18 16:59:16 UTC 2024 Modified Files: src/usr.sbin/makefs: makefs.c makefs.h Log Message: Add an options pretty-printer, pass some lint. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/makefs/makefs.c cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/makefs/makefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Sun Feb 18 16:58:51 UTC 2024 Modified Files: src/usr.sbin/makefs: msdos.c Log Message: PR/57945: Jan-Benedict Glaw: makefs: msdos filesystems with label not reproducible. When we specify a label, the volume label is used to create the root dir and it gets stamped by the timestamp. We were trying to set the timestamp in the fs-specific part of the options parsing which did not work since the method was called only for fs_specific options. Move setting of the timestamp just before we create the fs, where we reconcile the rest of the options. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/makefs/msdos.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/makefs
Module Name:src
Committed By: christos
Date: Sun Feb 18 16:58:51 UTC 2024
Modified Files:
src/usr.sbin/makefs: msdos.c
Log Message:
PR/57945: Jan-Benedict Glaw: makefs: msdos filesystems with label not
reproducible.
When we specify a label, the volume label is used to create the root dir
and it gets stamped by the timestamp. We were trying to set the timestamp
in the fs-specific part of the options parsing which did not work since
the method was called only for fs_specific options. Move setting of the
timestamp just before we create the fs, where we reconcile the rest of
the options.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/makefs/msdos.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/makefs/msdos.c
diff -u src/usr.sbin/makefs/msdos.c:1.23 src/usr.sbin/makefs/msdos.c:1.24
--- src/usr.sbin/makefs/msdos.c:1.23 Thu Dec 28 07:13:55 2023
+++ src/usr.sbin/makefs/msdos.c Sun Feb 18 11:58:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msdos.c,v 1.23 2023/12/28 12:13:55 tsutsui Exp $ */
+/* $NetBSD: msdos.c,v 1.24 2024/02/18 16:58:51 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: msdos.c,v 1.23 2023/12/28 12:13:55 tsutsui Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.24 2024/02/18 16:58:51 christos Exp $");
#endif /* !__lint */
#include
@@ -121,7 +121,7 @@ msdos_parse_opts(const char *option, fsi
assert(msdos_opt != NULL);
if (debug & DEBUG_FS_PARSE_OPTS)
- printf("msdos_parse_opts: got `%s'\n", option);
+ printf("%s: got `%s'\n", __func__, option);
rv = set_option(msdos_options, option, NULL, 0);
if (rv == -1)
@@ -134,10 +134,6 @@ msdos_parse_opts(const char *option, fsi
else if (strcmp(msdos_options[rv].name, "hidden_sectors") == 0)
msdos_opt->hidden_sectors_set = 1;
- if (stampst.st_ino) {
- msdos_opt->timestamp_set = 1;
- msdos_opt->timestamp = stampst.st_mtime;
- }
return 1;
}
@@ -172,6 +168,10 @@ msdos_makefs(const char *image, const ch
"!= -o bytes_per_sector %u",
fsopts->sectorsize, msdos_opt->options.bytes_per_sector);
}
+ if (stampst.st_ino) {
+ msdos_opt->options.timestamp_set = 1;
+ msdos_opt->options.timestamp = stampst.st_mtime;
+ }
/* create image */
printf("Creating `%s'\n", image);
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Feb 18 16:55:02 UTC 2024 Modified Files: src/lib/libutil: snprintb.3 src/sys/sys: mman.h Log Message: mman.h: fix snprintb description for alignment 2^60 To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libutil/snprintb.3 cvs rdiff -u -r1.64 -r1.65 src/sys/sys/mman.h 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: Sun Feb 18 16:55:02 UTC 2024 Modified Files: src/lib/libutil: snprintb.3 src/sys/sys: mman.h Log Message: mman.h: fix snprintb description for alignment 2^60 To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libutil/snprintb.3 cvs rdiff -u -r1.64 -r1.65 src/sys/sys/mman.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/snprintb.3 diff -u src/lib/libutil/snprintb.3:1.31 src/lib/libutil/snprintb.3:1.32 --- src/lib/libutil/snprintb.3:1.31 Thu Feb 15 22:48:58 2024 +++ src/lib/libutil/snprintb.3 Sun Feb 18 16:55:02 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: snprintb.3,v 1.31 2024/02/15 22:48:58 rillig Exp $ +.\" $NetBSD: snprintb.3,v 1.32 2024/02/18 16:55:02 rillig Exp $ .\" .\" Copyright (c) 1998 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 February 15, 2024 +.Dd February 18, 2024 .Dt SNPRINTB 3 .Os .Sh NAME @@ -323,7 +323,7 @@ snprintb_m(buf, bufsize, .Pp A more complex example from .In sys/mman.h -that uses the both bit position +that uses both the bit position .Sq Cm b formatting as well as the .Sq Cm F @@ -370,7 +370,7 @@ multibit field formatting with a default ":\e060" "ALIGN=256TB\e0" \e ":\e064" "ALIGN=4PB\e0" \e ":\e070" "ALIGN=64PB\e0" \e -":\e074" "ALIGN=256PB\e0" \e +":\e074" "ALIGN=1EB\e0" \e "*" "ALIGN=2^%ju\e0" snprintb(buf, bufsize, MAP_FMT, 0x0d001234) Index: src/sys/sys/mman.h diff -u src/sys/sys/mman.h:1.64 src/sys/sys/mman.h:1.65 --- src/sys/sys/mman.h:1.64 Mon Jul 10 18:22:31 2023 +++ src/sys/sys/mman.h Sun Feb 18 16:55:02 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: mman.h,v 1.64 2023/07/10 18:22:31 christos Exp $ */ +/* $NetBSD: mman.h,v 1.65 2024/02/18 16:55:02 rillig Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -157,7 +157,7 @@ typedef __off_t off_t; /* file offset ":\060" "ALIGN=256TB\0" \ ":\064" "ALIGN=4PB\0" \ ":\070" "ALIGN=64PB\0" \ - ":\074" "ALIGN=256PB\0" \ + ":\074" "ALIGN=1EB\0" \ "*" "ALIGN=2^%ju\0" #endif
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Feb 18 16:32:54 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #589 - #593, #595 - #600 To generate a diff of this commit: cvs rdiff -u -r1.1.2.197 -r1.1.2.198 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.197 src/doc/CHANGES-10.0:1.1.2.198 --- src/doc/CHANGES-10.0:1.1.2.197 Wed Feb 14 15:10:47 2024 +++ src/doc/CHANGES-10.0 Sun Feb 18 16:32:54 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.197 2024/02/14 15:10:47 sborrill Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.198 2024/02/18 16:32:54 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15506,7 +15506,7 @@ doc/3RDPARTY (manual edit) Updated tzdata to 2024a. [kre, ticket #586] -sys/arch/evbppc/wii/dev/wiifb.c 1.6 +sys/arch/evbppc/wii/dev/wiifb.c 1.6 wiifb(4): various fixes. [jmcneill, ticket #587] @@ -15517,13 +15517,87 @@ sys/dev/pci/ppb.c1.75 [rin, ticket #588] external/gpl2/groff/tmac/mdoc.local (manually edited) -sys/sys/param.h (manually edited) +sys/sys/param.h (manually edited) Welcome to 10.0_RC4 usr.sbin/sysinst/label.c 1.51 PR 57927: fix moving of the install target to a new - partition. + partition. [martin, ticket #594] +sys/arch/arm/broadcom/bcm2835_bsc.c 1.16 +sys/arch/arm/broadcom/bcm2835_vcaudio.c 1.20 +sys/arch/arm/broadcom/bcm2838_pcie.c 1.7 +sys/arch/arm/broadcom/bcm53xx_board.c 1.26 +sys/arch/arm/broadcom/bcm53xx_cca.c 1.6 +sys/arch/arm/broadcom/bcm53xx_idm.c 1.4 +sys/arch/arm/broadcom/bcm53xx_pax.c 1.24 +sys/arch/arm/broadcom/bcm53xx_reg.h 1.20 + + Trailing whitespace + [skrll, ticket #598] + +sys/dev/usb/ehci.c1.322 +sys/dev/usb/ehcireg.h1.39 + + ehci(4): fix the build for kernels with option EHCI_DEBUG. + [gutteridge, ticket #589] + +sys/arch/vax/vax/machdep.c 1.197 + + vax: include leds.h to make /dev/leds work. + [hans, ticket #590] + +external/bsd/blocklist/bin/blocklistd.conf.5 1.3 +external/bsd/blocklist/bin/conf.c 1.4-1.6 +external/bsd/blocklist/etc/blocklistd.conf 1.3 + + blocklistd(8): PR 57905: fix parsing of ipv6 addresses and + add examples to the documentation. + [markd, ticket #591] + +sys/arch/hppa/dev/dino.c 1.17 +sys/arch/hppa/dev/elroy.c 1.7 +sys/arch/hppa/hppa/mainbus.c 1.13 +sys/arch/hppa/include/bus_defs.h 1.3 +sys/arch/hppa/include/bus_funcs.h 1.2 + + hppa: add missing bus_space_*_stream() methods. + [macallan, ticket #592] + +sys/dev/ic/sti.c1.32 + + hppa: sti(4): make this work properly on PCI Visualize EG. + [macallan, ticket #593] + +libexec/utmp_update/utmp_update.c 1.14 + + utmp_update(8): check for non-printable characters in ut_host. + [shm, ticket #595] + +sys/dev/dec/dzkbd.c1.32 +sys/dev/dec/lk201_ws.c1.11 +sys/dev/dec/lk201var.h1.8 + + vax: fix keyboard console in polled mode on some machines. + [tsutsui, ticket #596] + +sys/arch/arm/broadcom/bcm53xx_eth.c 1.43 +sys/arch/arm/broadcom/bcm53xx_pax.c 1.23 +sys/arch/evbarm/conf/std.bcm53xx 1.21 + + evbarm: fix build of BCM5301X and BCM56340 kernels. + [skrll, ticket #597] + +sys/arch/arm/broadcom/bcm53xx_eth.c 1.44 + + evbarm: fix ethernet controller setup on BCM53XX. + [skrll, ticket #599] + +sys/dev/tc/zskbd.c1.22 + + alpha, pmax: fix keyboard console in polled mode on some machines. + [tsutsui, ticket #600] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Feb 18 16:32:54 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #589 - #593, #595 - #600 To generate a diff of this commit: cvs rdiff -u -r1.1.2.197 -r1.1.2.198 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Feb 18 16:31:07 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1799 To generate a diff of this commit: cvs rdiff -u -r1.1.2.129 -r1.1.2.130 src/doc/CHANGES-9.4 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-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.129 src/doc/CHANGES-9.4:1.1.2.130 --- src/doc/CHANGES-9.4:1.1.2.129 Sat Feb 17 16:19:56 2024 +++ src/doc/CHANGES-9.4 Sun Feb 18 16:31:06 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.129 2024/02/17 16:19:56 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.130 2024/02/18 16:31:06 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -4162,3 +4162,8 @@ sys/dev/dec/lk201var.h1.8 vax: fix keyboard console in polled mode on some machines. [tsutsui, ticket #1798] +sys/dev/tc/zskbd.c1.22 + + alpha, pmax: fix keyboard console in polled mode on some machines. + [tsutsui, ticket #1799] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Feb 18 16:31:07 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1799 To generate a diff of this commit: cvs rdiff -u -r1.1.2.129 -r1.1.2.130 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/tc
Module Name:src Committed By: martin Date: Sun Feb 18 16:30:20 UTC 2024 Modified Files: src/sys/dev/tc [netbsd-9]: zskbd.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1799): sys/dev/tc/zskbd.c: revision 1.22 Fix another fatal typo that causes zskbd_cngetc() to stall as dzkbd. Tested on my DEC 3000/300 and LK421. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.24.1 src/sys/dev/tc/zskbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/tc
Module Name:src
Committed By: martin
Date: Sun Feb 18 16:30:20 UTC 2024
Modified Files:
src/sys/dev/tc [netbsd-9]: zskbd.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1799):
sys/dev/tc/zskbd.c: revision 1.22
Fix another fatal typo that causes zskbd_cngetc() to stall as dzkbd.
Tested on my DEC 3000/300 and LK421.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.24.1 src/sys/dev/tc/zskbd.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/tc/zskbd.c
diff -u src/sys/dev/tc/zskbd.c:1.18 src/sys/dev/tc/zskbd.c:1.18.24.1
--- src/sys/dev/tc/zskbd.c:1.18 Fri Jan 2 21:32:26 2015
+++ src/sys/dev/tc/zskbd.c Sun Feb 18 16:30:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zskbd.c,v 1.18 2015/01/02 21:32:26 jklos Exp $ */
+/* $NetBSD: zskbd.c,v 1.18.24.1 2024/02/18 16:30:20 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.18 2015/01/02 21:32:26 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.18.24.1 2024/02/18 16:30:20 martin Exp $");
#include
#include
@@ -281,7 +281,7 @@ zskbd_cngetc(void *v, u_int *type, int *
do {
c = zs_getc(zsi->zsi_cs);
- } while (!lk201_decode(>zsi_ks, 0, c, type, data) == LKD_NODATA);
+ } while (lk201_decode(>zsi_ks, 0, c, type, data) == LKD_NODATA);
}
static void
CVS commit: [netbsd-10] src/sys/dev/tc
Module Name:src
Committed By: martin
Date: Sun Feb 18 16:28:43 UTC 2024
Modified Files:
src/sys/dev/tc [netbsd-10]: zskbd.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #600):
sys/dev/tc/zskbd.c: revision 1.22
Fix another fatal typo that causes zskbd_cngetc() to stall as dzkbd.
Tested on my DEC 3000/300 and LK421.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.6.1 src/sys/dev/tc/zskbd.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/tc/zskbd.c
diff -u src/sys/dev/tc/zskbd.c:1.21 src/sys/dev/tc/zskbd.c:1.21.6.1
--- src/sys/dev/tc/zskbd.c:1.21 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/tc/zskbd.c Sun Feb 18 16:28:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zskbd.c,v 1.21 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: zskbd.c,v 1.21.6.1 2024/02/18 16:28:43 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.21 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.21.6.1 2024/02/18 16:28:43 martin Exp $");
#include
#include
@@ -281,7 +281,7 @@ zskbd_cngetc(void *v, u_int *type, int *
do {
c = zs_getc(zsi->zsi_cs);
- } while (!lk201_decode(>zsi_ks, 0, c, type, data) == LKD_NODATA);
+ } while (lk201_decode(>zsi_ks, 0, c, type, data) == LKD_NODATA);
}
static void
CVS commit: [netbsd-10] src/sys/dev/tc
Module Name:src Committed By: martin Date: Sun Feb 18 16:28:43 UTC 2024 Modified Files: src/sys/dev/tc [netbsd-10]: zskbd.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #600): sys/dev/tc/zskbd.c: revision 1.22 Fix another fatal typo that causes zskbd_cngetc() to stall as dzkbd. Tested on my DEC 3000/300 and LK421. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.21.6.1 src/sys/dev/tc/zskbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/arm/broadcom
Module Name:src Committed By: martin Date: Sun Feb 18 16:25:25 UTC 2024 Modified Files: src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_eth.c Log Message: Pull up following revision(s) (requested by skrll in ticket #599): sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.44 Test sc->sc_soft_ih (not sc->sc_ih) to see if the soft interrupt got established correctly. From Mori Hiroki. Fix some error recovery while I'm here. To generate a diff of this commit: cvs rdiff -u -r1.42.4.1 -r1.42.4.2 src/sys/arch/arm/broadcom/bcm53xx_eth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/arm/broadcom
Module Name:src
Committed By: martin
Date: Sun Feb 18 16:25:25 UTC 2024
Modified Files:
src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_eth.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #599):
sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.44
Test sc->sc_soft_ih (not sc->sc_ih) to see if the soft interrupt got
established correctly.
From Mori Hiroki.
Fix some error recovery while I'm here.
To generate a diff of this commit:
cvs rdiff -u -r1.42.4.1 -r1.42.4.2 src/sys/arch/arm/broadcom/bcm53xx_eth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42.4.1 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42.4.2
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42.4.1 Sun Feb 18 16:19:57 2024
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Sun Feb 18 16:25:25 2024
@@ -35,7 +35,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42.4.1 2024/02/18 16:19:57 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42.4.2 2024/02/18 16:25:25 martin Exp $");
#include
#include
@@ -344,16 +344,15 @@ bcmeth_ccb_attach(device_t parent, devic
(PRI_USER + MAXPRI_USER) / 2, IPL_NET, WQ_MPSAFE|WQ_PERCPU);
if (error) {
aprint_error(": failed to create workqueue: %d\n", error);
- goto fail_2;
+ goto fail_1;
}
sc->sc_soft_ih = softint_establish(SOFTINT_MPSAFE | SOFTINT_NET,
bcmeth_soft_intr, sc);
- if (sc->sc_ih == NULL) {
- aprint_error_dev(self, "failed to establish interrupt %d\n",
- loc->loc_intrs[0]);
- goto fail_3;
+ if (sc->sc_soft_ih == NULL) {
+ aprint_error_dev(self, "failed to establish soft interrupt\n");
+ goto fail_2;
}
sc->sc_ih = intr_establish(loc->loc_intrs[0], IPL_VM, IST_LEVEL,
@@ -362,7 +361,7 @@ bcmeth_ccb_attach(device_t parent, devic
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %d\n",
loc->loc_intrs[0]);
- goto fail_4;
+ goto fail_3;
} else {
aprint_normal_dev(self, "interrupting on irq %d\n",
loc->loc_intrs[0]);
@@ -426,8 +425,6 @@ bcmeth_ccb_attach(device_t parent, devic
return;
-fail_4:
- intr_disestablish(sc->sc_ih);
fail_3:
softint_disestablish(sc->sc_soft_ih);
fail_2:
CVS commit: [netbsd-10] src/sys/arch
Module Name:src
Committed By: martin
Date: Sun Feb 18 16:19:57 UTC 2024
Modified Files:
src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_eth.c bcm53xx_pax.c
src/sys/arch/evbarm/conf [netbsd-10]: std.bcm53xx
Log Message:
Pull up following revision(s) (requested by skrll in ticket #597):
sys/arch/evbarm/conf/std.bcm53xx: revision 1.21
sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.43
sys/arch/arm/broadcom/bcm53xx_pax.c: revision 1.23
Define KERNEL_VOFFSET_RUNTIME=1 to fix build of BCM5301X and BCM56340
Fix non-DIAGNOSTIC build
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/arm/broadcom/bcm53xx_eth.c
cvs rdiff -u -r1.22.6.1 -r1.22.6.2 src/sys/arch/arm/broadcom/bcm53xx_pax.c
cvs rdiff -u -r1.20 -r1.20.28.1 src/sys/arch/evbarm/conf/std.bcm53xx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42.4.1
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42 Sat Sep 17 19:41:18 2022
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Sun Feb 18 16:19:57 2024
@@ -35,7 +35,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42 2022/09/17 19:41:18 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42.4.1 2024/02/18 16:19:57 martin Exp $");
#include
#include
@@ -252,9 +252,7 @@ bcmeth_ccb_match(device_t parent, cfdata
if (strcmp(cf->cf_name, loc->loc_name))
return 0;
-#ifdef DIAGNOSTIC
- const int port = cf->cf_loc[BCMCCBCF_PORT];
-#endif
+ const int port __diagused = cf->cf_loc[BCMCCBCF_PORT];
KASSERT(port == BCMCCBCF_PORT_DEFAULT || port == loc->loc_port);
return 1;
Index: src/sys/arch/arm/broadcom/bcm53xx_pax.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.22.6.1 src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.22.6.2
--- src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.22.6.1 Fri Feb 16 12:07:08 2024
+++ src/sys/arch/arm/broadcom/bcm53xx_pax.c Sun Feb 18 16:19:57 2024
@@ -34,7 +34,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.22.6.1 2024/02/16 12:07:08 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.22.6.2 2024/02/18 16:19:57 martin Exp $");
#include
#include
@@ -136,9 +136,7 @@ bcmpax_ccb_match(device_t parent, cfdata
if (strcmp(cf->cf_name, loc->loc_name))
return 0;
-#ifdef DIAGNOSTIC
- const int port = cf->cf_loc[BCMCCBCF_PORT];
-#endif
+ const int port __diagused = cf->cf_loc[BCMCCBCF_PORT];
KASSERT(port == BCMCCBCF_PORT_DEFAULT || port == loc->loc_port);
return 1;
Index: src/sys/arch/evbarm/conf/std.bcm53xx
diff -u src/sys/arch/evbarm/conf/std.bcm53xx:1.20 src/sys/arch/evbarm/conf/std.bcm53xx:1.20.28.1
--- src/sys/arch/evbarm/conf/std.bcm53xx:1.20 Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/conf/std.bcm53xx Sun Feb 18 16:19:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: std.bcm53xx,v 1.20 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: std.bcm53xx,v 1.20.28.1 2024/02/18 16:19:56 martin Exp $
#
# standard NetBSD/evbarm for BCM5301X options
@@ -28,5 +28,10 @@ options __HAVE_PCI_CONF_HOOK
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"
makeoptions BOARDTYPE="bcm53xx"
+
+# Prevent the addition of a command line -DKERNEL_BASE_VOFFSET= as it
+# is done at runtime.
+makeoptions KERNEL_VOFFSET_RUNTIME=1
+
makeoptions KERNEL_BASE_VIRT="0x8010"
makeoptions LOADADDRESS="0x0010"
CVS commit: [netbsd-10] src/sys/arch
Module Name:src Committed By: martin Date: Sun Feb 18 16:19:57 UTC 2024 Modified Files: src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_eth.c bcm53xx_pax.c src/sys/arch/evbarm/conf [netbsd-10]: std.bcm53xx Log Message: Pull up following revision(s) (requested by skrll in ticket #597): sys/arch/evbarm/conf/std.bcm53xx: revision 1.21 sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.43 sys/arch/arm/broadcom/bcm53xx_pax.c: revision 1.23 Define KERNEL_VOFFSET_RUNTIME=1 to fix build of BCM5301X and BCM56340 Fix non-DIAGNOSTIC build To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/arm/broadcom/bcm53xx_eth.c cvs rdiff -u -r1.22.6.1 -r1.22.6.2 src/sys/arch/arm/broadcom/bcm53xx_pax.c cvs rdiff -u -r1.20 -r1.20.28.1 src/sys/arch/evbarm/conf/std.bcm53xx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/time
Module Name:src
Committed By: kre
Date: Sun Feb 18 12:47:08 UTC 2024
Modified Files:
src/lib/libc/time: strftime.c
Log Message:
Revert this part:
strftime %s now uses tm_gmtoff if available. (Problem and draft
patch reported by Dag-Erling Smørgrav.)
of the tzcode2924a update. It is bogus. The "problem" is/was a simple
misunderstanding of what strftime(%s) is intended to output. The "fix"
breaks it.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/lib/libc/time/strftime.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/strftime.c
diff -u src/lib/libc/time/strftime.c:1.54 src/lib/libc/time/strftime.c:1.55
--- src/lib/libc/time/strftime.c:1.54 Sat Feb 17 14:54:47 2024
+++ src/lib/libc/time/strftime.c Sun Feb 18 12:47:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: strftime.c,v 1.54 2024/02/17 14:54:47 christos Exp $ */
+/* $NetBSD: strftime.c,v 1.55 2024/02/18 12:47:08 kre Exp $ */
/* Convert a broken-down timestamp to a string. */
@@ -35,7 +35,7 @@
static char elsieid[] = "@(#)strftime.c 7.64";
static char elsieid[] = "@(#)strftime.c 8.3";
#else
-__RCSID("$NetBSD: strftime.c,v 1.54 2024/02/17 14:54:47 christos Exp $");
+__RCSID("$NetBSD: strftime.c,v 1.55 2024/02/18 12:47:08 kre Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -381,15 +381,11 @@ label:
tm.tm_mday = t->tm_mday;
tm.tm_mon = t->tm_mon;
tm.tm_year = t->tm_year;
-#ifdef TM_GMTOFF
- mkt = timeoff(, t->TM_GMTOFF);
-#else
tm.tm_isdst = t->tm_isdst;
#if defined TM_GMTOFF && ! UNINIT_TRAP
tm.TM_GMTOFF = t->TM_GMTOFF;
#endif
mkt = mktime_z(sp, );
-#endif
/* If mktime fails, %s expands to the
value of (time_t) -1 as a failure
marker; this is better in practice
CVS commit: src/lib/libc/time
Module Name:src Committed By: kre Date: Sun Feb 18 12:47:08 UTC 2024 Modified Files: src/lib/libc/time: strftime.c Log Message: Revert this part: strftime %s now uses tm_gmtoff if available. (Problem and draft patch reported by Dag-Erling Smørgrav.) of the tzcode2924a update. It is bogus. The "problem" is/was a simple misunderstanding of what strftime(%s) is intended to output. The "fix" breaks it. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/lib/libc/time/strftime.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/arm/conf
Module Name:src
Committed By: mrg
Date: Sun Feb 18 10:49:43 UTC 2024
Modified Files:
src/sys/arch/arm/conf: Makefile.arm
Log Message:
if we're building with GCC and MACHINE_CPU is aarch64, error out since
that isn't going to work.
doing this better in config(1) is difficult, but at least we can
detect and give a useful error message for this case instead of just
erroring out with some compiler options aren't supported. if we have
a good solution for config(1) we can remove this hack here..
might want to copy this hack for riscv too.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/arm/conf/Makefile.arm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.57 src/sys/arch/arm/conf/Makefile.arm:1.58
--- src/sys/arch/arm/conf/Makefile.arm:1.57 Fri Jul 28 02:41:30 2023
+++ src/sys/arch/arm/conf/Makefile.arm Sun Feb 18 10:49:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.arm,v 1.57 2023/07/28 02:41:30 rin Exp $
+# $NetBSD: Makefile.arm,v 1.58 2024/02/18 10:49:43 mrg Exp $
# Makefile for NetBSD
#
@@ -21,6 +21,11 @@ USETOOLS?= no
NEED_OWN_INSTALL_TARGET?=no
.include
+.if ${MACHINE_CPU} == "aarch64" && ${HAVE_GCC} != "no"
+. info (Building GENERIC instead of GENERIC64?)
+. error Don't build 32-bit kernel with 64-bit toolchain
+.endif
+
##
## (1) port identification
##
CVS commit: src/sys/arch/arm/conf
Module Name:src Committed By: mrg Date: Sun Feb 18 10:49:43 UTC 2024 Modified Files: src/sys/arch/arm/conf: Makefile.arm Log Message: if we're building with GCC and MACHINE_CPU is aarch64, error out since that isn't going to work. doing this better in config(1) is difficult, but at least we can detect and give a useful error message for this case instead of just erroring out with some compiler options aren't supported. if we have a good solution for config(1) we can remove this hack here.. might want to copy this hack for riscv too. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/arm/conf/Makefile.arm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64
Module Name:src
Committed By: andvar
Date: Sun Feb 18 09:03:44 UTC 2024
Modified Files:
src/sys/arch/aarch64/aarch64: trap.c
src/sys/arch/aarch64/conf: files.aarch64
Log Message:
Change KDB to KGDB, including "sys/kgdb.h", which were likely meant to be
defined.
Also comment out kgdb_machdep.c in files.aarch64, it doesn't exist yet.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/aarch64/aarch64/trap.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/aarch64/conf/files.aarch64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/trap.c
diff -u src/sys/arch/aarch64/aarch64/trap.c:1.50 src/sys/arch/aarch64/aarch64/trap.c:1.51
--- src/sys/arch/aarch64/aarch64/trap.c:1.50 Wed Oct 4 20:28:05 2023
+++ src/sys/arch/aarch64/aarch64/trap.c Sun Feb 18 09:03:44 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.50 2023/10/04 20:28:05 ad Exp $ */
+/* $NetBSD: trap.c,v 1.51 2024/02/18 09:03:44 andvar Exp $ */
/*-
* Copyright (c) 2014, 2023 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.50 2023/10/04 20:28:05 ad Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.51 2024/02/18 09:03:44 andvar Exp $");
#include "opt_arm_intr_impl.h"
#include "opt_compat_netbsd32.h"
@@ -43,8 +43,8 @@ __KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.5
#include
#include
#include
-#ifdef KDB
-#include
+#ifdef KGDB
+#include
#endif
#include
#include
@@ -73,7 +73,7 @@ __KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.5
#include
-#ifdef KDB
+#ifdef KGDB
#include
#endif
#ifdef DDB
Index: src/sys/arch/aarch64/conf/files.aarch64
diff -u src/sys/arch/aarch64/conf/files.aarch64:1.43 src/sys/arch/aarch64/conf/files.aarch64:1.44
--- src/sys/arch/aarch64/conf/files.aarch64:1.43 Thu Apr 20 08:28:02 2023
+++ src/sys/arch/aarch64/conf/files.aarch64 Sun Feb 18 09:03:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.aarch64,v 1.43 2023/04/20 08:28:02 skrll Exp $
+# $NetBSD: files.aarch64,v 1.44 2024/02/18 09:03:44 andvar Exp $
defflag opt_cpuoptions.h AARCH64_ALIGNMENT_CHECK
defflag opt_cpuoptions.h AARCH64_EL0_STACK_ALIGNMENT_CHECK
@@ -68,7 +68,7 @@ file arch/aarch64/aarch64/db_interface.c
file arch/aarch64/aarch64/db_trace.c ddb
file arch/aarch64/aarch64/db_machdep.c ddb
file arch/aarch64/aarch64/disasm.c ddb
-file arch/aarch64/aarch64/kgdb_machdep.c kgdb
+#file arch/aarch64/aarch64/kgdb_machdep.c kgdb # XXX: not implemented
# mainbus files
device mainbus { [addr = -1], [size = 0], [intr = -1] }
CVS commit: src/sys/arch/aarch64
Module Name:src Committed By: andvar Date: Sun Feb 18 09:03:44 UTC 2024 Modified Files: src/sys/arch/aarch64/aarch64: trap.c src/sys/arch/aarch64/conf: files.aarch64 Log Message: Change KDB to KGDB, including "sys/kgdb.h", which were likely meant to be defined. Also comment out kgdb_machdep.c in files.aarch64, it doesn't exist yet. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/aarch64/aarch64/trap.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/aarch64/conf/files.aarch64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
