From nobody Sun Feb 15 08:58:00 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 4fDKYh6Pq7z6SGmK for ; Sun, 15 Feb 2026 08:58:00 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDKYh5CY2z46QC for ; Sun, 15 Feb 2026 08:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771145880; 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=dfoL0Nqr+nnvSzGSycl2SzT18QreV/TL2dKjtNHWa1c=; b=pLYOwjp5xk+aHajl6zJnx7+ByY0osa9CkXaZ8srbM1n13SrgprArNjnnBB16LjYmcrRHrq /aRnas8oTm27Ek+0umuKLFuoFUAjf2cKiV5tysezV7N5T15mBefjuT99ifdK1V/Y+VezgF ad1UVdDH4658U8JiG59veJ/5Tj+PcHZ98ioiGBle/I8I+W6Q46p7+CRBR6HumhGCKww9V+ RheIXWCCp3fQBVZ1a9xbrZAnV8dkSp6lRUNYI1+XCD/rI42ibLTxMX51O4/yE8hwGlc/Zj Krduwg1o2HMjXsRhcVaflOiuMNl4RiJnZW+HlfJ9pOURNcTHPxW3Yqw83mudFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771145880; a=rsa-sha256; cv=none; b=dfhZRWOSapw5ibnBM/874qSB9pLV4Ti1eXqbP4V+NwXg9X2CWLlBskUR9/ItnM22K0vM6m Tq8LF81Gj2RpBPk4GlX8fQyZ9KoctRcFJM2nDgGLb6GoKOrrtwK9WxoEIxECgWxvJG1hEz tVFqDHNk4uqEl5je3Fvx0gbZWBIn42yeLCVv4KR6YOqXzfVgCdVe1vdofmupchzy3NytWO yorvKcl+FlKttum1mBJb/XaQxbnUNURdPIi24Mmxpl8qHTm8iGVxnmE1KyNxRQAuMOgOHk 3huotXeOyr5FAqfLPMboiherF4mBKbNtEGPhXoKLh8A19I8Fm6tbpRgSkdYnYA== 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=1771145880; 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=dfoL0Nqr+nnvSzGSycl2SzT18QreV/TL2dKjtNHWa1c=; b=JMOJkysrxFYy5gFJO9ai5Tu+P3897Q3V1Qt7qrd25NEgOg3WIbtZqJaJcODKPW0CxqgCyz +pYyV0qwlf+XOnLSSQtMX89Gmp9vzdW+qSLz82ARuknlmj4WhTuec0J785alB24nhGr8f5 zldMg2E1oEPVsn3DhDLm0A2bUJ/7WWQ6vJx4gABW6TIiQwH1b4O0WCInVH93ZRBEy+Qub6 mo4VPD5Q6HpA8OSmM7HhovctqZpaEB+3IsCZOJyeBuCHyPj6ehIPMqgV6iYg3poCAqAL6k Ttf42hhZL7xD6+lBn9PkYxosSMlRQBE6ThlN7G2DPhvoyCRxGyMEMM7jGa4FHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDKYh4XphzmKp for ; Sun, 15 Feb 2026 08:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ff8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 08:58:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 78c53adf27d5 - stable/15 - m4: Change defn processing order 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 78c53adf27d542c970eab2595b04d97b129ab2d0 Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 08:58:00 +0000 Message-Id: <69918a98.18ff8.718b6970@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=78c53adf27d542c970eab2595b04d97b129ab2d0 commit 78c53adf27d542c970eab2595b04d97b129ab2d0 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-07 18:16:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-15 08:57:46 +0000 m4: Change defn processing order Currently, defn pushes its arguments on the stack in order, which means they are then processed in reverse order. POSIX does not specify what order they are processed in, which arguably suggests that they should be processed in the order they are listed. Push them in reverse order so they will be processed in their original order. This matches GNU m4. PR: 292937 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: obiwac, imp Differential Revision: https://reviews.freebsd.org/D55116 (cherry picked from commit 25a8168f86a1222388475ce858da405e4d06c1c3) --- usr.bin/m4/eval.c | 2 +- usr.bin/m4/tests/Makefile | 2 ++ usr.bin/m4/tests/defn.m4 | 5 +++++ usr.bin/m4/tests/m4_test.sh | 9 +++++++++ usr.bin/m4/tests/regress.defn.out | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index 3170d52bfe2a..4e45a71874e1 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -490,7 +490,7 @@ expand_builtin(const char *argv[], int argc, int td) case DEFNTYPE: if (argc > 2) - for (n = 2; n < argc; n++) + for (n = argc - 1; n >= 2; n--) dodefn(argv[n]); break; diff --git a/usr.bin/m4/tests/Makefile b/usr.bin/m4/tests/Makefile index bbf26d4e42d9..fd7a44cea14c 100644 --- a/usr.bin/m4/tests/Makefile +++ b/usr.bin/m4/tests/Makefile @@ -5,6 +5,7 @@ ATF_TESTS_SH= m4_test ${PACKAGE}FILES+= args.m4 ${PACKAGE}FILES+= args2.m4 ${PACKAGE}FILES+= comments.m4 +${PACKAGE}FILES+= defn.m4 ${PACKAGE}FILES+= esyscmd.m4 ${PACKAGE}FILES+= eval.m4 ${PACKAGE}FILES+= ff_after_dnl.m4.uu @@ -27,6 +28,7 @@ ${PACKAGE}FILES+= translit2.m4 ${PACKAGE}FILES+= regress.args.out ${PACKAGE}FILES+= regress.args2.out ${PACKAGE}FILES+= regress.comments.out +${PACKAGE}FILES+= regress.defn.out ${PACKAGE}FILES+= regress.esyscmd.out ${PACKAGE}FILES+= regress.eval.out ${PACKAGE}FILES+= regress.ff_after_dnl.out diff --git a/usr.bin/m4/tests/defn.m4 b/usr.bin/m4/tests/defn.m4 new file mode 100644 index 000000000000..6599f95a5f20 --- /dev/null +++ b/usr.bin/m4/tests/defn.m4 @@ -0,0 +1,5 @@ +dnl Check that our defn processes its arguments in order. +define(a,1)dnl +define(b,2)dnl +define(c,3)dnl +defn(`a',`b',`c') diff --git a/usr.bin/m4/tests/m4_test.sh b/usr.bin/m4/tests/m4_test.sh index 671f25ff4673..aa9be767d1c9 100644 --- a/usr.bin/m4/tests/m4_test.sh +++ b/usr.bin/m4/tests/m4_test.sh @@ -70,6 +70,14 @@ comments_body() m4_test comments } +defn_head() +{ +} +defn_body() +{ + m4_test defn +} + esyscmd_head() { } @@ -219,6 +227,7 @@ atf_init_test_cases() atf_add_test_case args atf_add_test_case args2 atf_add_test_case comments + atf_add_test_case defn atf_add_test_case esyscmd atf_add_test_case eval atf_add_test_case ff_after_dnl diff --git a/usr.bin/m4/tests/regress.defn.out b/usr.bin/m4/tests/regress.defn.out new file mode 100644 index 000000000000..190a18037c64 --- /dev/null +++ b/usr.bin/m4/tests/regress.defn.out @@ -0,0 +1 @@ +123