From nobody Mon Sep 07 04:20:37 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hdYlT5RYQz6rMD7 for ; Mon, 07 Sep 2026 04:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hdYlT1zcDz3S84 for ; Mon, 07 Sep 2026 04:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788754837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2B1RC+CbDGPd9kF01O9HV2XH0Kf6sF1mUrkyvYlEto=; b=kRToGEachSkzU8dtftvN2xRbZQCWLzoaLks580E1LVX5wqQ7Keita5Uzol40JhMNjYZ8yl gWaDPLuFgMsn0PDuAZx5sHu4T5SPI8PNnN4EptuKyXz2YRw3Ry010qBZ8yf/KCaFxJ+fId jebenJSAdAdEaO1bdePMB/wtFCwptqxKlluC1AB7Ko+Wf852ZLgM1V9mqNBtCfSCkOb55m RjdIOH6GEGcR/BLceGvDDzehjslOQfiXpT7jkezIvT11p/Hl0w+040fltxIKgA21Hq9RnP YZ+xdAA9E4Q3WD3bEbH3ei8eMuPCNva4zfwBiomWpbP37QrxCqWDEqeeQkkKzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788754837; a=rsa-sha256; cv=none; b=T2zJLI6kgJSWvEA1UyEwkRau7FzLlIB5fQ9LmyA0IAKrzVkA7aGvujLgY3aD1Gp4stuC0l cge4OozfiXbKC4HxBzlq1H/tNJfEDMYUknMR9Z7B9UY6IkIzk+rN31pBNFAObfCxOa/Owa ydqQBK0MREJTmv6UxGSNizHqCEFq/j52YfjmXn82fZb8ihBMA8Pj+Dt9GJfHaNSmnV1MFa BGFDI77zI8rjNk8k/KitQQ4mbfdmqibzUb3upocJWdPmWQZuRCRacIOKRfcwyqTuyuJWFz bDIGnCml6QBfBeYsOfbM9Xfcs0gAmvU2AtOxhzwFSifRRUB844lSkwkoWHrXsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788754837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2B1RC+CbDGPd9kF01O9HV2XH0Kf6sF1mUrkyvYlEto=; b=R6QKdORJk4Ds4NB57U18MikO6nyho5tu7Z24jNRfVQeJV+7Yexg8ITkHv8cwFEZiXQ7DPA v4PEeQrLzAvA/icxDdJ7CLVJyqb07kqFfdqtDomHQCmiixVdYkBc3OzlgIOv2JJHo117ty iMUCo0ueIkxyYehIJycSZCYz3iq00HmKwyUXgWly2OSQth29qax/P3yRytkWWeObjLmN+D 3pIKpKItIFTuLowCiKV6ls6WXycNNQZjF/XG5eUnEv0SQCX/qiSt53EN2POHYn/jpd3GK5 QeQy00dJjhECa/Q2hPwvgp1fqVzFexwm8a8pEKKhm3N1CN9IGuRhPJ2ft+fdag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdYlT0mTCz12XT for ; Mon, 07 Sep 2026 04:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c99f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 07 Sep 2026 04:20:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 25e5a96773c0 - stable/15 - m4: import fixes from OpenBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 25e5a96773c07df313e03af18146a6ec685ccc93 Auto-Submitted: auto-generated Date: Mon, 07 Sep 2026 04:20:37 +0000 Message-Id: <6a9e3b95.1c99f.32b96d15@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=25e5a96773c07df313e03af18146a6ec685ccc93 commit 25e5a96773c07df313e03af18146a6ec685ccc93 Author: Baptiste Daroussin AuthorDate: 2026-07-19 18:43:31 +0000 Commit: Baptiste Daroussin CommitDate: 2026-09-07 04:19:00 +0000 m4: import fixes from OpenBSD - gnum4.c: fix m4_warnx() to use vwarnx() instead of warnx() - eval.c: improve error messages for empty macro names - extern.h: remove compute_prevep() declaration - Update OpenBSD version strings MFC After: 3 days (cherry picked from commit 8966cc0d01a29c11168e4e9d7f1703aa31ad3be6) --- usr.bin/m4/eval.c | 6 +++--- usr.bin/m4/extern.h | 3 +-- usr.bin/m4/gnum4.c | 4 ++-- usr.bin/m4/look.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index 4f088e0415e0..6f96b5555965 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eval.c,v 1.78 2019/06/28 05:35:34 deraadt Exp $ */ +/* $OpenBSD: eval.c,v 1.81 2026/02/25 05:37:25 op Exp $ */ /* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */ /*- @@ -598,7 +598,7 @@ void dodefine(const char *name, const char *defn) { if (!*name && !mimic_gnu) - m4errx(1, "null definition."); + m4errx(1, "define macro with empty name."); else macro_define(name, defn); } @@ -635,7 +635,7 @@ static void dopushdef(const char *name, const char *defn) { if (!*name && !mimic_gnu) - m4errx(1, "null definition."); + m4errx(1, "pushdef macro with empty name."); else macro_pushdef(name, defn); } diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h index a411cb6d5891..bdee26be56bd 100644 --- a/usr.bin/m4/extern.h +++ b/usr.bin/m4/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.55 2017/06/15 13:48:42 bcallah Exp $ */ +/* $OpenBSD: extern.h,v 1.57 2026/02/25 05:37:25 op Exp $ */ /* $NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $ */ /*- @@ -93,7 +93,6 @@ extern int exit_code; /* misc.c */ extern void chrsave(int); -extern char *compute_prevep(void); extern void getdiv(int); extern ptrdiff_t doindex(const char *, const char *); extern void initspaces(void); diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c index ecd89b5c8b6a..d7201533cb1a 100644 --- a/usr.bin/m4/gnum4.c +++ b/usr.bin/m4/gnum4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gnum4.c,v 1.52 2017/08/21 21:41:13 deraadt Exp $ */ +/* $OpenBSD: gnum4.c,v 1.55 2025/11/05 17:10:45 tb Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause @@ -267,7 +267,7 @@ m4_warnx(const char *fmt, ...) va_list ap; va_start(ap, fmt); - warnx(fmt, ap); + vwarnx(fmt, ap); va_end(ap); if (fatal_warns) diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c index c1fccd7dd8e5..c084baef30cf 100644 --- a/usr.bin/m4/look.c +++ b/usr.bin/m4/look.c @@ -1,4 +1,4 @@ -/* $OpenBSD: look.c,v 1.24 2014/12/21 09:33:12 espie Exp $ */ +/* $OpenBSD: look.c,v 1.26 2026/02/25 05:37:25 op Exp $ */ /*- * SPDX-License-Identifier: BSD-3-Clause