From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 81C91372691 for ; Sun, 8 Mar 2026 11:37:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969881; cv=none; b=biHfKtbTbmyVR++HcXwFk285jKXzQK2CN4UZLpjPapK1/tVBZUV09FiBWER9XdQD1Wut6vebVY+VE+4B+XAU7kcT5Qd3k4MonKuWcCPkbsvxd9vVGGbCaMAMMlWpkFJgaW3dq9qgyLyiWn34wzu1IY3J7qYx83HDRGAdTr0K4Ck= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969881; c=relaxed/simple; bh=qsEWONNMvZqKT1OWGy+42jBCKjkqW+g3qyrUYgUN/XU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=F2kWtOKeg33tJas4i/61Ztu4ew3b1XwTjg9NliT/N+WQrc4i6OUy5ueY+KgtXt9xYhTe7VgPhmGnfwt7hvHx5HV0AcZWnioBzKA92B0WOZ6R+YNyOyS64tHALFsMNl47gkrgVi/bL/wlJhDBdhxUyIbWi+7LjfwOlhuMT5LEB1Q= 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=FaoGafKR; arc=none smtp.client-ip=209.85.128.43 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="FaoGafKR" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so9324855e9.2 for ; Sun, 08 Mar 2026 04:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772969878; x=1773574678; 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=1zVJsivfApwL/Jqd/aaXYkOzxin8n7iYCbtQ+ZZBqRE=; b=FaoGafKRcjTFiGKrQbAlDnUx9iGY36Sp10/cW114qkMd7lJe5DgfeVskaaKljJw4aP 0e1k2gwa9hhUVloj9Mjikd5IPpNvoVzmXtCTTusD7Lw7N8BLP36QKDkyBQhNsBBQpdSP mp5xPXZKJNf1ddxbMtKtfTS2dWYur2YUpFeSQZMgybkq3Ztt6BUJVRPUI/pcyBMLjzr2 3hlXE4Kavb3LoUywOY+S6vzEekl2uBCw5qhB2vZRiWyxI1YS6b+INo3GAtXjL4TMR0kz iaUJ9Ln2NSxik0EgjH3stu4YAtC0zjc1/KbkpGXiokpC6hmjgbO1rnklIC+mQ10AtyAF yJuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772969878; x=1773574678; 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=1zVJsivfApwL/Jqd/aaXYkOzxin8n7iYCbtQ+ZZBqRE=; b=Fr8xmynxquvKE+NFKI+RTRhzuiM/W3p3FN97tW3zuZKjb/pDwqxs4G43clP2q7Vn3P vOKNHKMCc3uO0wqsS7Tgotbl2Qf/gNFfs9uAhdcErpyGRYrx12TCWuGe4Txq3+GHEMg9 tzVWuqKGSQHfXg1SEOoq3EUDT9qt0KiRPNMx/z7uaM+3uVc5v5tbINS1X2327ixb+d7+ 3P16WRJZE8m+ybB5QHbzNa58h9SCPwgZFdVQKRICG6bjrehFcPev8ia2BHhoy0to/PPy csuPaCe9E/wrPPx66Jl54ig8Ih0PgaDGetaUFq+8HwBBE014TJQpiJxELqN5FLKUjavY Cv9A== X-Forwarded-Encrypted: i=1; AJvYcCXJqSzymTn/skjTnmqSI94p+v1+yj83hc52T0XazS6RXAZoiR8PONHhkkCFNyucGTjEKJiwCOnQiV+9sHI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxch9rsMYH4Om69BJmmKHBvBev/7+u4/wWHLXP40k/AztgnIuQR TqzIsi9N3IpsnRFRNxDkoBzqRf+A9t4NEjmmcPlbVfoF6gVtOm1bE9ylHMndFu89 X-Gm-Gg: ATEYQzwbF6e9gK3LeivHjvSYJ30wAA/3SEaVQknrbSqCckH3IrjXCIFaoie0LthuttX MlUcWl4LYkfdaT5FCkIOP0mESnxXr1NESV4FV+adsitzDRnL8XOFel9wncu/j895RihT68RzbI1 maV/CvFH7POqRoq4frKPU7BQUztf7tNCGhJfNhtc4a+MeY4jrBCgTYRViqq0fjK+ndAtP5nC/H/ hZEItOQ+5kkMqyGIcOZLDFm0gyMvWiBHDQBSwQuDWJXgdnzHz8q8C/NmH3U37nYOeuUkhPyl0iH lDgo0TEWZdujgokU88GyG75ZETutdCT9LUUmPl4qMw9W1dzVYlfBTEBNNOydbsQ9mBDbz+1zzQ5 Qwnj7QARjrawpjYi5cbLytWL/gIy/m1Ett3Ovf+998uNruA6ROJODyKnlfKM+eEQ0FhwEch5XO4 WUfSqzBXPi7vp2wTE90XAPzA5qEs5LFdusLpbsLkCwls5F73fVRXLae5L3Fv6s0rpuGVHuF8JWo LIzLaysctMD X-Received: by 2002:a05:600d:644e:10b0:485:2af3:3f82 with SMTP id 5b1f17b1804b1-4852af3405fmr74865435e9.7.1772969877861; Sun, 08 Mar 2026 04:37:57 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Mar 2026 04:37:57 -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 13/17] tools/nolibc/printf: Special case 0 and add support for %#x Date: Sun, 8 Mar 2026 11:37:38 +0000 Message-Id: <20260308113742.12649-14-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 The output for %#x is almost the same as that for %p, both output in hexadecimal with a leading "0x". However for zero %#x should just output "0" (the same as decimal and ocal). For %p match glibc and output "(nil)" rather than "0x0" or "0". Add tests for "%#x", "% d", "%+d" and passing NULL to "%p". Acked-by: Willy Tarreau Signed-off-by: David Laight --- Unchanged for v5. v4: Split into its' own patch. tools/include/nolibc/stdio.h | 38 ++++++++++++++------ tools/testing/selftests/nolibc/nolibc-test.c | 3 ++ 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h index 8b003a9bd268..4bb4d08d834e 100644 --- a/tools/include/nolibc/stdio.h +++ b/tools/include/nolibc/stdio.h @@ -296,7 +296,7 @@ int fseek(FILE *stream, long offset, int whence) * - %% generates a single % * - %m outputs strerror(errno). * - %X outputs a..f the same as %x. - * - The modifiers [#-0] are currently ignored. + * - The modifiers [-0] are currently ignored. * - No support for precision or variable widths. * - No support for floating point or wide characters. * - Invalid formats are copied to the output buffer. @@ -410,8 +410,11 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list * so that 'X' can be allowed through. * 'X' gets treated and 'x' because _NOLIBC_PF_FLAG() returns the same * value for both. + * + * We need to check for "%p" or "%#x" later, merging here gives better code. + * But '#' collides with 'c' so shift right. */ - ch_flag = _NOLIBC_PF_FLAG(ch); + ch_flag = _NOLIBC_PF_FLAG(ch) | (flags & _NOLIBC_PF_FLAG('#')) >> 1; if (((ch >= 'a' && ch <= 'z') || ch == 'X') && _NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'c', 'd', 'i', 'u', 'x', 'p', 's')) { /* 'long' is needed for pointer/string conversions and ltz lengths. @@ -472,17 +475,30 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list */ out = outbuf + 2; - /* Convert the number to ascii in the required base. */ - if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'i', 'u')) { - /* Base 10 */ - len = u64toa_r(v, out); - } else { - /* Base 16 */ + if (v == 0) { + /* There are special rules for zero. */ if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'p')) { - /* "%p" needs "0x" prepending. */ - sign_prefix = '0' << 8 | 'x'; + /* "%p" match glibc, precision is ignored */ + outstr = "(nil)"; + len = 5; + goto do_output; + } + /* All other formats (including "%#x") just output "0". */ + out[0] = '0'; + len = 1; + } else { + /* Convert the number to ascii in the required base. */ + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'i', 'u')) { + /* Base 10 */ + len = u64toa_r(v, out); + } else { + /* Base 16 */ + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'p', '#' - 1)) { + /* "%p" and "%#x" need "0x" prepending. */ + sign_prefix = '0' << 8 | 'x'; + } + len = u64toh_r(v, out); } - len = u64toh_r(v, out); } /* Add the 0, 1 or 2 ("0x") sign/prefix characters at the front. */ diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index a140c54e4d72..4267c69ec37c 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -1825,6 +1825,7 @@ static int run_printf(int min, int max) CASE_TEST(string); EXPECT_VFPRINTF(1, "foo", "%s", "foo"); break; CASE_TEST(number); EXPECT_VFPRINTF(1, "1234", "%d", 1234); break; CASE_TEST(negnumber); EXPECT_VFPRINTF(1, "-1234", "%d", -1234); break; + CASE_TEST(num_sign); EXPECT_VFPRINTF(1, "| 1|+2|+3|+4|5|", "|% d|%+d|% +d|%+ d|%#d|", 1, 2, 3, 4, 5); 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; @@ -1832,7 +1833,9 @@ static int run_printf(int min, int max) CASE_TEST(char); EXPECT_VFPRINTF(1, "c", "%c", 'c'); 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(hex_alt); EXPECT_VFPRINTF(1, "|0x1| 0x2| 0|", "|%#x|%#5x|%#5x|", 1, 2, 0); break; CASE_TEST(pointer); EXPECT_VFPRINTF(1, "0x1", "%p", (void *) 0x1); break; + CASE_TEST(pointer_NULL); EXPECT_VFPRINTF(1, "(nil)", "%p", (void *)0); 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; -- 2.39.5