From nobody Fri Nov 20 12:04:35 2026 X-Original-To: dev-commits-src-all@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 4jWDXg42lBz71X9t for ; Fri, 20 Nov 2026 12:04:35 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jWDXg20Zvz3QTg for ; Fri, 20 Nov 2026 12:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795176275; 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=PFw8d8WvT0y+oiXfIZAAV/RAaliJQ/9+SkRiswQ4YyQ=; b=GWvP7IDDt7QZBsnJjPhlM4fmVOnhL9e9Ov79U/nVZibBwdSZX3XsEKgp4e3Zx7TnFI7Cbo OIZ09zeFqmT2S0hnnVfEpaXnbrT5h5LzmokKJJsj54QjRVqk7eTf9xQ9/dUwJdonEEmrGI SdVnpV/KjIyze9SopIGdtb9gYg1ddU/QDbhFahtgQ7glvfIGJ0D8/koau3XYHOXm6QhmGp SdWPIDIteITtrynd+3iOAKtrED+8SkQ5EInzIIpT1RHtJHf4psdhumKWN7ly8Nvl4qnC5e bpkoThz+wkYs9mYyv/KxZ4zKEd90SGuJ5YapgPvP/jnBFLWOsxHhZ9zh4FkogA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795176275; b=GAJUHP9nXhU8B9/IH3ti6fXN/bFNejopJx4YufcAhZiOD0YrLz39XoOGwbTSZEwEmxysW9 6ke08ZfqoQECzq1JCUpawQlzcwjrkECp7rPr8GmHak8yq6+Beq9VaqtxZMInhxVG+dF1k0 p7yJ0aduMSVKiSYNoYZ65TvFHb7HseVwk3aXidS0mRKWK+/6kULDBLSRk6ll2KdRg4TGaW Vxu9ynoEXs7Zg8H099k51elnfrnLO4wBAOCZLe88UDoejZoCQYXgqocx0ZAWxa6JZeXJS2 LxoW9FtWr472UEeNoDzLmNR3WOOzU3nPAUKriOuQMa6XzXRcHkmMEcxkI/u6nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795176275; 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=PFw8d8WvT0y+oiXfIZAAV/RAaliJQ/9+SkRiswQ4YyQ=; b=kq2v5azaPtMN0m4jgARSKTNZd1euQz0EjGVwtDth0s/NRcqfxgVLiDZ0sOQrkSLmor8JiD INNddahibpn/Yrj1Ajxt0kt4bTSbxC3rPW9Mp7YfeAsYhSyovFH37pfg1nh/ozjvQBBP0L u856pw4RhSFZvw3D8QS1LzM5lLsvR9dk96Mlk8/x9B7JasFlH7UojEMtvGaVZ1XdiK2z9O FEPIj1pG2XHfZ38xvdO6wcJd9Dvh2JfMfcysP4zPEXU4l/7IssTnAfGzSd2TXX7ahfAcDI MfW+JtpbtBKj2BQre3kmua6pOpB1mLicjIJrmo+5+e0A3kOdIazOVlvRvcqxqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jWDXg1ZgNznTG for ; Fri, 20 Nov 2026 12:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4ae0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 12:04:35 +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: 1d8c4da381e8 - stable/15 - stdio: Fix positional %wN / %wfN conversion List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d8c4da381e8dd00b83ddc748366595792d9fc8d Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 12:04:35 +0000 Message-Id: <6b003753.4ae0.63ce5b62@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1d8c4da381e8dd00b83ddc748366595792d9fc8d commit 1d8c4da381e8dd00b83ddc748366595792d9fc8d Author: Dag-Erling Smørgrav AuthorDate: 2026-11-15 16:37:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-20 12:03:56 +0000 stdio: Fix positional %wN / %wfN conversion MFC after: 1 week Fixes: bce0bef3c6ab ("libc: Implement N2680.") Fixes: 12b1c1e3fb44 ("libc: Add test cases for N2680.") (cherry picked from commit 5e809bf1c93fdc4c52fa46a7eb0e6f881b6c6140) --- lib/libc/stdio/printf-pos.c | 68 ++++++++++++++++++++++++++++++++++++ lib/libc/tests/stdio/snprintf_test.c | 8 +++++ lib/libc/tests/stdio/swprintf_test.c | 8 +++++ 3 files changed, 84 insertions(+) diff --git a/lib/libc/stdio/printf-pos.c b/lib/libc/stdio/printf-pos.c index 27b59f25b67d..fd92b3d5ad29 100644 --- a/lib/libc/stdio/printf-pos.c +++ b/lib/libc/stdio/printf-pos.c @@ -337,6 +337,40 @@ reswitch: switch (ch) { case 't': flags |= PTRDIFFT; goto rflag; + case 'w': + flags &= ~(CHARINT|SHORTINT|LONGINT|LLONGINT|INTMAXT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= CHARINT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORTINT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LLONGINT; + fmt += 2; + } else { + if (flags & FASTINT) { + flags &= ~FASTINT; + fmt--; + } + goto error; + } + goto rflag; case 'z': flags |= SIZET; goto rflag; @@ -532,6 +566,40 @@ reswitch: switch (ch) { case 't': flags |= PTRDIFFT; goto rflag; + case 'w': + flags &= ~(CHARINT|SHORTINT|LONGINT|LLONGINT|INTMAXT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= CHARINT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORTINT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LLONGINT; + fmt += 2; + } else { + if (flags & FASTINT) { + flags &= ~FASTINT; + fmt--; + } + goto error; + } + goto rflag; case 'z': flags |= SIZET; goto rflag; diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index d5f056b9542d..b805f513c402 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -171,6 +171,10 @@ ATF_TC_BODY(snprintf_wN, tc) SNPRINTF_TEST("wd", "%wd", 0); SNPRINTF_TEST("w1d", "%w1d", 0); SNPRINTF_TEST("w128d", "%w128d", 0); + + SNPRINTF_TEST(" 1", "%1$*2$w16d", (int16_t)1, 2); + SNPRINTF_TEST(" 1", "%1$*2$w32d", (int32_t)1, 2); + SNPRINTF_TEST(" 1", "%1$*2$w64d", (int64_t)1, 2); } ATF_TC_WITHOUT_HEAD(snprintf_wfN); @@ -203,6 +207,10 @@ ATF_TC_BODY(snprintf_wfN, tc) SNPRINTF_TEST("wfd", "%wfd", 0); SNPRINTF_TEST("wf1d", "%wf1d", 0); SNPRINTF_TEST("wf128d", "%wf128d", 0); + + SNPRINTF_TEST(" 1", "%1$*2$w16d", (int_fast16_t)1, 2); + SNPRINTF_TEST(" 1", "%1$*2$w32d", (int_fast32_t)1, 2); + SNPRINTF_TEST(" 1", "%1$*2$w64d", (int_fast64_t)1, 2); } ATF_TP_ADD_TCS(tp) diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c index 5d9c60fb9ee7..6f3d56657f4c 100644 --- a/lib/libc/tests/stdio/swprintf_test.c +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -172,6 +172,10 @@ ATF_TC_BODY(swprintf_wN, tc) SWPRINTF_TEST("wd", "%wd", 0); SWPRINTF_TEST("w1d", "%w1d", 0); SWPRINTF_TEST("w128d", "%w128d", 0); + + SWPRINTF_TEST(" 1", "%1$*2$w16d", (int16_t)1, 2); + SWPRINTF_TEST(" 1", "%1$*2$w32d", (int32_t)1, 2); + SWPRINTF_TEST(" 1", "%1$*2$w64d", (int64_t)1, 2); } ATF_TC_WITHOUT_HEAD(swprintf_wfN); @@ -204,6 +208,10 @@ ATF_TC_BODY(swprintf_wfN, tc) SWPRINTF_TEST("wfd", "%wfd", 0); SWPRINTF_TEST("wf1d", "%wf1d", 0); SWPRINTF_TEST("wf128d", "%wf128d", 0); + + SWPRINTF_TEST(" 1", "%1$*2$w16d", (int_fast16_t)1, 2); + SWPRINTF_TEST(" 1", "%1$*2$w32d", (int_fast32_t)1, 2); + SWPRINTF_TEST(" 1", "%1$*2$w64d", (int_fast64_t)1, 2); } ATF_TP_ADD_TCS(tp)