From nobody Mon Jul 20 11:51:11 2026 X-Original-To: dev-commits-src-main@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 4h3f404Jsgz6lqnJ for ; Mon, 20 Jul 2026 11:51:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h3f3z3XSSz3L0r for ; Mon, 20 Jul 2026 11:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784548271; 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=mE7V8EJiT+QGWVGWeA1d855uzmDWDQny7QGbbZMaEcE=; b=L6aX/IsbwZ1Pk+rdY+Netj+qCmK3EYmS6/n/vNDYfe54FfALdWDIyS9a+/FFUveG8hHX3m DwpWv/Bn7FKPdCGqkowcGos/TlIvGELtpC2iK9alg3AUGMdFE2VHm8ADNC+aU9QEQ+4uAt JE5XtIDL5lOgH+OU9xZ3N27UskpdgZvAyMJEyOV9lSOBlXTztqXoZaqFrEQu06yM1SpwVY JPxvkFsjM6sI6+PUDO4kB1iUvZJotvZnewYRCPt6EYfJvpHdOtwmZMV0dodCgLCHF1WF8/ opwfijMiw0RZkb4FAW0Dbh56BEkLMZpbVnCV27pDK9fYgXONFhm3WIcBmVStkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784548271; a=rsa-sha256; cv=none; b=ECoytrlyNa5+1+Xsz4j14lKH4hiIfQzh3QtH/olerXjkZB6Ini1qfGKz23FYQIHLttpJI0 2E5yIFsUxED2xcp9jZPq2CMSirhSsawdUccqRKVi2XizUv3B798Xk+9ueQyVsObxr+nXQV B/qsGNCjf9QsAbkrx70Zn5hw0BamLqgmcs+P9p/C7vht3HApPyaA4TapjrKWPOgv41aV0b 7N+Uyyvzid/PeHsAqRZGzsLqD8++XWaG+j4ugY9UZcKHlHO5aTUcWeTM5xcUb6QyQtT+8E QcsyzEzpTpkwqch4a5yEb7zhUNDcik2RnMKAFvN3WRf0PfUVN1uE+DAPfRw+rw== 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=1784548271; 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=mE7V8EJiT+QGWVGWeA1d855uzmDWDQny7QGbbZMaEcE=; b=ScvpmRd+ByWsjxNhrGIKIkzA8S7KWnkduNiRQpqX/LDYMaNryidD31q431GcFiL+fYCSw2 JmkK3CD6Vz3oMyQ1UYqmjZZUo44yADEoSc8badGkLS7xtmQfAJkqQNEQsbKtlgyRClGLOw K0CUPGT8zPzrrgAnDvn5ZjD5tdMUAeduVpEKg4juVNdcdF4Ad2D/REL0EJ1JvDFmx9lFjE 3plPZD4aehAnW/LSjjOv/2HP56NvGA/XnEMi7wWNPWWZ3rJQBSUIFYmK9EcMCAG9jWpsD9 DL0IXKFSVyWIfsN41OA56QiTzn00XHj0/niMaPLdJG1uGjw0UAq5I/NBX3KHtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3f3z1lZYz11J1 for ; Mon, 20 Jul 2026 11:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 11:51:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8966cc0d01a2 - main - m4: import fixes from OpenBSD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8966cc0d01a29c11168e4e9d7f1703aa31ad3be6 Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 11:51:11 +0000 Message-Id: <6a5e0baf.3b0c2.2e6bbed@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8966cc0d01a29c11168e4e9d7f1703aa31ad3be6 commit 8966cc0d01a29c11168e4e9d7f1703aa31ad3be6 Author: Baptiste Daroussin AuthorDate: 2026-07-19 18:43:31 +0000 Commit: Baptiste Daroussin CommitDate: 2026-07-20 11:49:42 +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 --- 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