From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CB9236F42D for ; Sun, 8 Mar 2026 11:37:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969879; cv=none; b=XWFOaJhS2OiG5X+rQu7/DqNpc2HSaZktyIXbyYyL6cKrlcK6Knsx7Ay5yOBVY9QLH+HmIzp9JSrF23yGNXn8EuLiHlUr/YMWA4qHKTrzH8179fv0ZgU/f2mQjLUs3CREOm1ggKZoeei4L6sgs7hiqCMUjPYFJJZX4UC+psc7s1s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969879; c=relaxed/simple; bh=KyuJ3dWnfj3RgRZ6sf9fKPO4K68KJWCYW+Byf4qltIY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XIt+dr89A+BS3dXAZz3pcd/+H230tNn8xMVg+LjlL1urpM5Z6Dt++RhVvuEl/na/CeGrkbP8NAtkgxptrFJfJpCa3Nuwd0AAj8KIstmyBVwHZ6+7CimuBV3CnJs+uo/uWcH65yzC5r9zy29LKupv0mb8W1aYdlC3bJt+ZWIvBaA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=N98KkXkA; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N98KkXkA" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-480706554beso118567175e9.1 for ; Sun, 08 Mar 2026 04:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772969876; x=1773574676; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Uvdn2bDxR04dT2S2AcDdcV/ROWnGvI/QubES48OT7eE=; b=N98KkXkACetxvmowpqILHXGY8qqDb1u5TVjNW1svasP0ccCHN4meEZKlx+pZvHiBLs oFE6eSHVc7fX/l2lajaNaWjvONbjlIk+BWFMyPIZ71U2UQm5uDYB//EMKySD+n2115ow /PjEfmY1+cq7r2weCEAT+cVzXJ3pJ+smrhedwL2nq1mKTwHKW5SZQTTzYGWj+74zTt8A gO/tVShSuihWmfPB9xTZ5+P2y+/mlKRix5zripxa5LxrPE69GDj6//s5akQKLjIJR51/ jq7lVRXe7QlNBvckbH85mzgku036uFKk3/86D6Mp4G36ADtFu6+w8Su2/kbxpFUMpCLN TaRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772969876; x=1773574676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Uvdn2bDxR04dT2S2AcDdcV/ROWnGvI/QubES48OT7eE=; b=KnFN9YYozvKwV0Y0WZfGXC/JVp38svqa3REYnQfE9hVLkUC0iWSgIIrs4BvVmtcUIb HQE+gCU+YyJii9vZQWIpQgrL98NYwo6ecDl1EE3rSgIbeRDXGsdgpiZTyr5lRDKdAySk 2+FsR5rCxKwGsn0Q+yjWintoaf76qQUBddXGk2FqxGFJxl20sjpJivviZJMwpz8YCYLi DW1ElUqU4wce52hvRxshNZ+0SuenduBoTaWudfg+v5pH9+r6qavrNDYA3gJEwFX60J8k krJYVAruvj6OBNJTtJfjjEbsA6X/L7jrqTq7sI1xbuMkh0oA7dHeKxL5edTz3SWi7uSJ wWdA== X-Forwarded-Encrypted: i=1; AJvYcCUoZeJaab2l0GK0PjMUn3kdfRk6JpGJYUZjpxqqKda5Vssbu6EuSDFaABALEnIsc1Ioys8mAg/dbHXi5Ng=@vger.kernel.org X-Gm-Message-State: AOJu0Yw901s+jRKxqBwCk9LWPqdC1+8N+3a2EY2psP3LtVWjcQlCz6jB s66ln0ZDCQ/OMQOS8m90rKsfUrTGwaRcIsdQE+Q6oJN3YpZXyBR6dxffEqnFO3nV X-Gm-Gg: ATEYQzyCIgSJo7AOtjxejjn478I3e7Jo3h8DdtNTT3sm/je4iuYRNjJAHW3nHOHI+NE AXBwtIxdJ9VdKxvDv0GAA5cBplxL//Zr+B/uqFkscz36p3GwVxR57Z9R59akmCDcSuUQ3H2n42L doUZvB+9Ki2DsCLFPv2YOC6TgeA13p4zC54h8YOcp5GX4mUjH9yxUpkvyKzSfPZHdT5PBtPg348 JHoguxdvvZYfZplsG7TqJwu+LonpwVK9ZvEy/ARYulSGPxYEdmJq81DJxbdu5MjfQozB/VMqQQ4 YdttQXJndLb+oatVkKAKaRx1Fv/YMVJ57wH867I2QCtO0XtZpLeq4jkr1j3Dp5oItfxAaSILyRs eJ+ENO8ynw9IB/cKohu2WDRZE9yxizx0QQ9Q6UC6UJdgSjToTk0K06wVx5ZtGSPXq4vizNwiG0m +9B0cOwOiTwgRn2lmGos/AMGsnw2D0w+BfxrgC2jtMU6bwh3rbLlhqSYVh2K/+8oTevr3U4RQi+ GiktrhuWVCa7ZAOOIb5jT4= X-Received: by 2002:a05:600c:6085:b0:483:71f7:2797 with SMTP id 5b1f17b1804b1-48526930d9dmr132717785e9.14.1772969875775; Sun, 08 Mar 2026 04:37:55 -0700 (PDT) Received: from snowdrop.snailnet.com (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485237dd017sm63621855e9.2.2026.03.08.04.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Mar 2026 04:37:55 -0700 (PDT) From: david.laight.linux@gmail.com To: Willy Tarreau , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , linux-kernel@vger.kernel.org, Cheng Li Cc: David Laight Subject: [PATCH v5 next 09/17] tools/nolibc/printf: Add support for length modifiers tzqL and formats iX Date: Sun, 8 Mar 2026 11:37:34 +0000 Message-Id: <20260308113742.12649-10-david.laight.linux@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260308113742.12649-1-david.laight.linux@gmail.com> References: <20260308113742.12649-1-david.laight.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: David Laight Length modifiers t (ptrdiff_t) and z (size_t) are aliases for l (long), q and L are 64bit the same as j (intmax). Format i is an alias for d and X similar to x but uppper case. Supporting them is mostly just adding the relavant bit to the bit pattern used for maching characters. Although %X is detected the output will be lower case. Change/add tests to use conversions i and X, and length modifiers L and ll. Use the correct minimum value for "%Li". Acked-by: Willy Tarreau Signed-off-by: David Laight --- Unchanged for v5. v4: Split from the previous patch. tools/include/nolibc/stdio.h | 27 ++++++++++++-------- tools/testing/selftests/nolibc/nolibc-test.c | 14 +++++++--- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h index 1c2b2cf9a1f3..09ea2e0c392f 100644 --- a/tools/include/nolibc/stdio.h +++ b/tools/include/nolibc/stdio.h @@ -291,10 +291,11 @@ int fseek(FILE *stream, long offset, int whence) } -/* printf(). Supports the following integer and string formats. - * - %[#-+ 0][width][{l,ll,j}]{c,d,u,x,p,s,m,%} +/* printf(). Supports most of the normal integer and string formats. + * - %[#-+ 0][width][{l,t,z,ll,L,j,q}]{c,d,i,u,x,X,p,s,m,%} * - %% generates a single % * - %m outputs strerror(errno). + * - %X outputs a..f the same as %x. * - The modifiers [#-+ 0] are currently ignored. * - No support for precision or variable widths. * - No support for floating point or wide characters. @@ -386,9 +387,11 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list /* Length modifier. * They miss the conversion flags characters " #+-0" so can go into flags. - * Change ll to j (both always 64bits). + * Change both L and ll to j (all alwys 64bit). */ - ch_flag = _NOLIBC_PF_CHAR_IS_ONE_OF(ch, 'l', 'j'); + if (ch == 'L') + ch = 'j'; + ch_flag = _NOLIBC_PF_CHAR_IS_ONE_OF(ch, 'l', 't', 'z', 'j', 'q'); if (ch_flag != 0) { if (ch == 'l' && fmt[0] == 'l') { fmt++; @@ -403,20 +406,22 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list /* Numeric and pointer conversion specifiers. * * Use an explicit bound check (rather than _NOLIBC_PF_CHAR_IS_ONE_OF()) - * so ch_flag can be used later. + * so that 'X' can be allowed through. + * 'X' gets treated and 'x' because _NOLIBC_PF_FLAG() returns the same + * value for both. */ ch_flag = _NOLIBC_PF_FLAG(ch); - if ((ch >= 'a' && ch <= 'z') && - _NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'c', 'd', 'u', 'x', 'p')) { + if (((ch >= 'a' && ch <= 'z') || ch == 'X') && + _NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'c', 'd', 'i', 'u', 'x', 'p')) { /* 'long' is needed for pointer conversions and ltz lengths. * A single test can be used provided 'p' (the same bit as '0') * is masked from flags. */ if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag | (flags & ~_NOLIBC_PF_FLAG('p')), - 'p', 'l')) { + 'p', 'l', 't', 'z')) { v = va_arg(args, unsigned long); signed_v = (long)v; - } else if (_NOLIBC_PF_FLAGS_CONTAIN(flags, 'j')) { + } else if (_NOLIBC_PF_FLAGS_CONTAIN(flags, 'j', 'q')) { v = va_arg(args, unsigned long long); signed_v = v; } else { @@ -434,7 +439,7 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list out = outbuf; - if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd')) { + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'i')) { /* "%d" and "%i" - signed decimal numbers. */ if (signed_v < 0) { *out++ = '-'; @@ -444,7 +449,7 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list } /* Convert the number to ascii in the required base. */ - if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'u')) { + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'i', 'u')) { /* Base 10 */ u64toa_r(v, out); } else { diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 638f18fc5123..a140c54e4d72 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -1826,11 +1826,19 @@ static int run_printf(int min, int max) CASE_TEST(number); EXPECT_VFPRINTF(1, "1234", "%d", 1234); break; CASE_TEST(negnumber); EXPECT_VFPRINTF(1, "-1234", "%d", -1234); break; CASE_TEST(unsigned); EXPECT_VFPRINTF(1, "12345", "%u", 12345); break; + CASE_TEST(signed_max); EXPECT_VFPRINTF(1, "2147483647", "%i", ~0u >> 1); break; + CASE_TEST(signed_min); EXPECT_VFPRINTF(1, "-2147483648", "%i", (~0u >> 1) + 1); break; + CASE_TEST(unsigned_max); EXPECT_VFPRINTF(1, "4294967295", "%u", ~0u); break; CASE_TEST(char); EXPECT_VFPRINTF(1, "c", "%c", 'c'); break; - CASE_TEST(hex); EXPECT_VFPRINTF(1, "f", "%x", 0xf); break; + CASE_TEST(hex_nolibc); EXPECT_VFPRINTF(is_nolibc, "|f|d|", "|%x|%X|", 0xf, 0xd); break; + CASE_TEST(hex_libc); EXPECT_VFPRINTF(!is_nolibc, "|f|D|", "|%x|%X|", 0xf, 0xd); break; CASE_TEST(pointer); EXPECT_VFPRINTF(1, "0x1", "%p", (void *) 0x1); break; - CASE_TEST(uintmax_t); EXPECT_VFPRINTF(1, "18446744073709551615", "%ju", 0xffffffffffffffffULL); break; - CASE_TEST(intmax_t); EXPECT_VFPRINTF(1, "-9223372036854775807", "%jd", 0x8000000000000001LL); break; + CASE_TEST(percent); EXPECT_VFPRINTF(1, "a%d42%69%", "a%%d%d%%%d%%", 42, 69); break; + CASE_TEST(perc_qual); EXPECT_VFPRINTF(1, "a%d2", "a%-14l%d%d", 2); break; + CASE_TEST(invalid); EXPECT_VFPRINTF(1, "a%12yx3%y42%P", "a%12yx%d%y%d%P", 3, 42); break; + CASE_TEST(intmax_max); EXPECT_VFPRINTF(1, "9223372036854775807", "%lld", ~0ULL >> 1); break; + CASE_TEST(intmax_min); EXPECT_VFPRINTF(1, "-9223372036854775808", "%Li", (~0ULL >> 1) + 1); break; + CASE_TEST(uintmax_max); EXPECT_VFPRINTF(1, "18446744073709551615", "%ju", ~0ULL); break; CASE_TEST(truncation); EXPECT_VFPRINTF(1, "0123456789012345678901234", "%s", "0123456789012345678901234"); break; CASE_TEST(string_width); EXPECT_VFPRINTF(1, " 1", "%10s", "1"); break; CASE_TEST(number_width); EXPECT_VFPRINTF(1, " 1", "%10d", 1); break; -- 2.39.5