CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat Apr 27 17:33:47 UTC 2024
Modified Files:
src/usr.bin/make: arch.c lst.c lst.h main.c meta.c parse.c targ.c
Log Message:
make: simplify freeing of lists
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/arch.c
cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/lst.c
cvs rdiff -u -r1.104 -r1.105 src/usr.bin/make/lst.h
cvs rdiff -u -r1.612 -r1.613 src/usr.bin/make/main.c
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/make/meta.c
cvs rdiff -u -r1.721 -r1.722 src/usr.bin/make/parse.c
cvs rdiff -u -r1.180 -r1.181 src/usr.bin/make/targ.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.215 src/usr.bin/make/arch.c:1.216
--- src/usr.bin/make/arch.c:1.215 Wed Feb 7 06:43:02 2024
+++ src/usr.bin/make/arch.c Sat Apr 27 17:33:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.215 2024/02/07 06:43:02 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.216 2024/04/27 17:33:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.215 2024/02/07 06:43:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.216 2024/04/27 17:33:46 rillig Exp $");
typedef struct List ArchList;
typedef struct ListNode ArchListNode;
@@ -151,9 +151,8 @@ static int ArchSVR4Entry(Arch *, char *,
#ifdef CLEANUP
static void
-ArchFree(void *ap)
+ArchFree(Arch *a)
{
- Arch *a = ap;
HashIter hi;
/* Free memory from hash entries */
@@ -1070,7 +1069,11 @@ void
Arch_End(void)
{
#ifdef CLEANUP
- Lst_DoneCall(, ArchFree);
+ ArchListNode *ln;
+
+ for (ln = archives.first; ln != NULL; ln = ln->next)
+ ArchFree(ln->datum);
+ Lst_Done();
#endif
}
Index: src/usr.bin/make/lst.c
diff -u src/usr.bin/make/lst.c:1.107 src/usr.bin/make/lst.c:1.108
--- src/usr.bin/make/lst.c:1.107 Fri Dec 29 20:43:58 2023
+++ src/usr.bin/make/lst.c Sat Apr 27 17:33:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.107 2023/12/29 20:43:58 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.108 2024/04/27 17:33:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -34,7 +34,7 @@
#include "make.h"
-MAKE_RCSID("$NetBSD: lst.c,v 1.107 2023/12/29 20:43:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: lst.c,v 1.108 2024/04/27 17:33:46 rillig Exp $");
static ListNode *
LstNodeNew(ListNode *prev, ListNode *next, void *datum)
@@ -60,13 +60,13 @@ Lst_Done(List *list)
}
void
-Lst_DoneCall(List *list, LstFreeProc freeProc)
+Lst_DoneFree(List *list)
{
ListNode *ln, *next;
for (ln = list->first; ln != NULL; ln = next) {
next = ln->next;
- freeProc(ln->datum);
+ free(ln->datum);
free(ln);
}
}
Index: src/usr.bin/make/lst.h
diff -u src/usr.bin/make/lst.h:1.104 src/usr.bin/make/lst.h:1.105
--- src/usr.bin/make/lst.h:1.104 Fri Dec 29 20:43:58 2023
+++ src/usr.bin/make/lst.h Sat Apr 27 17:33:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.h,v 1.104 2023/12/29 20:43:58 rillig Exp $ */
+/* $NetBSD: lst.h,v 1.105 2024/04/27 17:33:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -98,13 +98,10 @@ struct List {
ListNode *last;
};
-/* Free the datum of a node, called before freeing the node itself. */
-typedef void LstFreeProc(void *);
-
-/* Free the list nodes, but not the list itself. */
+/* Free the list nodes. */
void Lst_Done(List *);
-/* Free the list nodes, freeing the node data using the given function. */
-void Lst_DoneCall(List *, LstFreeProc);
+/* Free the list nodes, as well as each node's datum. */
+void Lst_DoneFree(List *);
#define LST_INIT { NULL, NULL }
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.612 src/usr.bin/make/main.c:1.613
--- src/usr.bin/make/main.c:1.612 Sun Mar 10 02:53:37 2024
+++ src/usr.bin/make/main.c Sat Apr 27 17:33:46 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.612 2024/03/10 02:53:37 sjg Exp $ */
+/* $NetBSD: main.c,v 1.613 2024/04/27 17:33:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.612 2024/03/10 02:53:37 sjg Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.613 2024/04/27 17:33:46 rillig Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1199,7 +1199,7 @@ ReadBuiltinRules(void)
Fatal("%s: cannot open %s.",
progname, (const char *)sysMkFiles.first->datum);
- Lst_DoneCall(, free);
+ Lst_DoneFree();
}
static void
@@ -1564,9 +1564,9 @@ static void
main_CleanUp(void)
{
#ifdef CLEANUP
- Lst_DoneCall(, free);
- Lst_DoneCall(, free);
- Lst_DoneCall(, free);
+ Lst_DoneFree();
+ Lst_DoneFree();
+ Lst_DoneFree();
#endif
if (DEBUG(GRAPH2))
Index:
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat Apr 27 17:33:47 UTC 2024 Modified Files: src/usr.bin/make: arch.c lst.c lst.h main.c meta.c parse.c targ.c Log Message: make: simplify freeing of lists To generate a diff of this commit: cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/arch.c cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/lst.c cvs rdiff -u -r1.104 -r1.105 src/usr.bin/make/lst.h cvs rdiff -u -r1.612 -r1.613 src/usr.bin/make/main.c cvs rdiff -u -r1.207 -r1.208 src/usr.bin/make/meta.c cvs rdiff -u -r1.721 -r1.722 src/usr.bin/make/parse.c cvs rdiff -u -r1.180 -r1.181 src/usr.bin/make/targ.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sat Apr 27 14:54:58 UTC 2024 Modified Files: src/share/man/man4: thinkpad.4 Log Message: mention that we handle battery controls too. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/thinkpad.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Sat Apr 27 14:54:58 UTC 2024 Modified Files: src/share/man/man4: thinkpad.4 Log Message: mention that we handle battery controls too. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/thinkpad.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/thinkpad.4 diff -u src/share/man/man4/thinkpad.4:1.4 src/share/man/man4/thinkpad.4:1.5 --- src/share/man/man4/thinkpad.4:1.4 Tue Mar 18 14:20:39 2014 +++ src/share/man/man4/thinkpad.4 Sat Apr 27 10:54:58 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: thinkpad.4,v 1.4 2014/03/18 18:20:39 riastradh Exp $ +.\" $NetBSD: thinkpad.4,v 1.5 2024/04/27 14:54:58 christos Exp $ .\" .\" Copyright (c) 2008 Jared D. McNeill .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 9, 2010 +.Dd April 27, 2024 .Dt THINKPAD 4 .Os .Sh NAME @@ -36,8 +36,8 @@ The .Nm driver provides support for vendor specific features found in IBM and -Lenovo brand laptops, such as function key handling, hotkey handling, and -temperature and fan monitoring. +Lenovo brand laptops, such as function key handling, hotkey handling, +battery controls, and temperature and fan monitoring. .Sh SEE ALSO .Xr acpi 4 , .Xr aps 4 ,
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: christos
Date: Sat Apr 27 14:50:18 UTC 2024
Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c
Log Message:
Expose a sysctl interface hw.acpi.thinkpad.bat[]. to control
some aspects of battery charging behavior on supported systems:
charge_start
threshold below which to start charging (in %, 0-99)
charge_stop
threshold above which to stop charging (in %, 1-100)
force_discharge
discharge while on AC power, e.g., for calibration
charge_inhibit
inhibit charging while on AC power
>From Malte Dehling
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/acpi/thinkpad_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.56 src/sys/dev/acpi/thinkpad_acpi.c:1.57
--- src/sys/dev/acpi/thinkpad_acpi.c:1.56 Sat Apr 27 10:45:11 2024
+++ src/sys/dev/acpi/thinkpad_acpi.c Sat Apr 27 10:50:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.56 2024/04/27 14:45:11 christos Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.57 2024/04/27 14:50:18 christos Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,13 +27,14 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.56 2024/04/27 14:45:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.57 2024/04/27 14:50:18 christos Exp $");
#include
#include
#include
#include
#include
+#include
#include
#include
@@ -49,10 +50,27 @@ ACPI_MODULE_NAME ("thinkpad_acpi")
#define THINKPAD_NFANSENSORS 1
#define THINKPAD_NSENSORS (THINKPAD_NTEMPSENSORS + THINKPAD_NFANSENSORS)
+typedef struct tp_sysctl_param {
+ device_t sp_dev;
+ int sp_bat;
+} tp_sysctl_param_t;
+
+typedef union tp_batctl {
+ int have_any;
+ struct {
+ int charge_start:1;
+ int charge_stop:1;
+ int charge_inhibit:1;
+ int force_discharge:1;
+ int individual_control:1;
+ } have;
+} tp_batctl_t;
+
typedef struct thinkpad_softc {
device_t sc_dev;
device_t sc_ecdev;
struct acpi_devnode *sc_node;
+ struct sysctllog *sc_log;
ACPI_HANDLE sc_powhdl;
ACPI_HANDLE sc_cmoshdl;
ACPI_INTEGER sc_ver;
@@ -90,6 +108,14 @@ typedef struct thinkpad_softc {
envsys_data_t sc_sensor[THINKPAD_NSENSORS];
int sc_display_state;
+
+#define THINKPAD_BAT_ANY 0
+#define THINKPAD_BAT_PRIMARY 1
+#define THINKPAD_BAT_SECONDARY 2
+#define THINKPAD_BAT_LAST 3
+
+ tp_batctl_t sc_batctl;
+ tp_sysctl_param_t sc_scparam[THINKPAD_BAT_LAST];
} thinkpad_softc_t;
/* Hotkey events */
@@ -130,6 +156,17 @@ typedef struct thinkpad_softc {
#define THINKPAD_DISPLAY_ALL \
(THINKPAD_DISPLAY_LCD | THINKPAD_DISPLAY_CRT | THINKPAD_DISPLAY_DVI)
+#define THINKPAD_GET_CHARGE_START "BCTG"
+#define THINKPAD_SET_CHARGE_START "BCCS"
+#define THINKPAD_GET_CHARGE_STOP "BCSG"
+#define THINKPAD_SET_CHARGE_STOP "BCSS"
+#define THINKPAD_GET_FORCE_DISCHARGE "BDSG"
+#define THINKPAD_SET_FORCE_DISCHARGE "BDSS"
+#define THINKPAD_GET_CHARGE_INHIBIT "BICG"
+#define THINKPAD_SET_CHARGE_INHIBIT "BICS"
+
+#define THINKPAD_CALL_ERROR 0x8000
+
#define THINKPAD_BLUETOOTH_HWPRESENT 0x01
#define THINKPAD_BLUETOOTH_RADIOSSW 0x02
#define THINKPAD_BLUETOOTH_RESUMECTRL 0x04
@@ -168,6 +205,9 @@ static void thinkpad_brightness_down(dev
static uint8_t thinkpad_brightness_read(thinkpad_softc_t *);
static void thinkpad_cmos(thinkpad_softc_t *, uint8_t);
+static void thinkpad_battery_probe_support(device_t);
+static void thinkpad_battery_sysctl_setup(device_t);
+
CFATTACH_DECL3_NEW(thinkpad, sizeof(thinkpad_softc_t),
thinkpad_match, thinkpad_attach, thinkpad_detach, NULL, NULL, NULL,
0);
@@ -220,6 +260,7 @@ thinkpad_attach(device_t parent, device_
int i;
sc->sc_dev = self;
+ sc->sc_log = NULL;
sc->sc_powhdl = NULL;
sc->sc_cmoshdl = NULL;
sc->sc_node = aa->aa_node;
@@ -371,6 +412,17 @@ thinkpad_attach(device_t parent, device_
/* Register temperature and fan sensors with envsys */
thinkpad_sensors_init(sc);
+ /* Probe supported battery charge/control operations */
+ thinkpad_battery_probe_support(self);
+
+ if (sc->sc_batctl.have_any) {
+ for (i = 0; i < THINKPAD_BAT_LAST; i++) {
+ sc->sc_scparam[i].sp_dev = self;
+ sc->sc_scparam[i].sp_bat = i;
+ }
+ thinkpad_battery_sysctl_setup(self);
+ }
+
fail:
if (!pmf_device_register(self, NULL, thinkpad_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
@@ -396,6 +448,9 @@ thinkpad_detach(device_t self, int flags
if (sc->sc_sme != NULL)
sysmon_envsys_unregister(sc->sc_sme);
+ if (sc->sc_log != NULL)
+ sysctl_teardown(>sc_log);
+
pmf_device_deregister(self);
pmf_event_deregister(self, PMFE_DISPLAY_BRIGHTNESS_UP,
@@ -948,6 +1003,290 @@ thinkpad_cmos(thinkpad_softc_t *sc, uint
AcpiFormatException(rv));
}
+static uint32_t
+thinkpad_call_method(device_t
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Apr 27 14:50:18 UTC 2024 Modified Files: src/sys/dev/acpi: thinkpad_acpi.c Log Message: Expose a sysctl interface hw.acpi.thinkpad.bat[]. to control some aspects of battery charging behavior on supported systems: charge_start threshold below which to start charging (in %, 0-99) charge_stop threshold above which to stop charging (in %, 1-100) force_discharge discharge while on AC power, e.g., for calibration charge_inhibit inhibit charging while on AC power >From Malte Dehling To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/dev/acpi/thinkpad_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Apr 27 14:45:11 UTC 2024 Modified Files: src/sys/dev/acpi: thinkpad_acpi.c Log Message: thinkpad cosmetic patches (Malte Dehling) To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/acpi/thinkpad_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: christos
Date: Sat Apr 27 14:45:11 UTC 2024
Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c
Log Message:
thinkpad cosmetic patches (Malte Dehling)
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/acpi/thinkpad_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.55 src/sys/dev/acpi/thinkpad_acpi.c:1.56
--- src/sys/dev/acpi/thinkpad_acpi.c:1.55 Fri Aug 12 12:21:41 2022
+++ src/sys/dev/acpi/thinkpad_acpi.c Sat Apr 27 10:45:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.55 2022/08/12 16:21:41 riastradh Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.56 2024/04/27 14:45:11 christos Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.55 2022/08/12 16:21:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.56 2024/04/27 14:45:11 christos Exp $");
#include
#include
@@ -138,8 +138,8 @@ typedef struct thinkpad_softc {
#define THINKPAD_WWAN_RADIOSSW 0x02
#define THINKPAD_WWAN_RESUMECTRL 0x04
-#define THINKPAD_UWB_HWPRESENT 0x01
-#define THINKPAD_UWB_RADIOSSW 0x02
+#define THINKPAD_UWB_HWPRESENT 0x01
+#define THINKPAD_UWB_RADIOSSW 0x02
#define THINKPAD_RFK_BLUETOOTH 0
#define THINKPAD_RFK_WWAN 1
@@ -165,7 +165,7 @@ static void thinkpad_bluetooth_toggle(th
static bool thinkpad_resume(device_t, const pmf_qual_t *);
static void thinkpad_brightness_up(device_t);
static void thinkpad_brightness_down(device_t);
-static uint8_t thinkpad_brightness_read(thinkpad_softc_t *sc);
+static uint8_t thinkpad_brightness_read(thinkpad_softc_t *);
static void thinkpad_cmos(thinkpad_softc_t *, uint8_t);
CFATTACH_DECL3_NEW(thinkpad, sizeof(thinkpad_softc_t),
@@ -230,7 +230,7 @@ thinkpad_attach(device_t parent, device_
sc->sc_ecdev = NULL;
for (curdev = deviter_first(, DEVITER_F_ROOT_FIRST);
- curdev != NULL; curdev = deviter_next())
+ curdev != NULL; curdev = deviter_next())
if (device_is_a(curdev, "acpiecdt") ||
device_is_a(curdev, "acpiec")) {
sc->sc_ecdev = curdev;
@@ -330,29 +330,30 @@ thinkpad_attach(device_t parent, device_
#endif
for (i = TP_PSW_DISPLAY_CYCLE; i < TP_PSW_LAST; i++)
sc->sc_smpsw[i].smpsw_type = PSWITCH_TYPE_HOTKEY;
- psw[TP_PSW_DISPLAY_CYCLE].smpsw_name = PSWITCH_HK_DISPLAY_CYCLE;
- psw[TP_PSW_LOCK_SCREEN].smpsw_name = PSWITCH_HK_LOCK_SCREEN;
- psw[TP_PSW_BATTERY_INFO].smpsw_name = PSWITCH_HK_BATTERY_INFO;
- psw[TP_PSW_EJECT_BUTTON].smpsw_name = PSWITCH_HK_EJECT_BUTTON;
- psw[TP_PSW_ZOOM_BUTTON].smpsw_name = PSWITCH_HK_ZOOM_BUTTON;
- psw[TP_PSW_VENDOR_BUTTON].smpsw_name = PSWITCH_HK_VENDOR_BUTTON;
+
+ psw[TP_PSW_DISPLAY_CYCLE].smpsw_name = PSWITCH_HK_DISPLAY_CYCLE;
+ psw[TP_PSW_LOCK_SCREEN].smpsw_name = PSWITCH_HK_LOCK_SCREEN;
+ psw[TP_PSW_BATTERY_INFO].smpsw_name = PSWITCH_HK_BATTERY_INFO;
+ psw[TP_PSW_EJECT_BUTTON].smpsw_name = PSWITCH_HK_EJECT_BUTTON;
+ psw[TP_PSW_ZOOM_BUTTON].smpsw_name = PSWITCH_HK_ZOOM_BUTTON;
+ psw[TP_PSW_VENDOR_BUTTON].smpsw_name = PSWITCH_HK_VENDOR_BUTTON;
#ifndef THINKPAD_NORMAL_HOTKEYS
- psw[TP_PSW_FNF1_BUTTON].smpsw_name = PSWITCH_HK_FNF1_BUTTON;
- psw[TP_PSW_WIRELESS_BUTTON].smpsw_name = PSWITCH_HK_WIRELESS_BUTTON;
- psw[TP_PSW_WWAN_BUTTON].smpsw_name = PSWITCH_HK_WWAN_BUTTON;
- psw[TP_PSW_POINTER_BUTTON].smpsw_name = PSWITCH_HK_POINTER_BUTTON;
- psw[TP_PSW_FNF10_BUTTON].smpsw_name= PSWITCH_HK_FNF10_BUTTON;
- psw[TP_PSW_FNF11_BUTTON].smpsw_name= PSWITCH_HK_FNF11_BUTTON;
- psw[TP_PSW_BRIGHTNESS_UP].smpsw_name = PSWITCH_HK_BRIGHTNESS_UP;
- psw[TP_PSW_BRIGHTNESS_DOWN].smpsw_name = PSWITCH_HK_BRIGHTNESS_DOWN;
- psw[TP_PSW_THINKLIGHT].smpsw_name = PSWITCH_HK_THINKLIGHT;
- psw[TP_PSW_VOLUME_UP].smpsw_name = PSWITCH_HK_VOLUME_UP;
- psw[TP_PSW_VOLUME_DOWN].smpsw_name = PSWITCH_HK_VOLUME_DOWN;
- psw[TP_PSW_VOLUME_MUTE].smpsw_name = PSWITCH_HK_VOLUME_MUTE;
- psw[TP_PSW_STAR_BUTTON].smpsw_name = PSWITCH_HK_STAR_BUTTON;
- psw[TP_PSW_SCISSORS_BUTTON].smpsw_name = PSWITCH_HK_SCISSORS_BUTTON;
- psw[TP_PSW_BLUETOOTH_BUTTON].smpsw_name = PSWITCH_HK_BLUETOOTH_BUTTON;
- psw[TP_PSW_KEYBOARD_BUTTON].smpsw_name = PSWITCH_HK_KEYBOARD_BUTTON;
+ psw[TP_PSW_FNF1_BUTTON].smpsw_name = PSWITCH_HK_FNF1_BUTTON;
+ psw[TP_PSW_WIRELESS_BUTTON].smpsw_name = PSWITCH_HK_WIRELESS_BUTTON;
+ psw[TP_PSW_WWAN_BUTTON].smpsw_name = PSWITCH_HK_WWAN_BUTTON;
+ psw[TP_PSW_POINTER_BUTTON].smpsw_name = PSWITCH_HK_POINTER_BUTTON;
+ psw[TP_PSW_FNF10_BUTTON].smpsw_name = PSWITCH_HK_FNF10_BUTTON;
+ psw[TP_PSW_FNF11_BUTTON].smpsw_name = PSWITCH_HK_FNF11_BUTTON;
+ psw[TP_PSW_BRIGHTNESS_UP].smpsw_name = PSWITCH_HK_BRIGHTNESS_UP;
+ psw[TP_PSW_BRIGHTNESS_DOWN].smpsw_name = PSWITCH_HK_BRIGHTNESS_DOWN;
+ psw[TP_PSW_THINKLIGHT].smpsw_name = PSWITCH_HK_THINKLIGHT;
+
CVS commit: src/etc/etc.vax
Module Name:src
Committed By: tsutsui
Date: Sat Apr 27 14:42:21 UTC 2024
Modified Files:
src/etc/etc.vax: MAKEDEV.conf
Log Message:
Disable dmf* and dmz* entries and add warns "not integrated yet."
Also note tty[EFGH]? have been used by MI wscons and new tty node names
should be assigned once dmf(4) is committed.
Ok'ed by ragge@ on port-vax@.
https://mail-index.netbsd.org/port-vax/2024/02/13/msg004859.html
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/etc/etc.vax/MAKEDEV.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.vax/MAKEDEV.conf
diff -u src/etc/etc.vax/MAKEDEV.conf:1.20 src/etc/etc.vax/MAKEDEV.conf:1.21
--- src/etc/etc.vax/MAKEDEV.conf:1.20 Thu Feb 1 22:22:05 2024
+++ src/etc/etc.vax/MAKEDEV.conf Sat Apr 27 14:42:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.20 2024/02/01 22:22:05 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.21 2024/04/27 14:42:21 tsutsui Exp $
all_md)
makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
@@ -129,29 +129,34 @@ dhu[0-9]*|dh[0-9]*|dmf[0-9]*|dmz[0-9]*|v
esac
;;
dmz*) name=dmz; major=37; count=24
- unit=${i#dmz}
- case $unit in
- 0) ch=a ;;
- 1) ch=b ;;
- 2) ch=c ;;
- 3) ch=e ;;
- 4) ch=f ;;
- *) warn "bad unit for $name in: $i" ;;
- esac
+ warn "$i is not integrated yet"
+# unit=${i#dmz}
+# case $unit in
+# 0) ch=a ;;
+# 1) ch=b ;;
+# 2) ch=c ;;
+# 3) ch=e ;;
+# 4) ch=f ;;
+# *) warn "bad unit for $name in: $i" ;;
+# esac
;;
dmf*) name=dmf; major=22; count=8
- unit=${i#dmf}
- case $unit in
- 0) ch=A ;;
- 1) ch=B ;;
- 2) ch=C ;;
- 3) ch=E ;;
- 4) ch=F ;;
- 5) ch=G ;;
- 6) ch=H ;;
- 7) ch=I ;;
- *) warn "bad unit for $name in: $i" ;;
- esac
+ warn "$i is not integrated yet"
+## XXX:
+## tty[EFGH]? have already been used by MI wscons so
+## new tty node names should be assigned once dmf(4) is committed
+# unit=${i#dmf}
+# case $unit in
+# 0) ch=A ;;
+# 1) ch=B ;;
+# 2) ch=C ;;
+# 3) ch=E ;;
+# 4) ch=F ;;
+# 5) ch=G ;;
+# 6) ch=H ;;
+# 7) ch=I ;;
+# *) warn "bad unit for $name in: $i" ;;
+# esac
;;
dhu*) name=dhu; major=34; count=16
unit=${i#dhu}
CVS commit: src/etc/etc.vax
Module Name:src Committed By: tsutsui Date: Sat Apr 27 14:42:21 UTC 2024 Modified Files: src/etc/etc.vax: MAKEDEV.conf Log Message: Disable dmf* and dmz* entries and add warns "not integrated yet." Also note tty[EFGH]? have been used by MI wscons and new tty node names should be assigned once dmf(4) is committed. Ok'ed by ragge@ on port-vax@. https://mail-index.netbsd.org/port-vax/2024/02/13/msg004859.html To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/etc/etc.vax/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Apr 27 12:46:37 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: queries.c
src/usr.bin/xlint/lint1: tree.c
Log Message:
lint: converting a null pointer to another pointer type is not narrowing
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tests/usr.bin/xlint/lint1/queries.c
cvs rdiff -u -r1.636 -r1.637 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/queries.c
diff -u src/tests/usr.bin/xlint/lint1/queries.c:1.28 src/tests/usr.bin/xlint/lint1/queries.c:1.29
--- src/tests/usr.bin/xlint/lint1/queries.c:1.28 Sat Apr 27 10:08:54 2024
+++ src/tests/usr.bin/xlint/lint1/queries.c Sat Apr 27 12:46:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: queries.c,v 1.28 2024/04/27 10:08:54 rillig Exp $ */
+/* $NetBSD: queries.c,v 1.29 2024/04/27 12:46:37 rillig Exp $ */
# 3 "queries.c"
/*
@@ -532,4 +532,6 @@ Q20_void_pointer_conversion(void)
int_ptr = char_ptr;
/* expect+1: warning: illegal combination of 'pointer to char' and 'pointer to int', op '=' [124] */
char_ptr = int_ptr;
+
+ int_ptr = (void *)0;
}
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.636 src/usr.bin/xlint/lint1/tree.c:1.637
--- src/usr.bin/xlint/lint1/tree.c:1.636 Sat Apr 27 10:08:54 2024
+++ src/usr.bin/xlint/lint1/tree.c Sat Apr 27 12:46:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.636 2024/04/27 10:08:54 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.637 2024/04/27 12:46:37 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.636 2024/04/27 10:08:54 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.637 2024/04/27 12:46:37 rillig Exp $");
#endif
#include
@@ -1434,7 +1434,8 @@ build_assignment(op_t op, bool sys, tnod
if (is_query_enabled[20]
&& lt == PTR && ln->tn_type->t_subt->t_tspec != VOID
- && rt == PTR && rn->tn_type->t_subt->t_tspec == VOID)
+ && rt == PTR && rn->tn_type->t_subt->t_tspec == VOID
+ && !is_null_pointer(rn))
/* implicit narrowing conversion from void ... */
query_message(20, type_name(ln->tn_type));
CVS commit: src
Module Name:src Committed By: rillig Date: Sat Apr 27 12:46:37 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: queries.c src/usr.bin/xlint/lint1: tree.c Log Message: lint: converting a null pointer to another pointer type is not narrowing To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/tests/usr.bin/xlint/lint1/queries.c cvs rdiff -u -r1.636 -r1.637 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Apr 27 10:08:55 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: queries.c t_usage.sh
src/usr.bin/xlint/lint1: err.c tree.c
Log Message:
lint: add query for conversion from void pointer to other pointer
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/tests/usr.bin/xlint/lint1/queries.c
cvs rdiff -u -r1.19 -r1.20 src/tests/usr.bin/xlint/lint1/t_usage.sh
cvs rdiff -u -r1.240 -r1.241 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.635 -r1.636 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/queries.c
diff -u src/tests/usr.bin/xlint/lint1/queries.c:1.27 src/tests/usr.bin/xlint/lint1/queries.c:1.28
--- src/tests/usr.bin/xlint/lint1/queries.c:1.27 Sat Mar 30 19:12:37 2024
+++ src/tests/usr.bin/xlint/lint1/queries.c Sat Apr 27 10:08:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: queries.c,v 1.27 2024/03/30 19:12:37 rillig Exp $ */
+/* $NetBSD: queries.c,v 1.28 2024/04/27 10:08:54 rillig Exp $ */
# 3 "queries.c"
/*
@@ -16,7 +16,7 @@
*/
/* lint1-extra-flags: -q 1,2,3,4,5,6,7,8,9,10 */
-/* lint1-extra-flags: -q 11,12,13,14,15,16,17,18,19 */
+/* lint1-extra-flags: -q 11,12,13,14,15,16,17,18,19,20 */
/* lint1-extra-flags: -X 351 */
typedef unsigned char u8_t;
@@ -73,6 +73,8 @@ volatile char *vstr;
void *void_ptr;
const void *const_void_ptr;
+char *char_ptr;
+int *int_ptr;
int
Q1(double dbl)
@@ -359,9 +361,9 @@ Q9(int x)
return (0.0);
case 9:
return
-# 363 "queries.c" 3 4
+# 365 "queries.c" 3 4
((void *)0)
-# 365 "queries.c"
+# 367 "queries.c"
/* expect+1: warning: illegal combination of integer 'int' and pointer 'pointer to void' [183] */
;
case 10:
@@ -509,10 +511,25 @@ convert_from_integer_to_floating(void)
f64 = (double)u32;
}
-/*
- * Since queries do not affect the exit status, force a warning to make this
- * test conform to the general expectation that a test that produces output
- * exits non-successfully.
- */
-/* expect+1: warning: static variable 'unused' unused [226] */
-static int unused;
+// C allows implicit narrowing conversions from a void pointer to an arbitrary
+// object pointer. C++ doesn't allow this conversion since it is narrowing.
+void
+Q20_void_pointer_conversion(void)
+{
+ /* expect+1: warning: operands of '=' have incompatible pointer types to 'void' and 'const void' [128] */
+ void_ptr = const_void_ptr;
+ const_void_ptr = void_ptr;
+ /* expect+1: implicit narrowing conversion from void pointer to 'pointer to int' [Q20] */
+ int_ptr = void_ptr;
+ /* expect+1: redundant cast from 'pointer to void' to 'pointer to int' before assignment [Q7] */
+ int_ptr = (int *)void_ptr;
+ /* expect+1: implicit narrowing conversion from void pointer to 'pointer to char' [Q20] */
+ char_ptr = void_ptr;
+ void_ptr = char_ptr;
+ /* expect+1: implicit narrowing conversion from void pointer to 'pointer to int' [Q20] */
+ int_ptr = void_ptr;
+ /* expect+1: warning: illegal combination of 'pointer to int' and 'pointer to char', op '=' [124] */
+ int_ptr = char_ptr;
+ /* expect+1: warning: illegal combination of 'pointer to char' and 'pointer to int', op '=' [124] */
+ char_ptr = int_ptr;
+}
Index: src/tests/usr.bin/xlint/lint1/t_usage.sh
diff -u src/tests/usr.bin/xlint/lint1/t_usage.sh:1.19 src/tests/usr.bin/xlint/lint1/t_usage.sh:1.20
--- src/tests/usr.bin/xlint/lint1/t_usage.sh:1.19 Sat Mar 30 17:23:13 2024
+++ src/tests/usr.bin/xlint/lint1/t_usage.sh Sat Apr 27 10:08:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_usage.sh,v 1.19 2024/03/30 17:23:13 rillig Exp $
+# $NetBSD: t_usage.sh,v 1.20 2024/04/27 10:08:54 rillig Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -89,13 +89,13 @@ enable_queries_body()
# The largest known query.
atf_check \
- "$lint1" -q 19 code.c /dev/null
+ "$lint1" -q 20 code.c /dev/null
# Larger than the largest known query.
atf_check \
-s 'exit:1' \
- -e "inline:lint1: invalid query ID '20'\n" \
- "$lint1" -q 20 code.c /dev/null
+ -e "inline:lint1: invalid query ID '21'\n" \
+ "$lint1" -q 21 code.c /dev/null
# Whitespace is not allowed before a query ID.
atf_check \
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.240 src/usr.bin/xlint/lint1/err.c:1.241
--- src/usr.bin/xlint/lint1/err.c:1.240 Fri Apr 12 05:17:48 2024
+++ src/usr.bin/xlint/lint1/err.c Sat Apr 27 10:08:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.240 2024/04/12 05:17:48 rillig Exp $ */
+/* $NetBSD: err.c,v 1.241 2024/04/27 10:08:54 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.240 2024/04/12 05:17:48 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.241 2024/04/27 10:08:54 rillig Exp $");
#endif
#include
@@ -741,6 +741,7 @@ static
CVS commit: src
Module Name:src Committed By: rillig Date: Sat Apr 27 10:08:55 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: queries.c t_usage.sh src/usr.bin/xlint/lint1: err.c tree.c Log Message: lint: add query for conversion from void pointer to other pointer To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/tests/usr.bin/xlint/lint1/queries.c cvs rdiff -u -r1.19 -r1.20 src/tests/usr.bin/xlint/lint1/t_usage.sh cvs rdiff -u -r1.240 -r1.241 src/usr.bin/xlint/lint1/err.c cvs rdiff -u -r1.635 -r1.636 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: rillig Date: Sat Apr 27 06:01:08 UTC 2024 Modified Files: src/sys/arch/mips/include: float.h Log Message: mips: fix syntax error in LDBL_MAX (since 2011) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/include/float.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/float.h diff -u src/sys/arch/mips/include/float.h:1.18 src/sys/arch/mips/include/float.h:1.19 --- src/sys/arch/mips/include/float.h:1.18 Sun Jul 26 08:08:41 2020 +++ src/sys/arch/mips/include/float.h Sat Apr 27 06:01:08 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: float.h,v 1.18 2020/07/26 08:08:41 simonb Exp $ */ +/* $NetBSD: float.h,v 1.19 2024/04/27 06:01:08 rillig Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ #if __STDC_VERSION__ >= 199901L #define LDBL_EPSILON 0x1p-112L #define LDBL_MIN 0x1p-16382L -#define LDBL_MAX 0x1.p+16383L, +#define LDBL_MAX 0x1.p+16383L #else #define LDBL_EPSILON 1.9259299443872358530559779425849273E-34L #define LDBL_MIN 3.3621031431120935062626778173217526E-4932L
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: rillig Date: Sat Apr 27 06:01:08 UTC 2024 Modified Files: src/sys/arch/mips/include: float.h Log Message: mips: fix syntax error in LDBL_MAX (since 2011) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/include/float.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Apr 27 00:40:07 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: Remove 0 initializations (since the softc is zalloc'ed) and the initial refresh which will have no data. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/dev/acpi/acpi_bat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/acpi/acpi_bat.c diff -u src/sys/dev/acpi/acpi_bat.c:1.122 src/sys/dev/acpi/acpi_bat.c:1.123 --- src/sys/dev/acpi/acpi_bat.c:1.122 Fri Apr 26 14:19:18 2024 +++ src/sys/dev/acpi/acpi_bat.c Fri Apr 26 20:40:06 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $ */ +/* $NetBSD: acpi_bat.c,v 1.123 2024/04/27 00:40:06 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.123 2024/04/27 00:40:06 christos Exp $"); #include #include @@ -229,14 +229,6 @@ acpibat_attach(device_t parent, device_t sc->sc_node = aa->aa_node; - sc->sc_present = 0; - sc->sc_dvoltage = 0; - sc->sc_dcapacity = 0; - sc->sc_lcapacity = 0; - sc->sc_wcapacity = 0; - - sc->sc_sme = NULL; - mutex_init(>sc_mutex, MUTEX_DEFAULT, IPL_NONE); cv_init(>sc_condvar, device_xname(self)); @@ -759,7 +751,7 @@ acpibat_init_envsys(device_t dv) sc->sc_sme->sme_cookie = dv; sc->sc_sme->sme_refresh = acpibat_refresh; sc->sc_sme->sme_class = SME_CLASS_BATTERY; - sc->sc_sme->sme_flags = SME_POLL_ONLY | SME_INIT_REFRESH; + sc->sc_sme->sme_flags = SME_POLL_ONLY; sc->sc_sme->sme_get_limits = acpibat_get_limits; if (sysmon_envsys_register(sc->sc_sme))
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Sat Apr 27 00:40:07 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: Remove 0 initializations (since the softc is zalloc'ed) and the initial refresh which will have no data. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/dev/acpi/acpi_bat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/crash
Module Name:src
Committed By: christos
Date: Fri Apr 26 22:07:32 UTC 2024
Modified Files:
src/usr.sbin/crash: Makefile
Log Message:
Add ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/crash/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.50 src/usr.sbin/crash/Makefile:1.51
--- src/usr.sbin/crash/Makefile:1.50 Tue Nov 21 21:01:07 2023
+++ src/usr.sbin/crash/Makefile Fri Apr 26 18:07:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2023/11/22 02:01:07 thorpej Exp $
+# $NetBSD: Makefile,v 1.51 2024/04/26 22:07:32 christos Exp $
PROG= crash
MAN= crash.8
@@ -119,7 +119,7 @@ NVFLAGS+=-R
# vers.c
SRCS+= vers.c
vers.c: ${S}/conf/newvers.sh ${_NETBSD_VERSION_DEPENDS}
- ${HOST_SH} ${S}/conf/newvers.sh ${NVFLAGS} -n -m ${MACHINE} -i CRASH
+ TOOL_DATE=${TOOL_DATE} ${HOST_SH} ${S}/conf/newvers.sh ${NVFLAGS} -n -m ${MACHINE} -i CRASH
CLEANFILES+= vers.c version
.else# } {
CVS commit: src/usr.sbin/crash
Module Name:src
Committed By: christos
Date: Fri Apr 26 22:07:32 UTC 2024
Modified Files:
src/usr.sbin/crash: Makefile
Log Message:
Add ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/crash/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Fri Apr 26 20:27:12 UTC 2024 Modified Files: src/libexec/httpd: dir-index-bozo.c Log Message: Create mobile-friendly directory listings A typical mobile browser on a smartphone assumes a page without a "viewport" tag is designed for desktop browsers. It displays the page in a virtual window that simulates a wider screen and does not adjust it for the phone's pixel density. The usual result is that the content on the page looks small, and interacting with the page comfortably and precisely requires zoom. This is currently the case with bozohttpd directory listing pages. from D. Bohdan in PR bin/57962 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/dir-index-bozo.c diff -u src/libexec/httpd/dir-index-bozo.c:1.36 src/libexec/httpd/dir-index-bozo.c:1.37 --- src/libexec/httpd/dir-index-bozo.c:1.36 Wed May 18 00:37:11 2022 +++ src/libexec/httpd/dir-index-bozo.c Fri Apr 26 20:27:12 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: dir-index-bozo.c,v 1.36 2022/05/18 00:37:11 mrg Exp $ */ +/* $NetBSD: dir-index-bozo.c,v 1.37 2024/04/26 20:27:12 maya Exp $ */ /* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */ @@ -123,6 +123,7 @@ bozo_dir_index(bozo_httpreq_t *request, bozo_printf(httpd, "\r\n" "\r\n" + "\r\n"
CVS commit: src/libexec/httpd
Module Name:src Committed By: maya Date: Fri Apr 26 20:27:12 UTC 2024 Modified Files: src/libexec/httpd: dir-index-bozo.c Log Message: Create mobile-friendly directory listings A typical mobile browser on a smartphone assumes a page without a "viewport" tag is designed for desktop browsers. It displays the page in a virtual window that simulates a wider screen and does not adjust it for the phone's pixel density. The usual result is that the content on the page looks small, and interacting with the page comfortably and precisely requires zoom. This is currently the case with bozohttpd directory listing pages. from D. Bohdan in PR bin/57962 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/dir-index-bozo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/fstyp
Module Name:src
Committed By: christos
Date: Fri Apr 26 18:21:25 UTC 2024
Modified Files:
src/usr.sbin/fstyp: Makefile
Log Message:
PR/58202: Malte Dehling: Don't link libzfs
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/fstyp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/fstyp/Makefile
diff -u src/usr.sbin/fstyp/Makefile:1.14 src/usr.sbin/fstyp/Makefile:1.15
--- src/usr.sbin/fstyp/Makefile:1.14 Sat Jun 3 17:26:29 2023
+++ src/usr.sbin/fstyp/Makefile Fri Apr 26 14:21:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/06/03 21:26:29 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2024/04/26 18:21:25 christos Exp $
.include
@@ -17,7 +17,8 @@ WARNS?= 6
COPTS.zfs.c+= -Wno-unknown-pragmas
COPTS.zfs.c+= -Wno-sign-conversion
COPTS.zfs.c+= -Wno-strict-prototypes
-LDADD+= -lnvpair -lzfs
+LDADD+= -lnvpair
+DPADD+= ${LIBNVPAIR}
OSNET=${NETBSDSRCDIR}/external/cddl/osnet
CPPFLAGS+= -DHAVE_ZFS
CVS commit: src/usr.sbin/fstyp
Module Name:src Committed By: christos Date: Fri Apr 26 18:21:25 UTC 2024 Modified Files: src/usr.sbin/fstyp: Makefile Log Message: PR/58202: Malte Dehling: Don't link libzfs To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/fstyp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Fri Apr 26 18:19:18 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: PR/58201: Malte Dehling: re-order sysmon initialization before acpi registration, to avoid needing to call to acpi_deregister_notify on sysmon failure. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/dev/acpi/acpi_bat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/acpi/acpi_bat.c diff -u src/sys/dev/acpi/acpi_bat.c:1.121 src/sys/dev/acpi/acpi_bat.c:1.122 --- src/sys/dev/acpi/acpi_bat.c:1.121 Thu Jan 6 20:10:57 2022 +++ src/sys/dev/acpi/acpi_bat.c Fri Apr 26 14:19:18 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_bat.c,v 1.121 2022/01/07 01:10:57 riastradh Exp $ */ +/* $NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.121 2022/01/07 01:10:57 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $"); #include #include @@ -762,17 +762,16 @@ acpibat_init_envsys(device_t dv) sc->sc_sme->sme_flags = SME_POLL_ONLY | SME_INIT_REFRESH; sc->sc_sme->sme_get_limits = acpibat_get_limits; + if (sysmon_envsys_register(sc->sc_sme)) + goto fail; + (void)acpi_register_notify(sc->sc_node, acpibat_notify_handler); acpibat_update_info(dv); acpibat_update_status(dv); - if (sysmon_envsys_register(sc->sc_sme)) - goto fail; - (void)pmf_device_register(dv, NULL, acpibat_resume); return; - fail: aprint_error_dev(dv, "failed to initialize sysmon\n");
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Fri Apr 26 18:19:18 UTC 2024 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: PR/58201: Malte Dehling: re-order sysmon initialization before acpi registration, to avoid needing to call to acpi_deregister_notify on sysmon failure. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/dev/acpi/acpi_bat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Fri Apr 26 18:06:02 UTC 2024
Modified Files:
src/etc: Makefile
Log Message:
PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed
To generate a diff of this commit:
cvs rdiff -u -r1.469 -r1.470 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.469 src/etc/Makefile:1.470
--- src/etc/Makefile:1.469 Fri Nov 10 15:44:58 2023
+++ src/etc/Makefile Fri Apr 26 14:06:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.469 2023/11/10 20:44:58 christos Exp $
+# $NetBSD: Makefile,v 1.470 2024/04/26 18:06:02 christos Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -393,10 +393,10 @@ install-obsolete-lists: .PHONY .MAKE
mkdir -p ${OBSOLETE.dir}
.if ${MKX11} != "no"
(cd ${NETBSDSRCDIR}/distrib/sets && \
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
+ AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
.else
(cd ${NETBSDSRCDIR}/distrib/sets && \
- AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
+ AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
.endif
.for file in ${OBSOLETE.files}
${_MKMSG_INSTALL} ${DESTDIR}/var/db/obsolete/${file}
CVS commit: src/etc
Module Name:src Committed By: christos Date: Fri Apr 26 18:06:02 UTC 2024 Modified Files: src/etc: Makefile Log Message: PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed To generate a diff of this commit: cvs rdiff -u -r1.469 -r1.470 src/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Apr 26 17:38:44 UTC 2024 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: BUILDING: fix typo To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/BUILDING cvs rdiff -u -r1.149 -r1.150 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Apr 26 17:38:44 UTC 2024 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: BUILDING: fix typo To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/BUILDING cvs rdiff -u -r1.149 -r1.150 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.160 src/BUILDING:1.161 --- src/BUILDING:1.160 Sat Jul 22 18:50:04 2023 +++ src/BUILDING Fri Apr 26 17:38:44 2024 @@ -729,7 +729,7 @@ BUILDING MACHINE and MACHINE_ARCH settings. -N noiselevel - Set the "noisyness" level of the build, by setting MAKEVERBOSE + Set the "noisiness" level of the build, by setting MAKEVERBOSE to noiselevel. -nShow the commands that would be executed by build.sh, but do Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.149 src/doc/BUILDING.mdoc:1.150 --- src/doc/BUILDING.mdoc:1.149 Sat Jul 22 18:50:04 2023 +++ src/doc/BUILDING.mdoc Fri Apr 26 17:38:44 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.149 2023/07/22 18:50:04 lukem Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.150 2024/04/26 17:38:44 rillig Exp $ .\" .\" Copyright (c) 2001-2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1645,7 +1645,7 @@ settings. . .It Fl N Ar noiselevel Set the -.Dq noisyness +.Dq noisiness level of the build, by setting .Sy MAKEVERBOSE to
CVS commit: src/distrib
Module Name:src Committed By: nia Date: Fri Apr 26 17:36:32 UTC 2024 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/amd64/cdroms/installdvd: Makefile src/distrib/i386/cdroms: Makefile.cdrom src/distrib/i386/cdroms/installdvd: Makefile src/distrib/sparc64/cdroms/installdvd: Makefile Log Message: Remove modules set from the i386 install cd It is not particularly useful to be able to load modules while installing on i386, probably the most useful one is dtrace, and this takes up about 20mb on a port that is already exceeding CD limits. Most stuff you'd want to use while installing is already in GENERIC. The modules set is still available compressed for installing into a target system, meaning modules are available after installation. While here, add man set to the installation DVD, it's helpful to be able to read e.g. the man page for fdisk when rescuing a system. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile cvs rdiff -u -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: nia
Date: Fri Apr 26 17:36:32 UTC 2024
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/installdvd: Makefile
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/i386/cdroms/installdvd: Makefile
src/distrib/sparc64/cdroms/installdvd: Makefile
Log Message:
Remove modules set from the i386 install cd
It is not particularly useful to be able to load modules while
installing on i386, probably the most useful one is dtrace,
and this takes up about 20mb on a port that is already exceeding
CD limits. Most stuff you'd want to use while installing is already
in GENERIC.
The modules set is still available compressed for installing into
a target system, meaning modules are available after installation.
While here, add man set to the installation DVD, it's helpful to be able
to read e.g. the man page for fdisk when rescuing a system.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile
cvs rdiff -u -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.27 src/distrib/amd64/cdroms/Makefile.cdrom:1.28
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.27 Sat Sep 25 08:54:29 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.27 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.cdrom,v 1.28 2024/04/26 17:36:32 nia Exp $
.include
.include
@@ -17,7 +17,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc gpufw
+CD_SETS+= base etc gpufw
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
Index: src/distrib/amd64/cdroms/installdvd/Makefile
diff -u src/distrib/amd64/cdroms/installdvd/Makefile:1.1 src/distrib/amd64/cdroms/installdvd/Makefile:1.2
--- src/distrib/amd64/cdroms/installdvd/Makefile:1.1 Wed Apr 24 11:29:34 2024
+++ src/distrib/amd64/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -12,6 +12,10 @@ CDRELEASE= true # include $RELEASEDIR/
CDBUILDEXTRA= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+.if ${MKMAN} != "no"
+CD_SETS+= man
+.endif
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
< ${.CURDIR}/boot.cfg.in > boot.cfg
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.42 src/distrib/i386/cdroms/Makefile.cdrom:1.43
--- src/distrib/i386/cdroms/Makefile.cdrom:1.42 Sat Sep 25 08:54:29 2021
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.42 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.cdrom,v 1.43 2024/04/26 17:36:32 nia Exp $
.include
@@ -10,10 +10,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc gpufw
-.if ${MKKMOD} != "no"
-CD_SETS+= modules
-.endif
+CD_SETS+= base etc gpufw
image_md_pre:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
Index: src/distrib/i386/cdroms/installdvd/Makefile
diff -u src/distrib/i386/cdroms/installdvd/Makefile:1.1 src/distrib/i386/cdroms/installdvd/Makefile:1.2
--- src/distrib/i386/cdroms/installdvd/Makefile:1.1 Wed Apr 24 11:29:34 2024
+++ src/distrib/i386/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -12,6 +12,14 @@ CDRELEASE= true# inc
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+.if ${MKKMOD} != "no"
+CD_SETS+= modules
+.endif
+
+.if ${MKMAN} != "no"
+CD_SETS+= man
+.endif
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
Index: src/distrib/sparc64/cdroms/installdvd/Makefile
diff -u src/distrib/sparc64/cdroms/installdvd/Makefile:1.1 src/distrib/sparc64/cdroms/installdvd/Makefile:1.2
--- src/distrib/sparc64/cdroms/installdvd/Makefile:1.1 Wed Apr 24 15:39:58 2024
+++ src/distrib/sparc64/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/04/24 15:39:58 nia Exp $
+# $NetBSD: Makefile,v
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: rillig Date: Fri Apr 26 17:22:26 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: dri: disable lint To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/dri/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.40 src/external/mit/xorg/lib/dri/Makefile:1.41 --- src/external/mit/xorg/lib/dri/Makefile:1.40 Sun Apr 21 00:23:23 2024 +++ src/external/mit/xorg/lib/dri/Makefile Fri Apr 26 17:22:26 2024 @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.40 2024/04/21 00:23:23 maya Exp $ +# $NetBSD: Makefile,v 1.41 2024/04/26 17:22:26 rillig Exp $ # Link the mesa_dri_drivers mega driver. +NOLINT= # Lots of "Unsupported platform" due to undefined __GNUC__ + .include .include "../mesa-which.mk"
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: rillig Date: Fri Apr 26 17:22:26 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: dri: disable lint To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Fri Apr 26 17:11:22 UTC 2024
Modified Files:
src/usr.bin/make: job.c
src/usr.bin/make/unit-tests: opt-debug-errors-jobs.exp
Log Message:
make: in parallel mode, print the directory in which a job failed
When multiple targets run in parallel, the "stopped in" line may be
several lines away from the "Failed target" line, making them hard to
correlate.
To generate a diff of this commit:
cvs rdiff -u -r1.468 -r1.469 src/usr.bin/make/job.c
cvs rdiff -u -r1.4 -r1.5 \
src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.468 src/usr.bin/make/job.c:1.469
--- src/usr.bin/make/job.c:1.468 Sat Apr 20 10:18:55 2024
+++ src/usr.bin/make/job.c Fri Apr 26 17:11:22 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.468 2024/04/20 10:18:55 rillig Exp $ */
+/* $NetBSD: job.c,v 1.469 2024/04/26 17:11:22 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -141,7 +141,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.468 2024/04/20 10:18:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.469 2024/04/26 17:11:22 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -1062,6 +1062,7 @@ DebugFailedJob(const Job *job)
debug_printf("\n");
debug_printf("*** Failed target: %s\n", job->node->name);
+ debug_printf("*** In directory: %s\n", curdir);
debug_printf("*** Failed commands:\n");
for (ln = job->node->commands.first; ln != NULL; ln = ln->next) {
const char *cmd = ln->datum;
Index: src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.4 src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.5
--- src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp:1.4 Sun Nov 28 00:02:07 2021
+++ src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp Fri Apr 26 17:11:22 2024
@@ -2,6 +2,7 @@ echo '3 spaces'; false
3 spaces
*** Failed target: fail-spaces
+*** In directory:
*** Failed commands:
echo '3 spaces'; false
*** [fail-spaces] Error code 1
@@ -11,6 +12,7 @@ echo \ indented; false
indented
*** Failed target: fail-escaped-space
+*** In directory:
*** Failed commands:
echo \ indented; false
*** [fail-escaped-space] Error code 1
@@ -22,6 +24,7 @@ line1
line2
*** Failed target: fail-newline
+*** In directory:
*** Failed commands:
echo 'line1${.newline}line2'; false
=> echo 'line1
@@ -33,6 +36,7 @@ echo 'line1 line2'; false
line1 line2
*** Failed target: fail-multiline
+*** In directory:
*** Failed commands:
echo 'line1 line2'; false
*** [fail-multiline] Error code 1
@@ -42,6 +46,7 @@ echo 'word1' 'word2'; false
word1 word2
*** Failed target: fail-multiline-intention
+*** In directory:
*** Failed commands:
echo 'word1' 'word2'; false
*** [fail-multiline-intention] Error code 1
@@ -49,6 +54,7 @@ word1 word2
make: stopped in unit-tests
*** Failed target: fail-vars
+*** In directory:
*** Failed commands:
@${COMPILE_C} ${COMPILE_C_FLAGS}
=> @false c-compiler flag1 -macro="several words"
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Fri Apr 26 17:11:22 UTC 2024 Modified Files: src/usr.bin/make: job.c src/usr.bin/make/unit-tests: opt-debug-errors-jobs.exp Log Message: make: in parallel mode, print the directory in which a job failed When multiple targets run in parallel, the "stopped in" line may be several lines away from the "Failed target" line, making them hard to correlate. To generate a diff of this commit: cvs rdiff -u -r1.468 -r1.469 src/usr.bin/make/job.c cvs rdiff -u -r1.4 -r1.5 \ src/usr.bin/make/unit-tests/opt-debug-errors-jobs.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rillig Date: Fri Apr 26 16:34:18 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: gallium: disable lint To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/gallium/Makefile diff -u src/external/mit/xorg/lib/gallium/Makefile:1.53 src/external/mit/xorg/lib/gallium/Makefile:1.54 --- src/external/mit/xorg/lib/gallium/Makefile:1.53 Sat Nov 25 20:00:25 2023 +++ src/external/mit/xorg/lib/gallium/Makefile Fri Apr 26 16:34:17 2024 @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.53 2023/11/25 20:00:25 rjs Exp $ +# $NetBSD: Makefile,v 1.54 2024/04/26 16:34:17 rillig Exp $ # Link the gallium mega driver. LIBISMODULE= yes LIBISCXX= yes +NOLINT= # Lots of "Unsupported platform" due to undefined __GNUC__ + .include .include "../mesa-which.mk"
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rillig Date: Fri Apr 26 16:34:18 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: gallium: disable lint To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/bin/cp
Module Name:src
Committed By: rillig
Date: Fri Apr 26 01:33:23 UTC 2024
Modified Files:
src/tests/bin/cp: t_cp.sh
Log Message:
tests/cp: clean up
Replace the deprecated "eq:0" with "exit:0", remove redundant "-o empty"
and "-e empty".
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/cp/t_cp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/cp/t_cp.sh
diff -u src/tests/bin/cp/t_cp.sh:1.1 src/tests/bin/cp/t_cp.sh:1.2
--- src/tests/bin/cp/t_cp.sh:1.1 Sat Mar 17 16:33:10 2012
+++ src/tests/bin/cp/t_cp.sh Fri Apr 26 01:33:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_cp.sh,v 1.1 2012/03/17 16:33:10 jruoho Exp $
+# $NetBSD: t_cp.sh,v 1.2 2024/04/26 01:33:23 rillig Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,7 +62,7 @@ file_to_file_simple() {
rm -f file2
umask 022
chmod 777 file
- atf_check -s eq:0 -o empty -e empty cp file file2
+ atf_check cp file file2
cp_compare file_to_file_simple file file2
if [ `stat -f "%Lp" file2` != "755" ]; then
atf_fail "new file not created with umask"
@@ -80,7 +80,7 @@ file_to_file_preserve() {
rm file3
chmod 644 file
chflags nodump file
- atf_check -s eq:0 -o empty -e empty cp -p file file3
+ atf_check cp -p file file3
finfo=`stat -f "%p%u%g%m%z%f" file`
f3info=`stat -f "%p%u%g%m%z%f" file3`
if [ $finfo != $f3info ]; then
@@ -92,7 +92,7 @@ file_to_file_noflags() {
rm file3
chmod 644 file
chflags nodump file
- atf_check -s eq:0 -o empty -e empty cp -p -N file file3
+ atf_check cp -p -N file file3
finfo=`stat -f "%f" file`
f3info=`stat -f "%f" file3`
if [ $finfo = $f3info ]; then
@@ -106,7 +106,7 @@ file_to_link_head() {
}
file_to_link_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp file2 link
+ atf_check cp file2 link
cp_compare file_to_link file file2
}
@@ -117,8 +117,8 @@ link_to_file_head() {
link_to_file_body() {
reset
# file and link are identical (not copied).
- atf_check -s eq:1 -o empty -e ignore cp link file
- atf_check -s eq:0 -o empty -e empty cp link file2
+ atf_check -s exit:1 -e ignore cp link file
+ atf_check cp link file2
cp_compare link_to_file file file2
}
@@ -129,7 +129,7 @@ file_over_link_head() {
}
file_over_link_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp -P file link
+ atf_check cp -P file link
cp_compare file_over_link file link
}
@@ -140,7 +140,7 @@ link_over_file_head() {
}
link_over_file_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp -P link file
+ atf_check cp -P link file
if [ `readlink link` != `readlink file` ]; then
atf_fail "readlink link != readlink file"
fi
@@ -153,8 +153,8 @@ files_to_dir_head() {
files_to_dir_body() {
reset
# can't copy multiple files to a file
- atf_check -s eq:1 -o empty -e ignore cp file file2 file3
- atf_check -s eq:0 -o empty -e empty cp file file2 link dir
+ atf_check -s exit:1 -e ignore cp file file2 file3
+ atf_check cp file file2 link dir
cp_compare files_to_dir file "dir/file"
}
@@ -166,8 +166,8 @@ dir_to_file_head() {
dir_to_file_body() {
reset
# can't copy a dir onto a file
- atf_check -s eq:1 -o empty -e ignore cp dir file
- atf_check -s eq:1 -o empty -e ignore cp -R dir file
+ atf_check -s exit:1 -e ignore cp dir file
+ atf_check -s exit:1 -e ignore cp -R dir file
}
atf_test_case file_to_linkdir
@@ -177,12 +177,12 @@ file_to_linkdir_head() {
}
file_to_linkdir_body() {
reset
- atf_check -s eq:0 -o empty -e empty cp file dirlink
+ atf_check cp file dirlink
cp_compare file_to_linkdir file "dir/file"
# overwrite the link
- atf_check -s eq:0 -o empty -e empty cp -P file dirlink
- atf_check -s eq:1 -o empty -e empty readlink dirlink
+ atf_check cp -P file dirlink
+ atf_check -s exit:1 readlink dirlink
cp_compare file_to_linkdir file dirlink
}
@@ -194,21 +194,21 @@ linkdir_to_file_head() {
linkdir_to_file_body() {
reset
# cannot copy a dir onto a file
- atf_check -s eq:1 -o empty -e ignore cp dirlink file
+ atf_check -s exit:1 -e ignore cp dirlink file
# overwrite the link
- atf_check -s eq:0 -o empty -e empty cp -P dirlink file
+ atf_check cp -P dirlink file
if [ `readlink file` != `readlink dirlink` ]; then
atf_fail "readlink link != readlink file"
fi
}
dir_to_dne_no_R() {
- atf_check -s eq:1 -o empty -e ignore cp dir dir2
+ atf_check -s exit:1 -e ignore cp dir dir2
}
dir_to_dne() {
- atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+ atf_check cp -R dir dir2
cp_compare dir_to_dne "dir/file" "dir2/file"
readlink dir2/link >/dev/null
if [ $? -gt 0 ]; then
@@ -218,12 +218,12 @@ dir_to_dne() {
dir_to_dir_H() {
dir_to_dir_setup
- atf_check -s eq:0 -o empty -e empty cp -R dir dir2
+ atf_check cp -R dir dir2
chmod 777 dir
# copy a dir into a dir, only command-line links are followed
- atf_check -s eq:0 -o empty -e empty cp -R -H dirlink dir2
+
CVS commit: src/tests/bin/cp
Module Name:src Committed By: rillig Date: Fri Apr 26 01:33:23 UTC 2024 Modified Files: src/tests/bin/cp: t_cp.sh Log Message: tests/cp: clean up Replace the deprecated "eq:0" with "exit:0", remove redundant "-o empty" and "-e empty". To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/bin/cp/t_cp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mac68k/dev
Module Name:src
Committed By: nat
Date: Fri Apr 26 00:59:08 UTC 2024
Modified Files:
src/sys/arch/mac68k/dev: pm_direct.c
Log Message:
Return early if PM data is not available.
This avoids random crashes on my Powerbook when using the mouse or keyboard.
The same was needed for the Powerbook 5xx/Duos (compile tested only).
XXX pullup-10, pullup-9, pullup-8.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mac68k/dev/pm_direct.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/dev/pm_direct.c
diff -u src/sys/arch/mac68k/dev/pm_direct.c:1.30 src/sys/arch/mac68k/dev/pm_direct.c:1.31
--- src/sys/arch/mac68k/dev/pm_direct.c:1.30 Sat Aug 21 11:55:24 2021
+++ src/sys/arch/mac68k/dev/pm_direct.c Fri Apr 26 00:59:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $ */
+/* $NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -32,7 +32,7 @@
/* From: pm_direct.c 1.3 03/18/98 Takashi Hamada */
#include
-__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $");
#include "opt_adb.h"
@@ -562,6 +562,7 @@ pm_intr_pm1(void *arg)
printf("pm: PM is not ready. error code=%08x\n", rval);
#endif
splx(s);
+ return;
}
if ((pmdata.data[2] & 0x10) == 0x10) {
@@ -821,6 +822,7 @@ pm_intr_pm2(void *arg)
printf("pm: PM is not ready. error code: %08x\n", rval);
#endif
splx(s);
+ return;
}
switch ((u_int)(pmdata.data[2] & 0xff)) {
CVS commit: src/sys/arch/mac68k/dev
Module Name:src Committed By: nat Date: Fri Apr 26 00:59:08 UTC 2024 Modified Files: src/sys/arch/mac68k/dev: pm_direct.c Log Message: Return early if PM data is not available. This avoids random crashes on my Powerbook when using the mouse or keyboard. The same was needed for the Powerbook 5xx/Duos (compile tested only). XXX pullup-10, pullup-9, pullup-8. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mac68k/dev/pm_direct.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/bin/cat
Module Name:src
Committed By: rillig
Date: Fri Apr 26 00:57:15 UTC 2024
Modified Files:
src/tests/bin/cat: t_cat.sh
Log Message:
tests/cat: clean up
Multiple arguments to atf_set are joined by spaces, there's no need for
an extra space.
The exit status on success must be 0, so don't ignore it.
Remove the unnecessary shell wrapper, as no redirection is going on.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/bin/cat/t_cat.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/cat/t_cat.sh
diff -u src/tests/bin/cat/t_cat.sh:1.3 src/tests/bin/cat/t_cat.sh:1.4
--- src/tests/bin/cat/t_cat.sh:1.3 Thu Jun 16 01:04:58 2016
+++ src/tests/bin/cat/t_cat.sh Fri Apr 26 00:57:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_cat.sh,v 1.3 2016/06/16 01:04:58 sevan Exp $
+# $NetBSD: t_cat.sh,v 1.4 2024/04/26 00:57:15 rillig Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,37 +30,37 @@
atf_test_case align
align_head() {
- atf_set "descr" "Test that cat(1) aligns the output " \
+ atf_set "descr" "Test that cat(1) aligns the output" \
"right with options '-be' (PR bin/4841)"
}
align_body() {
- atf_check -s ignore -o file:$(atf_get_srcdir)/d_align.out \
- -x "cat -be $(atf_get_srcdir)/d_align.in"
+ atf_check -o file:$(atf_get_srcdir)/d_align.out \
+ cat -be $(atf_get_srcdir)/d_align.in
}
atf_test_case nonexistent
nonexistent_head() {
- atf_set "descr" "Test that cat(1) doesn't return zero exit " \
+ atf_set "descr" "Test that cat(1) doesn't return zero exit" \
"status for a nonexistent file (PR bin/3538)"
}
nonexistent_body() {
- atf_check -s not-exit:0 -o empty -e not-empty \
- -x "cat /some/name/that/does/not/exist"
+ atf_check -s not-exit:0 -e not-empty \
+ cat /some/name/that/does/not/exist
}
atf_test_case se_output
se_output_head() {
- atf_set "descr" "Test that cat(1) prints a $ sign " \
+ atf_set "descr" "Test that cat(1) prints a $ sign" \
"on blank lines with options '-se' (PR bin/51250)"
}
se_output_body() {
- atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \
- -x "cat -se $(atf_get_srcdir)/d_se_output.in"
+ atf_check -o file:$(atf_get_srcdir)/d_se_output.out \
+ cat -se $(atf_get_srcdir)/d_se_output.in
}
atf_init_test_cases()
CVS commit: src/tests/bin/cat
Module Name:src Committed By: rillig Date: Fri Apr 26 00:57:15 UTC 2024 Modified Files: src/tests/bin/cat: t_cat.sh Log Message: tests/cat: clean up Multiple arguments to atf_set are joined by spaces, there's no need for an extra space. The exit status on success must be 0, so don't ignore it. Remove the unnecessary shell wrapper, as no redirection is going on. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/bin/cat/t_cat.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Thu Apr 25 17:22:49 UTC 2024 Modified Files: src/doc: CHANGES Log Message: CHANGES: fix typo To generate a diff of this commit: cvs rdiff -u -r1.3050 -r1.3051 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3050 src/doc/CHANGES:1.3051 --- src/doc/CHANGES:1.3050 Wed Apr 24 15:41:41 2024 +++ src/doc/CHANGES Thu Apr 25 17:22:48 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3050 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3051 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -137,7 +137,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: [gutteridge 20230630] tetris(6): Support the informal standard of allowing setting NO_COLOR in the environment to disable the use of color. [nia 20230701] - lint(1): Initial support for C23. [rilling 20230702] + lint(1): Initial support for C23. [rillig 20230702] heartbeat(9): New mechanism to check progress of kernel. This uses hard interrupts to check progress of low-priority soft interrupts, and one CPU to check progress of another CPU. @@ -230,7 +230,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: kernel: Replace various usage of extent(9) with vmem(9). [thorpej 20231201] indent(1): Use line number of the token start in diagnostics - [rilling 20231203] + [rillig 20231203] vmem(9): Add the notion of "private boundary tags", allowing vmem to be used VERY early in boot. [thorpej 20231203] kernel: Modularize compat90. [pgoyette 20231209] @@ -314,7 +314,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: be matched by ugen(4) and accessed through libusb. [thorpej 20240326] moused(8): Remove undocumented and unused option 'C'. - [rilling 20240329] + [rillig 20240329] ugen(4): Add a "ugen-unit" device property which devpubd(8) scripts can query to determine which /dev/ugenN.xx nodes a given ugen or ugenif device is using. [thorpej 20240329]
CVS commit: src/doc
Module Name:src Committed By: rillig Date: Thu Apr 25 17:22:49 UTC 2024 Modified Files: src/doc: CHANGES Log Message: CHANGES: fix typo To generate a diff of this commit: cvs rdiff -u -r1.3050 -r1.3051 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: nia
Date: Thu Apr 25 11:56:51 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.installimage
src/distrib/i386/cdroms/installcd: Makefile
Log Message:
remove redundant kernels and floppies from the space-starved i386 ISO
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.11 -r1.12 src/distrib/i386/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.47 src/distrib/common/Makefile.bootcd:1.48
--- src/distrib/common/Makefile.bootcd:1.47 Wed Apr 24 11:29:34 2024
+++ src/distrib/common/Makefile.bootcd Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 nia Exp $
+# $NetBSD: Makefile.bootcd,v 1.48 2024/04/25 11:56:51 nia Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -53,7 +53,7 @@ CDROMS_RELEASEDIR?= ${MACHINE}/installat
CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
-CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+CDRELEASE_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
.endif
.if defined(CDRELEASE_NOCOMPAT)
. for sufx in tgz tar.xz
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.10 src/distrib/common/bootimage/Makefile.installimage:1.11
--- src/distrib/common/bootimage/Makefile.installimage:1.10 Sat Sep 25 21:26:03 2021
+++ src/distrib/common/bootimage/Makefile.installimage Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
+# $NetBSD: Makefile.installimage,v 1.11 2024/04/25 11:56:51 nia Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -46,7 +46,8 @@ DISKPROTO_IN?= ${NETBSDSRCDIR}/distrib/c
# XXX: no permission info for makefs(8)
IMGDIR_EXTRA= ${RELEASEDIR}/${RELEASEMACHINEDIR} ${RELEASEMACHINEDIR}
-IMGDIR_EXCLUDE= -s ',./installation/cdrom.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+IMGDIR_EXCLUDE+= -s ',./installation/cdrom.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.if defined(MD_IMGDIR_EXCLUDE)
Index: src/distrib/i386/cdroms/installcd/Makefile
diff -u src/distrib/i386/cdroms/installcd/Makefile:1.11 src/distrib/i386/cdroms/installcd/Makefile:1.12
--- src/distrib/i386/cdroms/installcd/Makefile:1.11 Tue Apr 23 20:37:08 2024
+++ src/distrib/i386/cdroms/installcd/Makefile Thu Apr 25 11:56:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/04/23 20:37:08 nia Exp $
+# $NetBSD: Makefile,v 1.12 2024/04/25 11:56:51 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -15,6 +15,21 @@ CDRELEASE_NOTESTS= true
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
+# already (probably) booting from CD if using this and the floppy images
+# are 20MB+ when combined
+CDRELEASE_EXCLUDE+= -s ',./installation/floppy/.*,,gp'
+
+# MONOLITHIC (i386-only) was originally added to the release build
+# for upgrades from netbsd-5, and now primarily exists so the no-modules
+# build can continue to be tested. this takes up 20MB+ space.
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-INSTALL.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/kern-MONOLITHIC.${sufx},,gp'
+. endfor
+
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-INSTALL.gz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/kernel/netbsd-MONOLITHIC.gz,,gp'
+
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
CVS commit: src/distrib
Module Name:src Committed By: nia Date: Thu Apr 25 11:56:51 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd src/distrib/common/bootimage: Makefile.installimage src/distrib/i386/cdroms/installcd: Makefile Log Message: remove redundant kernels and floppies from the space-starved i386 ISO To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/distrib/common/Makefile.bootcd cvs rdiff -u -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.installimage cvs rdiff -u -r1.11 -r1.12 src/distrib/i386/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: hannken
Date: Thu Apr 25 11:25:09 UTC 2024
Modified Files:
src/usr.sbin/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.pl util.c
Log Message:
Increase length of set description to 40 characters so recent additions fit.
Ok: martin@
Fixes PR install/58188 "sysinst fails to display status of base32 set"
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.76 -r1.77 src/usr.sbin/sysinst/util.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/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.47 src/usr.sbin/sysinst/msg.mi.de:1.48
--- src/usr.sbin/sysinst/msg.mi.de:1.47 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/msg.mi.de Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.47 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: msg.mi.de,v 1.48 2024/04/25 11:25:08 hannken Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -875,8 +875,8 @@ message cur_distsets
}
message cur_distsets_header
-{ Distributionspaket Ausgewählt
- --
+{ Distributionspaket Ausgewählt
+ -- --
}
message set_base
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.50 src/usr.sbin/sysinst/msg.mi.en:1.51
--- src/usr.sbin/sysinst/msg.mi.en:1.50 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/msg.mi.en Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.50 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: msg.mi.en,v 1.51 2024/04/25 11:25:08 hannken Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -809,8 +809,8 @@ message cur_distsets
}
message cur_distsets_header
-{ Distribution set Selected
-
+{ Distribution set Selected
+ --
}
message set_base
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.42 src/usr.sbin/sysinst/msg.mi.es:1.43
--- src/usr.sbin/sysinst/msg.mi.es:1.42 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/msg.mi.es Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.42 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: msg.mi.es,v 1.43 2024/04/25 11:25:08 hannken Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -834,8 +834,8 @@ message cur_distsets
}
message cur_distsets_header
-{ Conjunto de distribución Selecc.
-
+{ Conjunto de distribución Selecc.
+ --
}
message set_base
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.48 src/usr.sbin/sysinst/msg.mi.pl:1.49
--- src/usr.sbin/sysinst/msg.mi.pl:1.48 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/msg.mi.pl Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.48 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.49 2024/04/25 11:25:08 hannken Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -806,8 +806,8 @@ message cur_distsets
}
message cur_distsets_header
-{Pakiet dystrybucyjny Uzyc?
-- -
+{Pakiet dystrybucyjny Uzyc?
+--- -
}
message set_base
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.76 src/usr.sbin/sysinst/util.c:1.77
--- src/usr.sbin/sysinst/util.c:1.76 Mon Apr 22 14:41:26 2024
+++ src/usr.sbin/sysinst/util.c Thu Apr 25 11:25:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.76 2024/04/22 14:41:26 nia Exp $ */
+/* $NetBSD: util.c,v 1.77 2024/04/25 11:25:08 hannken Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -246,7 +246,7 @@ init_set_status(int flags)
i = strlen(msg_all); if (i > len) {len = i; longest = msg_all; }
i = strlen(msg_some); if (i > len) {len = i; longest = msg_some; }
i = strlen(msg_none); if (i > len) {len = i; longest = msg_none; }
- select_menu_width = snprintf(NULL, 0, "%-30s %s", "", longest);
+ select_menu_width = snprintf(NULL, 0, "%-40s %s", "", longest);
/* Give the md code a chance to choose the right kernel, etc. */
md_init_set_status(flags);
@@ -870,7 +870,7 @@ set_label(menudesc *menu, int opt, void
}
}
- wprintw(menu->mw, "%-30s %s", msg_string(desc), selected);
+ wprintw(menu->mw, "%-40s %s", msg_string(desc), selected);
}
static int set_sublist(menudesc *menu, void *arg);
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: hannken Date: Thu Apr 25 11:25:09 UTC 2024 Modified Files: src/usr.sbin/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.pl util.c Log Message: Increase length of set description to 40 characters so recent additions fit. Ok: martin@ Fixes PR install/58188 "sysinst fails to display status of base32 set" To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/sysinst/msg.mi.en cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/sysinst/msg.mi.pl cvs rdiff -u -r1.76 -r1.77 src/usr.sbin/sysinst/util.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: thorpej
Date: Thu Apr 25 01:33:04 UTC 2024
Modified Files:
src/sys/dev/usb: uftdi.c
Log Message:
Add a match quirk to prevent matching any interface on SiPEED FPGA
development boards (e.g. Tang Nano 9K). The FT2232s on these boards
are wired up only for JTAG.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/usb/uftdi.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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.78 src/sys/dev/usb/uftdi.c:1.79
--- src/sys/dev/usb/uftdi.c:1.78 Wed Apr 17 02:34:45 2024
+++ src/sys/dev/usb/uftdi.c Thu Apr 25 01:33:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $ */
+/* $NetBSD: uftdi.c,v 1.79 2024/04/25 01:33:03 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.79 2024/04/25 01:33:03 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -229,7 +229,19 @@ static const struct uftdi_match_quirk_en
.vendor_str = "SecuringHardware.com",
.product_str = "Tigard V1.1",
.match_ret = UMATCH_NONE,
- }
+ },
+ /*
+ * The SiPEED Tang Nano 9K (and other SiPEED Tang FPGA development
+ * boards) have an FT2232 on-board, wired up only for JTAG.
+ */
+ {
+ .vendor_id = USB_VENDOR_FTDI,
+ .product_id = USB_PRODUCT_FTDI_SERIAL_2232C,
+ .iface_no = -1,
+ .vendor_str = "SIPEED",
+ .product_str = "JTAG Debugger",
+ .match_ret = UMATCH_NONE,
+ },
};
static int
@@ -243,7 +255,7 @@ uftdi_quirk_match(struct usbif_attach_ar
q = _match_quirks[i];
if (uiaa->uiaa_vendor != q->vendor_id ||
uiaa->uiaa_product != q->product_id ||
- uiaa->uiaa_ifaceno != q->iface_no) {
+ (q->iface_no != -1 && uiaa->uiaa_ifaceno != q->iface_no)) {
continue;
}
if (q->vendor_str != NULL &&
CVS commit: src/sys/dev/usb
Module Name:src Committed By: thorpej Date: Thu Apr 25 01:33:04 UTC 2024 Modified Files: src/sys/dev/usb: uftdi.c Log Message: Add a match quirk to prevent matching any interface on SiPEED FPGA development boards (e.g. Tang Nano 9K). The FT2232s on these boards are wired up only for JTAG. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/dev/usb/uftdi.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: rillig Date: Wed Apr 24 21:59:39 UTC 2024 Modified Files: src/usr.sbin/makefs: walk.c Log Message: makefs: fix out-of-bounds fsnode count in fsnode_sort Found by running './makefs img.dat cd9660'. While here, apply more KNF. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/makefs/walk.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: rillig
Date: Wed Apr 24 21:59:39 UTC 2024
Modified Files:
src/usr.sbin/makefs: walk.c
Log Message:
makefs: fix out-of-bounds fsnode count in fsnode_sort
Found by running './makefs img.dat cd9660'.
While here, apply more KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/makefs/walk.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/walk.c
diff -u src/usr.sbin/makefs/walk.c:1.38 src/usr.sbin/makefs/walk.c:1.39
--- src/usr.sbin/makefs/walk.c:1.38 Wed Apr 24 14:23:37 2024
+++ src/usr.sbin/makefs/walk.c Wed Apr 24 21:59:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: walk.c,v 1.38 2024/04/24 14:23:37 christos Exp $ */
+/* $NetBSD: walk.c,v 1.39 2024/04/24 21:59:39 rillig Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.38 2024/04/24 14:23:37 christos Exp $");
+__RCSID("$NetBSD: walk.c,v 1.39 2024/04/24 21:59:39 rillig Exp $");
#endif /* !__lint */
#include
@@ -93,7 +93,6 @@ fsnode_sort(fsnode *first, const char *r
size_t num = 0;
for (fsnode *tmp = first; tmp; tmp = tmp->next, num++) {
- num++;
if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
printf("%s: pre sort: %s %s %s\n",
__func__, root, dir, tmp->name);
@@ -103,7 +102,7 @@ fsnode_sort(fsnode *first, const char *r
for (fsnode *tmp = first; tmp; tmp = tmp->next)
*listptr++ = tmp;
- qsort (list, num, sizeof(*list), fsnode_cmp);
+ qsort(list, num, sizeof(*list), fsnode_cmp);
for (size_t i = 0; i < num - 1; ++i)
list[i]->next = list[i + 1];
@@ -562,7 +561,7 @@ apply_specdir(const char *dir, NODE *spe
if (curfsnode->type != S_IFDIR)
errx(EXIT_FAILURE,
"`%s' is not a directory", path);
- assert (curfsnode->child != NULL);
+ assert(curfsnode->child != NULL);
apply_specdir(path, curnode, curfsnode->child, speconly);
}
}
@@ -676,14 +675,14 @@ dump_fsnodes(fsnode *root)
assert(cur->symlink != NULL);
printf(" -> %s", cur->symlink);
} else {
- assert (cur->symlink == NULL);
+ assert(cur->symlink == NULL);
}
if (cur->inode->nlink > 1)
printf(", nlinks=%d", cur->inode->nlink);
putchar('\n');
if (cur->child) {
- assert (cur->type == S_IFDIR);
+ assert(cur->type == S_IFDIR);
dump_fsnodes(cur->child);
}
}
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 24 20:38:24 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Explicitly exclude VAX from new Mesa due to a gcc internal compiler error
To generate a diff of this commit:
cvs rdiff -u -r1.1371 -r1.1372 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1371 src/share/mk/bsd.own.mk:1.1372
--- src/share/mk/bsd.own.mk:1.1371 Wed Apr 24 19:14:39 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 20:38:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1372 2024/04/24 20:38:24 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1331,7 +1331,8 @@ HAVE_XORG_SERVER_VER?=120
.endif
# Newer Mesa does not build with old X server
-.if ${HAVE_XORG_SERVER_VER} != "120"
+# VAX build triggers a gcc internal error
+.if ${HAVE_XORG_SERVER_VER} != "120" || ${MACHINE} == "vax"
HAVE_MESA_VER=19
.endif
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Wed Apr 24 20:38:24 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Explicitly exclude VAX from new Mesa due to a gcc internal compiler error To generate a diff of this commit: cvs rdiff -u -r1.1371 -r1.1372 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Wed Apr 24 19:14:39 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Force old Mesa for all old X server builds To generate a diff of this commit: cvs rdiff -u -r1.1370 -r1.1371 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 24 19:14:39 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Force old Mesa for all old X server builds
To generate a diff of this commit:
cvs rdiff -u -r1.1370 -r1.1371 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1370 src/share/mk/bsd.own.mk:1.1371
--- src/share/mk/bsd.own.mk:1.1370 Wed Apr 24 07:54:53 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 19:14:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1370 2024/04/24 07:54:53 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1371 2024/04/24 19:14:39 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1320,10 +1320,18 @@ MKDTB.earmv7hfeb= yes
MKDTB.riscv32= yes
MKDTB.riscv64= yes
-# alpha build fails due to missing X include files,
-# vax build triggers a gcc bug and dies with an internal compiler error.
-# XXX switch both to old Mesa for now.
-.if ${MACHINE} == "alpha" || ${MACHINE} == "vax"
+# During transition from xorg-server 1.10 to 1.20
+.if \
+${MACHINE} == "alpha" || \
+${MACHINE} == "netwinder" || \
+${MACHINE} == "sgimips"
+HAVE_XORG_SERVER_VER?=110
+.else
+HAVE_XORG_SERVER_VER?=120
+.endif
+
+# Newer Mesa does not build with old X server
+.if ${HAVE_XORG_SERVER_VER} != "120"
HAVE_MESA_VER=19
.endif
@@ -1676,16 +1684,6 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib
X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
.endfor
-# During transition from xorg-server 1.10 to 1.20
-.if \
-${MACHINE} == "alpha" || \
-${MACHINE} == "netwinder" || \
-${MACHINE} == "sgimips"
-HAVE_XORG_SERVER_VER?=110
-.else
-HAVE_XORG_SERVER_VER?=120
-.endif
-
.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm"
CVS commit: src/external/gpl3/gcc.old/dist/gcc/cp
Module Name:src
Committed By: hgutch
Date: Wed Apr 24 16:48:30 UTC 2024
Modified Files:
src/external/gpl3/gcc.old/dist/gcc/cp: cfns.h
Log Message:
Fix gcc build on FreeBSD 14 (and possibly other systems using clang >= 16).
Pointed out by Eirik Øverby.
OK mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc.old/dist/gcc/cp/cfns.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/dist/gcc/cp/cfns.h
diff -u src/external/gpl3/gcc.old/dist/gcc/cp/cfns.h:1.11 src/external/gpl3/gcc.old/dist/gcc/cp/cfns.h:1.12
--- src/external/gpl3/gcc.old/dist/gcc/cp/cfns.h:1.11 Mon Feb 20 02:11:23 2023
+++ src/external/gpl3/gcc.old/dist/gcc/cp/cfns.h Wed Apr 24 16:48:29 2024
@@ -60,7 +60,7 @@ public:
};
inline unsigned int
-libc_name::hash (register const char *str, register unsigned int len)
+libc_name::hash (const char *str, unsigned int len)
{
static const unsigned short asso_values[] =
{
@@ -91,7 +91,7 @@ libc_name::hash (register const char *st
1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488,
1488, 1488, 1488, 1488, 1488, 1488, 1488
};
- register int hval = len;
+ int hval = len;
switch (hval)
{
@@ -118,7 +118,7 @@ libc_name::hash (register const char *st
}
const struct libc_name_struct *
-libc_name::libc_name_p (register const char *str, register unsigned int len)
+libc_name::libc_name_p (const char *str, unsigned int len)
{
enum
{
@@ -1116,15 +1116,15 @@ libc_name::libc_name_p (register const c
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
- register int key = hash (str, len);
+ int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
- register int index = lookup[key];
+ int index = lookup[key];
if (index >= 0)
{
- register const char *s = wordlist[index].name;
+ const char *s = wordlist[index].name;
if (*str == *s && !strcmp (str + 1, s + 1))
return [index];
CVS commit: src/external/gpl3/gcc.old/dist/gcc/cp
Module Name:src Committed By: hgutch Date: Wed Apr 24 16:48:30 UTC 2024 Modified Files: src/external/gpl3/gcc.old/dist/gcc/cp: cfns.h Log Message: Fix gcc build on FreeBSD 14 (and possibly other systems using clang >= 16). Pointed out by Eirik Øverby. OK mrg@ To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc.old/dist/gcc/cp/cfns.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/csh
Module Name:src
Committed By: nia
Date: Wed Apr 24 15:49:03 UTC 2024
Modified Files:
src/bin/csh: dir.c file.c func.c glob.c misc.c str.c
Log Message:
csh: replace malloc(x * y) and realloc(x * y) with reallocarray
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/bin/csh/dir.c
cvs rdiff -u -r1.33 -r1.34 src/bin/csh/file.c
cvs rdiff -u -r1.44 -r1.45 src/bin/csh/func.c
cvs rdiff -u -r1.31 -r1.32 src/bin/csh/glob.c
cvs rdiff -u -r1.22 -r1.23 src/bin/csh/misc.c
cvs rdiff -u -r1.16 -r1.17 src/bin/csh/str.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/csh/dir.c
diff -u src/bin/csh/dir.c:1.35 src/bin/csh/dir.c:1.36
--- src/bin/csh/dir.c:1.35 Sun Aug 9 00:34:21 2020
+++ src/bin/csh/dir.c Wed Apr 24 15:49:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.35 2020/08/09 00:34:21 dholland Exp $ */
+/* $NetBSD: dir.c,v 1.36 2024/04/24 15:49:03 nia Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dir.c,v 1.35 2020/08/09 00:34:21 dholland Exp $");
+__RCSID("$NetBSD: dir.c,v 1.36 2024/04/24 15:49:03 nia Exp $");
#endif
#endif /* not lint */
@@ -279,8 +279,8 @@ dnormalize(Char *cp)
size_t dotdot = 0;
Char *dp, *cwd;
- cwd = xmalloc((size_t)((Strlen(dcwd->di_name) + 3) *
- sizeof(Char)));
+ cwd = xreallocarray(NULL, (size_t)(Strlen(dcwd->di_name) + 3),
+ sizeof(Char));
(void)Strcpy(cwd, dcwd->di_name);
/*
@@ -389,7 +389,8 @@ dgoto(Char *cp)
cwdlen = 0;
for (p = cp; *p++;)
continue;
- dp = xmalloc((size_t)(cwdlen + (size_t)(p - cp) + 1) * sizeof(Char));
+ dp = xreallocarray(NULL,
+ (size_t)(cwdlen + (size_t)(p - cp) + 1), sizeof(Char));
for (p = dp, q = dcwd->di_name; (*p++ = *q++) != '\0';)
continue;
if (cwdlen)
@@ -705,8 +706,8 @@ dcanon(Char *cp, Char *p)
/*
* New length is "yyy/" + slink + "/.." and rest
*/
- p1 = newcp = xmalloc(
- (size_t)((sp - cp) + cc + (p1 - p)) * sizeof(Char));
+ p1 = newcp = xreallocarray(NULL,
+ (size_t)((sp - cp) + cc + (p1 - p)), sizeof(Char));
/*
* Copy new path into newcp
*/
@@ -725,8 +726,8 @@ dcanon(Char *cp, Char *p)
/*
* New length is slink + "/.." and rest
*/
- p1 = newcp = xmalloc(
- (size_t)(cc + (p1 - p)) * sizeof(Char));
+ p1 = newcp = xreallocarray(NULL,
+ (size_t)(cc + (p1 - p)), sizeof(Char));
/*
* Copy new path into newcp
*/
@@ -794,8 +795,8 @@ dcanon(Char *cp, Char *p)
/*
* New length is "yyy/" + slink + "/.." and rest
*/
- p1 = newcp = xmalloc(
- (size_t)((sp - cp) + cc + (p1 - p)) * sizeof(Char));
+ p1 = newcp = xreallocarray(NULL,
+ (size_t)((sp - cp) + cc + (p1 - p)), sizeof(Char));
/*
* Copy new path into newcp
*/
@@ -814,8 +815,8 @@ dcanon(Char *cp, Char *p)
/*
* New length is slink + the rest
*/
- p1 = newcp = xmalloc(
- (size_t)(cc + (p1 - p)) * sizeof(Char));
+ p1 = newcp = xreallocarray(NULL,
+ (size_t)(cc + (p1 - p)), sizeof(Char));
/*
* Copy new path into newcp
*/
Index: src/bin/csh/file.c
diff -u src/bin/csh/file.c:1.33 src/bin/csh/file.c:1.34
--- src/bin/csh/file.c:1.33 Tue Sep 29 02:58:51 2020
+++ src/bin/csh/file.c Wed Apr 24 15:49:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.33 2020/09/29 02:58:51 msaitoh Exp $ */
+/* $NetBSD: file.c,v 1.34 2024/04/24 15:49:03 nia Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: file.c,v 1.33 2020/09/29 02:58:51 msaitoh Exp $");
+__RCSID("$NetBSD: file.c,v 1.34 2024/04/24 15:49:03 nia Exp $");
#endif
#endif /* not lint */
@@ -519,13 +519,10 @@ again:/* search for matches */
if (command == LIST) {
if ((size_t)numitems >= maxitems) {
maxitems += 1024;
- if (items == NULL)
- items = xmalloc(sizeof(*items) * maxitems);
- else
- items = xrealloc(items, sizeof(*items) * maxitems);
+ items = xreallocarray(items, sizeof(*items), maxitems);
}
- items[numitems] = xmalloc((size_t) (Strlen(entry) + 1) *
- sizeof(Char));
+ items[numitems] = xreallocarray(NULL,
+ (size_t) (Strlen(entry) + 1), sizeof(Char));
copyn(items[numitems], entry, MAXNAMLEN);
numitems++;
}
Index: src/bin/csh/func.c
diff -u src/bin/csh/func.c:1.44 src/bin/csh/func.c:1.45
--- src/bin/csh/func.c:1.44 Sun Aug 9 00:22:53 2020
+++ src/bin/csh/func.c Wed Apr 24 15:49:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.44 2020/08/09 00:22:53 dholland Exp $ */
+/* $NetBSD: func.c,v 1.45 2024/04/24 15:49:03 nia Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char
CVS commit: src/bin/csh
Module Name:src Committed By: nia Date: Wed Apr 24 15:49:03 UTC 2024 Modified Files: src/bin/csh: dir.c file.c func.c glob.c misc.c str.c Log Message: csh: replace malloc(x * y) and realloc(x * y) with reallocarray To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/bin/csh/dir.c cvs rdiff -u -r1.33 -r1.34 src/bin/csh/file.c cvs rdiff -u -r1.44 -r1.45 src/bin/csh/func.c cvs rdiff -u -r1.31 -r1.32 src/bin/csh/glob.c cvs rdiff -u -r1.22 -r1.23 src/bin/csh/misc.c cvs rdiff -u -r1.16 -r1.17 src/bin/csh/str.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/csh
Module Name:src Committed By: nia Date: Wed Apr 24 15:47:12 UTC 2024 Modified Files: src/bin/csh: csh.h Log Message: csh: add a helper definition for the reallocarray function To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/bin/csh/csh.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/csh/csh.h diff -u src/bin/csh/csh.h:1.29 src/bin/csh/csh.h:1.30 --- src/bin/csh/csh.h:1.29 Fri Apr 3 18:11:29 2020 +++ src/bin/csh/csh.h Wed Apr 24 15:47:11 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: csh.h,v 1.29 2020/04/03 18:11:29 joerg Exp $ */ +/* $NetBSD: csh.h,v 1.30 2024/04/24 15:47:11 nia Exp $ */ /*- * Copyright (c) 1980, 1991, 1993 @@ -86,6 +86,7 @@ typedef void *ioctl_t; /* Third arg of #define xmalloc(i) Malloc(i) #define xrealloc(p, i) Realloc(p, i) +#define xreallocarray(p, n, sz) Reallocarray(p, n, sz) #define xcalloc(n, s) Calloc(n, s) #include
CVS commit: src/bin/csh
Module Name:src Committed By: nia Date: Wed Apr 24 15:47:12 UTC 2024 Modified Files: src/bin/csh: csh.h Log Message: csh: add a helper definition for the reallocarray function To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/bin/csh/csh.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/csh
Module Name:src Committed By: nia Date: Wed Apr 24 15:46:20 UTC 2024 Modified Files: src/bin/csh: alloc.c extern.h Log Message: csh: add a reallocarray function for using inside csh To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/bin/csh/alloc.c cvs rdiff -u -r1.34 -r1.35 src/bin/csh/extern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/csh
Module Name:src
Committed By: nia
Date: Wed Apr 24 15:46:20 UTC 2024
Modified Files:
src/bin/csh: alloc.c extern.h
Log Message:
csh: add a reallocarray function for using inside csh
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/csh/alloc.c
cvs rdiff -u -r1.34 -r1.35 src/bin/csh/extern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/alloc.c
diff -u src/bin/csh/alloc.c:1.15 src/bin/csh/alloc.c:1.16
--- src/bin/csh/alloc.c:1.15 Sat Jan 5 16:54:00 2019
+++ src/bin/csh/alloc.c Wed Apr 24 15:46:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: alloc.c,v 1.15 2019/01/05 16:54:00 christos Exp $ */
+/* $NetBSD: alloc.c,v 1.16 2024/04/24 15:46:20 nia Exp $ */
/*-
* Copyright (c) 1983, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: alloc.c,v 1.15 2019/01/05 16:54:00 christos Exp $");
+__RCSID("$NetBSD: alloc.c,v 1.16 2024/04/24 15:46:20 nia Exp $");
#endif
#endif /* not lint */
@@ -72,6 +72,19 @@ Realloc(void *p, size_t n)
}
void *
+Reallocarray(void *p, size_t n, size_t sz)
+{
+void *ptr = p;
+
+if (reallocarr(, n, sz) != 0) {
+ child++;
+ stderror(ERR_NOMEM);
+ return (p);
+}
+return (ptr);
+}
+
+void *
Calloc(size_t s, size_t n)
{
void *ptr;
Index: src/bin/csh/extern.h
diff -u src/bin/csh/extern.h:1.34 src/bin/csh/extern.h:1.35
--- src/bin/csh/extern.h:1.34 Thu Sep 15 11:35:06 2022
+++ src/bin/csh/extern.h Wed Apr 24 15:46:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.34 2022/09/15 11:35:06 martin Exp $ */
+/* $NetBSD: extern.h,v 1.35 2024/04/24 15:46:20 nia Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -314,6 +314,7 @@ void psecs(long);
void Free(void *);
void * Malloc(size_t);
void *Realloc(void *, size_t);
+void *Reallocarray(void *, size_t, size_t);
void *Calloc(size_t, size_t);
/*
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Apr 24 15:41:42 UTC 2024 Modified Files: src/doc: CHANGES Log Message: recent changes To generate a diff of this commit: cvs rdiff -u -r1.3049 -r1.3050 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.3049 src/doc/CHANGES:1.3050 --- src/doc/CHANGES:1.3049 Wed Apr 10 14:24:31 2024 +++ src/doc/CHANGES Wed Apr 24 15:41:41 2024 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3049 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3050 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -336,3 +336,15 @@ Changes from NetBSD 10.0 to NetBSD 11.0: sysinst(8): Split compatibility libraries into separate sets, base32 and debug32. Split HTML man pages into new manhtml set. [nia 20240410] + amd64: Support EFI as well as BIOS boot in the "live" USB image. + This is not the regular installation image, which already + supports EFI. [maya 20240413] + uftdi(4): Add support for a range of "Brainboxes" USB serial + adapters, from Cameron Williams. [maya 20240417] + x86: Enable ACPI Platform Error Interface support in the GENERIC + kernels. [riastradh 20240421] + mips64el, mips64eb: Create "base64" and "debug64" sets that contain + the N64 libraries. [nia 20240422] + x86, sparc64: Create "DVD" ISOs that contain all the sets excluded + from the normal ISOs for size reasons - also useful on + virtual machines. [nia 20240424]
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Apr 24 15:41:42 UTC 2024 Modified Files: src/doc: CHANGES Log Message: recent changes To generate a diff of this commit: cvs rdiff -u -r1.3049 -r1.3050 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sparc64/cdroms
Module Name:src Committed By: nia Date: Wed Apr 24 15:39:58 UTC 2024 Modified Files: src/distrib/sparc64/cdroms: Makefile Added Files: src/distrib/sparc64/cdroms/installdvd: Makefile Log Message: sparc64 follows x86 and gets an installdvd image with all sets To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/cdroms/installdvd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sparc64/cdroms
Module Name:src
Committed By: nia
Date: Wed Apr 24 15:39:58 UTC 2024
Modified Files:
src/distrib/sparc64/cdroms: Makefile
Added Files:
src/distrib/sparc64/cdroms/installdvd: Makefile
Log Message:
sparc64 follows x86 and gets an installdvd image with all sets
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/cdroms/installdvd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/Makefile
diff -u src/distrib/sparc64/cdroms/Makefile:1.1 src/distrib/sparc64/cdroms/Makefile:1.2
--- src/distrib/sparc64/cdroms/Makefile:1.1 Tue Mar 6 21:57:24 2007
+++ src/distrib/sparc64/cdroms/Makefile Wed Apr 24 15:39:58 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:24 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/24 15:39:58 nia Exp $
-SUBDIR= installcd
+SUBDIR= installcd installdvd
TARGETS+= release iso_image
.include
Added files:
Index: src/distrib/sparc64/cdroms/installdvd/Makefile
diff -u /dev/null src/distrib/sparc64/cdroms/installdvd/Makefile:1.1
--- /dev/null Wed Apr 24 15:39:58 2024
+++ src/distrib/sparc64/cdroms/installdvd/Makefile Wed Apr 24 15:39:58 2024
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2024/04/24 15:39:58 nia Exp $
+
+.include
+
+CDBASE= sparc64dvd # gives ${CDBASE}.iso
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
+CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
+CD_SETS= base etc
+.if ${MKKMOD} != "no"
+CD_SETS+= modules
+.endif
+
+SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+CDRELEASE_NOISOS= true
+CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR}
+CDBOOTIMAGE=${CDBOOTIMAGEDIR}/boot.fs
+SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE}
+
+image_md_pre:
+ ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
+ ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
+ ${INSTALL} ${COPY} ${.CURDIR}/../installcd/etc.ttys cdrom/etc/ttys
+ ${INSTALL} ${COPY} ${.CURDIR}/../installcd/etc.rc cdrom/etc/rc
+ ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../installcd/install.sh cdrom/install.sh
+ ${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot
+ ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
+
+image_md_post:
+ SUNLABEL=${TOOL_SUNLABEL:Q} \
+ ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
+ ${CDIMAGE} ${SUN_BOOT_ARGS}
+
+.include "${.CURDIR}/../../../common/Makefile.bootcd"
+
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Wed Apr 24 14:41:13 UTC 2024 Modified Files: src/sys/dev/goldfish: gfpic.c Log Message: Remove a superflouous printf(). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/gfpic.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/goldfish/gfpic.c diff -u src/sys/dev/goldfish/gfpic.c:1.1 src/sys/dev/goldfish/gfpic.c:1.2 --- src/sys/dev/goldfish/gfpic.c:1.1 Tue Jan 2 07:27:51 2024 +++ src/sys/dev/goldfish/gfpic.c Wed Apr 24 14:41:13 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: gfpic.c,v 1.1 2024/01/02 07:27:51 thorpej Exp $ */ +/* $NetBSD: gfpic.c,v 1.2 2024/04/24 14:41:13 thorpej Exp $ */ /*- * Copyright (c) 2023 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gfpic.c,v 1.1 2024/01/02 07:27:51 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gfpic.c,v 1.2 2024/04/24 14:41:13 thorpej Exp $"); #include #include @@ -79,8 +79,6 @@ gfpic_enable(struct gfpic_softc *sc, int KASSERT(pirq >= 0); KASSERT(pirq <= 31); - device_printf(sc->sc_dev, "enabling IRQ %d (0x%08x)\n", - pirq, (1U << pirq)); REG_WRITE(sc, GFPIC_ENABLE, (1U << pirq)); }
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Wed Apr 24 14:41:13 UTC 2024 Modified Files: src/sys/dev/goldfish: gfpic.c Log Message: Remove a superflouous printf(). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/gfpic.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: Wed Apr 24 14:23:37 UTC 2024
Modified Files:
src/usr.sbin/makefs: walk.c
Log Message:
use __func__
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/makefs/walk.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/walk.c
diff -u src/usr.sbin/makefs/walk.c:1.37 src/usr.sbin/makefs/walk.c:1.38
--- src/usr.sbin/makefs/walk.c:1.37 Wed Apr 24 10:02:39 2024
+++ src/usr.sbin/makefs/walk.c Wed Apr 24 10:23:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: walk.c,v 1.37 2024/04/24 14:02:39 christos Exp $ */
+/* $NetBSD: walk.c,v 1.38 2024/04/24 14:23:37 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.37 2024/04/24 14:02:39 christos Exp $");
+__RCSID("$NetBSD: walk.c,v 1.38 2024/04/24 14:23:37 christos Exp $");
#endif /* !__lint */
#include
@@ -95,7 +95,8 @@ fsnode_sort(fsnode *first, const char *r
for (fsnode *tmp = first; tmp; tmp = tmp->next, num++) {
num++;
if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
- printf ("pre sort: %s %s %s\n", root, dir, tmp->name);
+ printf("%s: pre sort: %s %s %s\n",
+ __func__, root, dir, tmp->name);
}
list = listptr = ecalloc(num, sizeof(*list));
@@ -112,7 +113,8 @@ fsnode_sort(fsnode *first, const char *r
free(list);
if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
for (fsnode *tmp = first; tmp; tmp = tmp->next)
- printf("post sort: %s %s %s\n", root, dir, tmp->name);
+ printf("%s: post sort: %s %s %s\n",
+ __func__, root, dir, tmp->name);
return first;
}
@@ -144,7 +146,7 @@ walk_dir(const char *root, const char *d
if ((size_t)len >= sizeof(path))
errx(EXIT_FAILURE, "Pathname too long.");
if (debug & DEBUG_WALK_DIR)
- printf("walk_dir: %s %p\n", path, parent);
+ printf("%s: %s %p\n", __func__, path, parent);
if ((dirp = opendir(path)) == NULL)
err(EXIT_FAILURE, "Can't opendir `%s'", path);
rp = path + strlen(root) + 1;
@@ -173,7 +175,8 @@ walk_dir(const char *root, const char *d
dot = 0;
}
if (debug & DEBUG_WALK_DIR_NODE)
- printf("scanning %s/%s/%s\n", root, dir, name);
+ printf("%s: scanning %s/%s/%s\n",
+ __func__, root, dir, name);
if (snprintf(path + len, sizeof(path) - len, "/%s", name) >=
(int)sizeof(path) - len)
errx(EXIT_FAILURE, "Pathname too long.");
@@ -198,7 +201,7 @@ walk_dir(const char *root, const char *d
#ifdef S_ISSOCK
if (S_ISSOCK(stbuf.st_mode & S_IFMT)) {
if (debug & DEBUG_WALK_DIR_NODE)
-printf(" skipping socket %s\n", path);
+printf("%s: skipping socket %s\n", __func__, path);
continue;
}
#endif
@@ -218,8 +221,8 @@ walk_dir(const char *root, const char *d
if (S_ISDIR(cur->type) &&
S_ISDIR(stbuf.st_mode)) {
if (debug & DEBUG_WALK_DIR_NODE)
- printf("merging %s with %p\n",
- path, cur->child);
+ printf("%s: merging %s with %p\n",
+ __func__, path, cur->child);
cur->child = walk_dir(root, rp, cur,
cur->child, replace, follow);
continue;
@@ -232,7 +235,8 @@ walk_dir(const char *root, const char *d
inode_type(cur->type));
else {
if (debug & DEBUG_WALK_DIR_NODE)
- printf("replacing %s %s\n",
+ printf("%s: replacing %s %s\n",
+ __func__,
inode_type(stbuf.st_mode),
path);
if (cur == join->next)
@@ -280,7 +284,8 @@ walk_dir(const char *root, const char *d
cur->inode = curino;
cur->inode->nlink++;
if (debug & DEBUG_WALK_DIR_LINKCHECK)
- printf("link_check: found [%ju, %ju]\n",
+ printf("%s: link check found [%ju, %ju]\n",
+ __func__,
(uintmax_t)curino->st.st_dev,
(uintmax_t)curino->st.st_ino);
}
@@ -403,7 +408,7 @@ apply_specfile(const char *specfile, con
assert(parent != NULL);
if (debug & DEBUG_APPLY_SPECFILE)
- printf("apply_specfile: %s, %s %p\n", specfile, dir, parent);
+ printf("%s: %s, %s %p\n", __func__, specfile, dir, parent);
/* read in the specfile */
if ((fp = fopen(specfile, "r")) == NULL)
@@ -438,7 +443,7 @@ apply_specdir(const char *dir, NODE *spe
assert(dirnode != NULL);
if (debug & DEBUG_APPLY_SPECFILE)
- printf("apply_specdir: %s %p %p\n", dir, specnode, dirnode);
+ printf("%s: %s %p %p\n", __func__, dir, specnode, dirnode);
if (specnode->type != F_DIR)
errx(EXIT_FAILURE, "Specfile node `%s/%s' is not a directory",
@@ -466,7 +471,9 @@ apply_specdir(const char *dir, NODE *spe
}
if (curnode == NULL) {
if (debug & DEBUG_APPLY_SPECONLY) {
- printf("apply_specdir: trimming %s/%s %p\n", dir, curfsnode->name, curfsnode);
+ printf("%s: trimming %s/%s %p\n",
+ __func__, dir, curfsnode->name,
+ curfsnode);
}
free_fsnodes(curfsnode);
}
@@ -477,13 +484,12 @@
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Wed Apr 24 14:23:37 UTC 2024 Modified Files: src/usr.sbin/makefs: walk.c Log Message: use __func__ To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/makefs/walk.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: Wed Apr 24 14:02:39 UTC 2024
Modified Files:
src/usr.sbin/makefs: walk.c
Log Message:
make a separate sorting function and KNF (thanks rillig)
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/makefs/walk.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/walk.c
diff -u src/usr.sbin/makefs/walk.c:1.36 src/usr.sbin/makefs/walk.c:1.37
--- src/usr.sbin/makefs/walk.c:1.36 Tue Apr 23 18:18:56 2024
+++ src/usr.sbin/makefs/walk.c Wed Apr 24 10:02:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: walk.c,v 1.36 2024/04/23 22:18:56 christos Exp $ */
+/* $NetBSD: walk.c,v 1.37 2024/04/24 14:02:39 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.36 2024/04/23 22:18:56 christos Exp $");
+__RCSID("$NetBSD: walk.c,v 1.37 2024/04/24 14:02:39 christos Exp $");
#endif /* !__lint */
#include
@@ -86,6 +86,37 @@ fsnode_cmp(const void *vleft, const void
return strcmp(lname, rname);
}
+static fsnode *
+fsnode_sort(fsnode *first, const char *root, const char *dir)
+{
+ fsnode **list, **listptr;
+ size_t num = 0;
+
+ for (fsnode *tmp = first; tmp; tmp = tmp->next, num++) {
+ num++;
+ if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
+ printf ("pre sort: %s %s %s\n", root, dir, tmp->name);
+ }
+
+ list = listptr = ecalloc(num, sizeof(*list));
+ for (fsnode *tmp = first; tmp; tmp = tmp->next)
+ *listptr++ = tmp;
+
+ qsort (list, num, sizeof(*list), fsnode_cmp);
+
+ for (size_t i = 0; i < num - 1; ++i)
+ list[i]->next = list[i + 1];
+ list[num - 1]->next = NULL;
+ first = list[0];
+ assert(strcmp(first->name, ".") == 0);
+ free(list);
+ if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
+ for (fsnode *tmp = first; tmp; tmp = tmp->next)
+ printf("post sort: %s %s %s\n", root, dir, tmp->name);
+
+ return first;
+}
+
/*
* walk_dir --
* build a tree of fsnodes from `root' and `dir', with a parent
@@ -106,14 +137,11 @@ walk_dir(const char *root, const char *d
char *name, *rp;
int dot, len;
- fsnode **list, **listptr;
- int num = 0;
-
assert(root != NULL);
assert(dir != NULL);
len = snprintf(path, sizeof(path), "%s/%s", root, dir);
- if (len >= (int)sizeof(path))
+ if ((size_t)len >= sizeof(path))
errx(EXIT_FAILURE, "Pathname too long.");
if (debug & DEBUG_WALK_DIR)
printf("walk_dir: %s %p\n", path, parent);
@@ -155,14 +183,16 @@ walk_dir(const char *root, const char *d
} else {
if (lstat(path, ) == -1)
err(EXIT_FAILURE, "Can't lstat `%s'", path);
- /* As symlink permission bits vary between filesystems
- (ie. 0755 on FFS/NetBSD, 0777 for ext[234]/Linux),
- force them to 0755. */
+ /*
+ * Symlink permission bits vary between filesystems/OSs
+ * (ie. 0755 on FFS/NetBSD, 0777 for ext[234]/Linux),
+ * force them to 0755.
+ */
if (S_ISLNK(stbuf.st_mode)) {
stbuf.st_mode &= ~(S_IRWXU | S_IRWXG | S_IRWXO);
stbuf.st_mode |= S_IRWXU
- | S_IRGRP | S_IXGRP
- | S_IROTH | S_IXOTH;
+| S_IRGRP | S_IXGRP
+| S_IROTH | S_IXOTH;
}
}
#ifdef S_ISSOCK
@@ -273,35 +303,7 @@ walk_dir(const char *root, const char *d
if (closedir(dirp) == -1)
err(EXIT_FAILURE, "Can't closedir `%s/%s'", root, dir);
- /*
- * Sort entries.
- */
- /* Create a plain list: Count, alloc, add. */
- for (fsnode *tmp = first; tmp; tmp = tmp->next) {
- num++;
- if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
- printf ("pre sort: %s %s %s\n", root, dir, tmp->name);
- }
- list = listptr = ecalloc (num, sizeof (*list));
- for (fsnode *tmp = first; tmp; tmp = tmp->next)
- *listptr++ = tmp;
- /* Sort plain list. */
- qsort (list, num, sizeof (*list), _cmp);
- /* Rewire. */
- for (int i = 0; i < num - 1; ++i)
- list[i]->next = list[i+1];
- list[num - 1]->next = NULL;
- first = list[0];
- /* Check `first` to be ".". */
- assert (strcmp (first->name, ".") == 0);
- /* Free. */
- free (list);
- /* Dump sorted state. */
- if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
- for (fsnode *tmp = first; tmp; tmp = tmp->next)
- printf ("post sort: %s %s %s\n", root, dir, tmp->name);
-
- return first;
+ return fsnode_sort(first, root, dir);
}
static fsnode *
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Wed Apr 24 14:02:39 UTC 2024 Modified Files: src/usr.sbin/makefs: walk.c Log Message: make a separate sorting function and KNF (thanks rillig) To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/makefs/walk.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/sparc/dev
Module Name:src
Committed By: macallan
Date: Wed Apr 24 11:49:58 UTC 2024
Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c
Log Message:
allow userland to switch to 16bit colour
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/sparc/dev/cgfourteen.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/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.96 src/sys/arch/sparc/dev/cgfourteen.c:1.97
--- src/sys/arch/sparc/dev/cgfourteen.c:1.96 Wed Dec 20 05:33:18 2023
+++ src/sys/arch/sparc/dev/cgfourteen.c Wed Apr 24 11:49:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteen.c,v 1.96 2023/12/20 05:33:18 thorpej Exp $ */
+/* $NetBSD: cgfourteen.c,v 1.97 2024/04/24 11:49:58 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -1072,22 +1072,28 @@ cg14_set_depth(struct cgfourteen_softc *
CG14_MCTL, CG14_MCTL_ENABLEVID |
CG14_MCTL_PIXMODE_8 | CG14_MCTL_POWERCTL);
sc->sc_depth = 8;
- /* everything is CLUT1 */
- for (i = 0; i < CG14_CLUT_SIZE; i++)
- sc->sc_xlut->xlut_lut[i] = 0;
+ break;
+ case 16:
+ bus_space_write_1(sc->sc_bustag, sc->sc_regh,
+ CG14_MCTL, CG14_MCTL_ENABLEVID |
+ CG14_MCTL_PIXMODE_16 | CG14_MCTL_POWERCTL);
+ sc->sc_depth = 16;
break;
case 32:
bus_space_write_1(sc->sc_bustag, sc->sc_regh,
CG14_MCTL, CG14_MCTL_ENABLEVID |
CG14_MCTL_PIXMODE_32 | CG14_MCTL_POWERCTL);
sc->sc_depth = 32;
- for (i = 0; i < CG14_CLUT_SIZE; i++)
- sc->sc_xlut->xlut_lut[i] = 0;
break;
default:
printf("%s: can't change to depth %d\n",
device_xname(sc->sc_dev), depth);
+ return;
}
+ /* everything is CLUT1 */
+ for (i = 0; i < CG14_CLUT_SIZE; i++)
+ sc->sc_xlut->xlut_lut[i] = 0;
+
}
static void
@@ -1432,7 +1438,7 @@ cg14_bitblt_gc(void *cookie, int xs, int
saddr = sc->sc_fb_paddr + xs + stride * ys;
daddr = sc->sc_fb_paddr + xd + stride * yd;
-
+
if (saddr & 3) {
swi += saddr & 3;
dreg += saddr & 3;
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: macallan Date: Wed Apr 24 11:49:58 UTC 2024 Modified Files: src/sys/arch/sparc/dev: cgfourteen.c Log Message: allow userland to switch to 16bit colour To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/sparc/dev/cgfourteen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src Committed By: nia Date: Wed Apr 24 11:29:35 UTC 2024 Modified Files: src/distrib/amd64/cdroms: Makefile src/distrib/cdrom: current.conf src/distrib/common: Makefile.bootcd src/distrib/i386/cdroms: Makefile Added Files: src/distrib/amd64/cdroms/installdvd: Makefile boot.cfg.in src/distrib/i386/cdroms/installdvd: Makefile boot.cfg.in Log Message: Add "DVD" ISOs for x86 that don't have to follow CD size limitations. These include all available sets. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/installdvd/Makefile \ src/distrib/amd64/cdroms/installdvd/boot.cfg.in cvs rdiff -u -r1.13 -r1.14 src/distrib/cdrom/current.conf cvs rdiff -u -r1.46 -r1.47 src/distrib/common/Makefile.bootcd cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/cdroms/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/installdvd/Makefile \ src/distrib/i386/cdroms/installdvd/boot.cfg.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: nia
Date: Wed Apr 24 11:29:35 UTC 2024
Modified Files:
src/distrib/amd64/cdroms: Makefile
src/distrib/cdrom: current.conf
src/distrib/common: Makefile.bootcd
src/distrib/i386/cdroms: Makefile
Added Files:
src/distrib/amd64/cdroms/installdvd: Makefile boot.cfg.in
src/distrib/i386/cdroms/installdvd: Makefile boot.cfg.in
Log Message:
Add "DVD" ISOs for x86 that don't have to follow CD size limitations.
These include all available sets.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/installdvd/Makefile \
src/distrib/amd64/cdroms/installdvd/boot.cfg.in
cvs rdiff -u -r1.13 -r1.14 src/distrib/cdrom/current.conf
cvs rdiff -u -r1.46 -r1.47 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/installdvd/Makefile \
src/distrib/i386/cdroms/installdvd/boot.cfg.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile
diff -u src/distrib/amd64/cdroms/Makefile:1.3 src/distrib/amd64/cdroms/Makefile:1.4
--- src/distrib/amd64/cdroms/Makefile:1.3 Tue Mar 6 21:52:44 2007
+++ src/distrib/amd64/cdroms/Makefile Wed Apr 24 11:29:34 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/03/06 21:52:44 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2024/04/24 11:29:34 nia Exp $
SUBDIR=
SUBDIR+= bootcd
SUBDIR+= bootcd-com
+SUBDIR+= installdvd
SUBDIR+= installcd
TARGETS+= release iso_image
Index: src/distrib/cdrom/current.conf
diff -u src/distrib/cdrom/current.conf:1.13 src/distrib/cdrom/current.conf:1.14
--- src/distrib/cdrom/current.conf:1.13 Wed Jan 24 09:04:40 2018
+++ src/distrib/cdrom/current.conf Wed Apr 24 11:29:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: current.conf,v 1.13 2018/01/24 09:04:40 skrll Exp $
+# $NetBSD: current.conf,v 1.14 2024/04/24 11:29:34 nia Exp $
#
# Makefile fragment for CD sets; includes config information.
@@ -32,6 +32,7 @@ CD_IMAGES+= multi-cd3-${ISO_RELEASE}
CD_IMAGES+= acorn32cd-${ISO_RELEASE}
CD_IMAGES+= algorcd-${ISO_RELEASE}
CD_IMAGES+= alphacd-${ISO_RELEASE}
+CD_IMAGES+= amd64dvd-${ISO_RELEASE}
CD_IMAGES+= amd64cd-${ISO_RELEASE}
CD_IMAGES+= amigacd-${ISO_RELEASE}
CD_IMAGES+= arccd-${ISO_RELEASE}
@@ -51,6 +52,7 @@ CD_IMAGES+= hppacd-${ISO_RELEASE}
CD_IMAGES+= hpcarmcd-${ISO_RELEASE}
CD_IMAGES+= hpcmipscd-${ISO_RELEASE}
CD_IMAGES+= hpcshcd-${ISO_RELEASE}
+CD_IMAGES+= i386dvd-${ISO_RELEASE}
CD_IMAGES+= i386cd-${ISO_RELEASE}
CD_IMAGES+= ibmnwscd-${ISO_RELEASE}
CD_IMAGES+= iyonix-${ISO_RELEASE}
@@ -159,6 +161,7 @@ BASE_PORTS.multi-cd3-${ISO_RELEASE}= cob
BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32
BASE_PORTS.algorcd-${ISO_RELEASE}=algor
BASE_PORTS.alphacd-${ISO_RELEASE}=alpha
+BASE_PORTS.amd64dvd-${ISO_RELEASE}=amd64
BASE_PORTS.amd64cd-${ISO_RELEASE}=amd64
BASE_PORTS.amigacd-${ISO_RELEASE}=amiga
BASE_PORTS.arccd-${ISO_RELEASE}=arc
@@ -176,6 +179,7 @@ BASE_PORTS.hp300cd-${ISO_RELEASE}=hp300
BASE_PORTS.hpcarmcd-${ISO_RELEASE}=hpcarm
BASE_PORTS.hpcmipscd-${ISO_RELEASE}=hpcmips
BASE_PORTS.hpcshcd-${ISO_RELEASE}=hpcsh
+BASE_PORTS.i386dvd-${ISO_RELEASE}=i386
BASE_PORTS.i386cd-${ISO_RELEASE}=i386
BASE_PORTS.iyonixcd-${ISO_RELEASE}=iyonix
BASE_PORTS.ibmnwscd-${ISO_RELEASE}=ibmnws
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.46 src/distrib/common/Makefile.bootcd:1.47
--- src/distrib/common/Makefile.bootcd:1.46 Tue Apr 23 20:37:07 2024
+++ src/distrib/common/Makefile.bootcd Wed Apr 24 11:29:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.46 2024/04/23 20:37:07 nia Exp $
+# $NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 nia Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -123,6 +123,8 @@ ECHO?= echo
.if ${CDRELEASE} == false
CDIMAGE= ${CDBASE}.iso
+.elif ${CDBASE:M*dvd}
+CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/dvd$//}-dvd.iso
.else
CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso
.endif
Index: src/distrib/i386/cdroms/Makefile
diff -u src/distrib/i386/cdroms/Makefile:1.4 src/distrib/i386/cdroms/Makefile:1.5
--- src/distrib/i386/cdroms/Makefile:1.4 Tue Mar 6 21:52:45 2007
+++ src/distrib/i386/cdroms/Makefile Wed Apr 24 11:29:34 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/03/06 21:52:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2024/04/24 11:29:34 nia Exp $
SUBDIR=
SUBDIR+= bootcd
SUBDIR+= bootcd-com
+SUBDIR+= installdvd
SUBDIR+= installcd
TARGETS+= release iso_image
Added files:
Index: src/distrib/amd64/cdroms/installdvd/Makefile
diff -u /dev/null src/distrib/amd64/cdroms/installdvd/Makefile:1.1
--- /dev/null Wed Apr 24 11:29:35 2024
+++ src/distrib/amd64/cdroms/installdvd/Makefile Wed Apr 24 11:29:34 2024
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
+#
+
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Wed Apr 24 10:35:13 UTC 2024 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: it's netbsd-11, time for a slightly less eye-bleeding shade of orange To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/ctwm/etc/system.ctwmrc diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.19 src/external/mit/ctwm/etc/system.ctwmrc:1.20 --- src/external/mit/ctwm/etc/system.ctwmrc:1.19 Fri May 27 17:04:16 2022 +++ src/external/mit/ctwm/etc/system.ctwmrc Wed Apr 24 10:35:13 2024 @@ -1,5 +1,5 @@ # -# $NetBSD: system.ctwmrc,v 1.19 2022/05/27 17:04:16 nia Exp $ +# $NetBSD: system.ctwmrc,v 1.20 2024/04/24 10:35:13 nia Exp $ # # ctwmrc by nia # @@ -217,7 +217,7 @@ Color BorderTileBackground "steelblue" BorderTileForeground "steelblue" - DefaultBackground "grey70" + DefaultBackground "lavender" DefaultForeground "black" TitleBackground "lavender" @@ -225,13 +225,13 @@ Color MenuBackground"lavender" MenuForeground"black" - MenuTitleBackground "darkorange2" + MenuTitleBackground "darkorange3" MenuTitleForeground "black" MenuShadowColor "gray15" - IconBackground"black" - IconForeground"white" - IconBorderColor "gray45" + IconBackground"lavender" + IconForeground"black" + IconBorderColor "steelblue" IconManagerBackground "lavender" IconManagerForeground "black"
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Wed Apr 24 10:35:13 UTC 2024 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: it's netbsd-11, time for a slightly less eye-bleeding shade of orange To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: martin
Date: Wed Apr 24 07:54:53 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch alpha and VAX back to old Mesa for now untill someone fixes
those builds with newer Mesa.
To generate a diff of this commit:
cvs rdiff -u -r1.1369 -r1.1370 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1369 src/share/mk/bsd.own.mk:1.1370
--- src/share/mk/bsd.own.mk:1.1369 Wed Apr 24 05:20:35 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 07:54:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1369 2024/04/24 05:20:35 nia Exp $
+# $NetBSD: bsd.own.mk,v 1.1370 2024/04/24 07:54:53 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1320,6 +1320,13 @@ MKDTB.earmv7hfeb= yes
MKDTB.riscv32= yes
MKDTB.riscv64= yes
+# alpha build fails due to missing X include files,
+# vax build triggers a gcc bug and dies with an internal compiler error.
+# XXX switch both to old Mesa for now.
+.if ${MACHINE} == "alpha" || ${MACHINE} == "vax"
+HAVE_MESA_VER=19
+.endif
+
HAVE_MESA_VER?= 21
.if ${HAVE_MESA_VER} == 19
EXTERNAL_MESALIB_DIR?= MesaLib.old
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Wed Apr 24 07:54:53 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: Switch alpha and VAX back to old Mesa for now untill someone fixes those builds with newer Mesa. To generate a diff of this commit: cvs rdiff -u -r1.1369 -r1.1370 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Apr 24 06:44:18 UTC 2024 Modified Files: src/doc: TODO.smpnet Log Message: ena(4) became MPSAFe last year To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.47 src/doc/TODO.smpnet:1.48 --- src/doc/TODO.smpnet:1.47 Sun Aug 14 10:13:06 2022 +++ src/doc/TODO.smpnet Wed Apr 24 06:44:18 2024 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.47 2022/08/14 10:13:06 nia Exp $ +$NetBSD: TODO.smpnet,v 1.48 2024/04/24 06:44:18 nia Exp $ MP-safe components == @@ -10,6 +10,7 @@ kernel option. Some components scale up - aq(4) - bcmgenet(4) - bge(4) + - ena(4) - iavf(4) - ixg(4) - ixl(4)
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Apr 24 06:44:18 UTC 2024 Modified Files: src/doc: TODO.smpnet Log Message: ena(4) became MPSAFe last year To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: nia Date: Wed Apr 24 05:20:35 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: USE_XZ_SETS is no longer needed for sparc64 to fit on a standard CD-ROM To generate a diff of this commit: cvs rdiff -u -r1.1368 -r1.1369 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: nia
Date: Wed Apr 24 05:20:35 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
USE_XZ_SETS is no longer needed for sparc64 to fit on a standard CD-ROM
To generate a diff of this commit:
cvs rdiff -u -r1.1368 -r1.1369 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1368 src/share/mk/bsd.own.mk:1.1369
--- src/share/mk/bsd.own.mk:1.1368 Tue Apr 23 03:25:39 2024
+++ src/share/mk/bsd.own.mk Wed Apr 24 05:20:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1368 2024/04/23 03:25:39 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1369 2024/04/24 05:20:35 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1607,7 +1607,6 @@ ${var}?= no
# format if USE_PIGZGZIP is enabled.
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
- ${MACHINE} == "sparc64" || \
${MACHINE_ARCH:Maarch64*})
USE_XZ_SETS?= yes
.else
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src Committed By: nia Date: Wed Apr 24 05:16:16 UTC 2024 Modified Files: src/distrib/sparc64/cdroms/installcd: Makefile Log Message: Give lots of room for further expansion of the sparc64 CD image To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/distrib/sparc64/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: nia
Date: Wed Apr 24 05:16:16 UTC 2024
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Give lots of room for further expansion of the sparc64 CD image
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.32 src/distrib/sparc64/cdroms/installcd/Makefile:1.33
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.32 Tue Apr 23 12:25:57 2024
+++ src/distrib/sparc64/cdroms/installcd/Makefile Wed Apr 24 05:16:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/04/23 12:25:57 nia Exp $
+# $NetBSD: Makefile,v 1.33 2024/04/24 05:16:16 nia Exp $
.include
@@ -6,6 +6,8 @@ CDBASE= sparc64cd # gives ${CDBASE}.is
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDRELEASE_NOCOMPAT= true
+CDRELEASE_NOHTML= true
+CDRELEASE_NOTESTS= true
CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
CD_SETS= base etc
.if ${MKKMOD} != "no"
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:08:03 UTC 2024 Modified Files: src/sys/kern: subr_vmem.c Log Message: vmem_init(): Ensure that the quantum is a power of 2, and that if private tags are being used, they are added to the arena before the first span is added. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/kern/subr_vmem.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/pci
Module Name:src
Committed By: thorpej
Date: Wed Apr 24 02:31:26 UTC 2024
Modified Files:
src/sys/dev/pci: btvmeii.c
Log Message:
b3_2706_map_vme(): Use VM_BESTFIT.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/btvmeii.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/btvmeii.c
diff -u src/sys/dev/pci/btvmeii.c:1.27 src/sys/dev/pci/btvmeii.c:1.28
--- src/sys/dev/pci/btvmeii.c:1.27 Tue Dec 5 15:58:32 2023
+++ src/sys/dev/pci/btvmeii.c Wed Apr 24 02:31:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeii.c,v 1.27 2023/12/05 15:58:32 thorpej Exp $ */
+/* $NetBSD: btvmeii.c,v 1.28 2024/04/24 02:31:26 thorpej Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.27 2023/12/05 15:58:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.28 2024/04/24 02:31:26 thorpej Exp $");
#include
#include
@@ -328,7 +328,7 @@ b3_2706_map_vme(void *vsc, vme_addr_t vm
0, /* boundary */
VMEM_ADDR_MIN, /* minaddr */
VMEM_ADDR_MAX, /* maxaddr */
- VM_NOSLEEP,
+ VM_BESTFIT | VM_NOSLEEP,
)) {
sc->windowused[wnd] = 0;
return (ENOMEM);
CVS commit: src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:31:26 UTC 2024 Modified Files: src/sys/dev/pci: btvmeii.c Log Message: b3_2706_map_vme(): Use VM_BESTFIT. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/btvmeii.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/vme
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:27:33 UTC 2024 Modified Files: src/sys/dev/vme: vme.c Log Message: _vme_space_get(): Use VM_BESTFIT. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/vme/vme.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/vme
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:27:33 UTC 2024 Modified Files: src/sys/dev/vme: vme.c Log Message: _vme_space_get(): Use VM_BESTFIT. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/vme/vme.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/vme/vme.c diff -u src/sys/dev/vme/vme.c:1.30 src/sys/dev/vme/vme.c:1.31 --- src/sys/dev/vme/vme.c:1.30 Mon Dec 4 01:49:29 2023 +++ src/sys/dev/vme/vme.c Wed Apr 24 02:27:33 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: vme.c,v 1.30 2023/12/04 01:49:29 thorpej Exp $ */ +/* $NetBSD: vme.c,v 1.31 2024/04/24 02:27:33 thorpej Exp $ */ /* * Copyright (c) 1999 @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.30 2023/12/04 01:49:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.31 2024/04/24 02:27:33 thorpej Exp $"); #include #include @@ -336,7 +336,7 @@ _vme_space_get(struct vmebus_softc *sc, 0, /* nocross */ VMEM_ADDR_MIN, /* minaddr */ VMEM_ADDR_MAX, /* maxaddr */ - VM_NOSLEEP, + VM_BESTFIT | VM_NOSLEEP, ); if (!res) *addr = help;
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Wed Apr 24 02:08:03 UTC 2024 Modified Files: src/sys/kern: subr_vmem.c Log Message: vmem_init(): Ensure that the quantum is a power of 2, and that if private tags are being used, they are added to the arena before the first span is added. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/kern/subr_vmem.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/subr_vmem.c diff -u src/sys/kern/subr_vmem.c:1.115 src/sys/kern/subr_vmem.c:1.116 --- src/sys/kern/subr_vmem.c:1.115 Sun Dec 3 19:34:08 2023 +++ src/sys/kern/subr_vmem.c Wed Apr 24 02:08:03 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_vmem.c,v 1.115 2023/12/03 19:34:08 thorpej Exp $ */ +/* $NetBSD: subr_vmem.c,v 1.116 2024/04/24 02:08:03 thorpej Exp $ */ /*- * Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi, @@ -46,7 +46,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.115 2023/12/03 19:34:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.116 2024/04/24 02:08:03 thorpej Exp $"); #if defined(_KERNEL) && defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -971,6 +971,14 @@ vmem_init(vmem_t *vm, const char *name, KASSERT((flags & (VM_SLEEP|VM_NOSLEEP)) != 0); KASSERT((~flags & (VM_SLEEP|VM_NOSLEEP)) != 0); KASSERT(quantum > 0); + KASSERT(powerof2(quantum)); + + /* + * If private tags are going to be used, they must + * be added to the arena before the first span is + * added. + */ + KASSERT((flags & VM_PRIVTAGS) == 0 || size == 0); #if defined(_KERNEL) /* XXX: SMP, we get called early... */
CVS commit: src/usr.sbin/mtree
Module Name:src
Committed By: christos
Date: Wed Apr 24 01:44:51 UTC 2024
Modified Files:
src/usr.sbin/mtree: create.c
Log Message:
For the NetBSD tools build we provide our own fts.h not FreeBSD's so the
comparator should have the NetBSD signature.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/mtree/create.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/mtree/create.c
diff -u src/usr.sbin/mtree/create.c:1.77 src/usr.sbin/mtree/create.c:1.78
--- src/usr.sbin/mtree/create.c:1.77 Sat Dec 2 08:34:48 2023
+++ src/usr.sbin/mtree/create.c Tue Apr 23 21:44:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.77 2023/12/02 13:34:48 christos Exp $ */
+/* $NetBSD: create.c,v 1.78 2024/04/24 01:44:51 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: create.c,v 1.77 2023/12/02 13:34:48 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.78 2024/04/24 01:44:51 christos Exp $");
#endif
#endif /* not lint */
@@ -84,7 +84,7 @@ static uid_t uid;
static mode_t mode;
static u_long flags;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && !defined(HAVE_NBTOOL_CONFIG_H)
#define FTS_CONST const
#else
#define FTS_CONST
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: christos Date: Wed Apr 24 01:44:51 UTC 2024 Modified Files: src/usr.sbin/mtree: create.c Log Message: For the NetBSD tools build we provide our own fts.h not FreeBSD's so the comparator should have the NetBSD signature. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/mtree/create.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Tue Apr 23 22:51:28 UTC 2024
Modified Files:
src/usr.bin/make: cond.c make.h parse.c var.c
src/usr.bin/make/unit-tests: cmd-errors-jobs.exp cmd-errors-jobs.mk
cmd-errors-lint.exp cmd-errors-lint.mk cmd-errors.exp cmd-errors.mk
cmdline-undefined.mk cmdline.mk comment.mk cond-cmp-string.mk
cond-func-defined.exp cond-func-defined.mk varmod-ifelse.mk
varmod-match.exp varmod-match.mk
Log Message:
make: clean up comments, code and tests
To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 src/usr.bin/make/cond.c
cvs rdiff -u -r1.330 -r1.331 src/usr.bin/make/make.h
cvs rdiff -u -r1.720 -r1.721 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1104 -r1.1105 src/usr.bin/make/var.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cmd-errors-jobs.exp \
src/usr.bin/make/unit-tests/cmd-errors-lint.exp \
src/usr.bin/make/unit-tests/cmd-errors.mk
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cmd-errors-jobs.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cmd-errors-lint.mk
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cmd-errors.exp \
src/usr.bin/make/unit-tests/cond-func-defined.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cmdline-undefined.mk \
src/usr.bin/make/unit-tests/cmdline.mk
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/comment.mk
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/cond-cmp-string.mk
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/cond-func-defined.mk
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/make/unit-tests/varmod-ifelse.mk
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varmod-match.exp
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/varmod-match.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.362 src/usr.bin/make/cond.c:1.363
--- src/usr.bin/make/cond.c:1.362 Wed Feb 7 07:21:22 2024
+++ src/usr.bin/make/cond.c Tue Apr 23 22:51:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.362 2024/02/07 07:21:22 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.363 2024/04/23 22:51:28 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.362 2024/02/07 07:21:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.363 2024/04/23 22:51:28 rillig Exp $");
/*
* Conditional expressions conform to this grammar:
@@ -424,13 +424,12 @@ CondParser_StringExpr(CondParser *par, c
* Parse a string from an expression or an optionally quoted string,
* on the left-hand and right-hand sides of comparisons.
*
- * Results:
- * Returns the string without any enclosing quotes, or NULL on error.
- * Sets out_quoted if the leaf was a quoted string literal.
+ * Return the string without any enclosing quotes, or NULL on error.
+ * Sets out_quoted if the leaf was a quoted string literal.
*/
-static void
+static FStr
CondParser_Leaf(CondParser *par, bool doEval, bool unquotedOK,
- FStr *out_str, bool *out_quoted)
+ bool *out_quoted)
{
Buffer buf;
FStr str;
@@ -492,7 +491,7 @@ return_buf:
buf.data = NULL;
return_str:
Buf_Done();
- *out_str = str;
+ return str;
}
/*
@@ -602,7 +601,7 @@ CondParser_Comparison(CondParser *par, b
ComparisonOp op;
bool lhsQuoted, rhsQuoted;
- CondParser_Leaf(par, doEval, par->leftUnquotedOK, , );
+ lhs = CondParser_Leaf(par, doEval, par->leftUnquotedOK, );
if (lhs.str == NULL)
goto done_lhs;
@@ -622,7 +621,7 @@ CondParser_Comparison(CondParser *par, b
goto done_lhs;
}
- CondParser_Leaf(par, doEval, true, , );
+ rhs = CondParser_Leaf(par, doEval, true, );
t = rhs.str == NULL ? TOK_ERROR
: !doEval ? TOK_FALSE
: EvalCompare(par, lhs.str, lhsQuoted, op, rhs.str, rhsQuoted);
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.330 src/usr.bin/make/make.h:1.331
--- src/usr.bin/make/make.h:1.330 Sat Apr 20 10:18:55 2024
+++ src/usr.bin/make/make.h Tue Apr 23 22:51:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.330 2024/04/20 10:18:55 rillig Exp $ */
+/* $NetBSD: make.h,v 1.331 2024/04/23 22:51:28 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -399,7 +399,7 @@ typedef struct SearchPath {
/*
* A graph node represents a target that can possibly be made, including its
- * relation to other targets and a lot of other details.
+ * relation to other targets.
*/
typedef struct GNode {
/* The target's name, such as "clean" or "make.c" */
@@ -581,8 +581,8 @@ extern GNode *SCOPE_GLOBAL;
extern GNode *SCOPE_CMDLINE;
/*
- * Value returned by Var_Parse when an error is encountered. It actually
- * points to an empty string, so naive callers needn't worry about it.
+ * Value returned by Var_Parse when an error is
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Tue Apr 23 22:51:28 UTC 2024 Modified Files: src/usr.bin/make: cond.c make.h parse.c var.c src/usr.bin/make/unit-tests: cmd-errors-jobs.exp cmd-errors-jobs.mk cmd-errors-lint.exp cmd-errors-lint.mk cmd-errors.exp cmd-errors.mk cmdline-undefined.mk cmdline.mk comment.mk cond-cmp-string.mk cond-func-defined.exp cond-func-defined.mk varmod-ifelse.mk varmod-match.exp varmod-match.mk Log Message: make: clean up comments, code and tests To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/usr.bin/make/cond.c cvs rdiff -u -r1.330 -r1.331 src/usr.bin/make/make.h cvs rdiff -u -r1.720 -r1.721 src/usr.bin/make/parse.c cvs rdiff -u -r1.1104 -r1.1105 src/usr.bin/make/var.c cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cmd-errors-jobs.exp \ src/usr.bin/make/unit-tests/cmd-errors-lint.exp \ src/usr.bin/make/unit-tests/cmd-errors.mk cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cmd-errors-jobs.mk cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cmd-errors-lint.mk cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/cmd-errors.exp \ src/usr.bin/make/unit-tests/cond-func-defined.exp cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cmdline-undefined.mk \ src/usr.bin/make/unit-tests/cmdline.mk cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/comment.mk cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/cond-cmp-string.mk cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/cond-func-defined.mk cvs rdiff -u -r1.27 -r1.28 src/usr.bin/make/unit-tests/varmod-ifelse.mk cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varmod-match.exp cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/varmod-match.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
