From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 55167374733 for ; Sun, 8 Mar 2026 11:38:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969883; cv=none; b=Q6JtUm1zAWDSkimrmxy5X/ig6bLMa8viC7+vs2V66qT+y80c9HmZHnI77CGxJRSXdYwIPAmvpSB9x3A0jLPo7ECI8o6RHTYILUwS+kofRpZ6CtAKvk6cXOIzr/naSkIoaoLhtjzk10t9Tt0ygmfZX8S/X3eWR36S5exSelK94FQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969883; c=relaxed/simple; bh=rzMQwR9rp40fDHuR59lC/aHZD8yao456I6VbfsO4Tl0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YnJSe56MBaDI4x70J17z/r0jlEdM1bB+Vg3MydfLM9m/m1rWF+Qtkz3bF5Q0+Gduv4lPe/9SYrwijUUa390PhhzWNC9nJc2WB3LEvVKELZ5ZDZmIOFguLW2WRim63EHuMXHg/kRA1iRipocOdsBUKJyuGogVEeeqOT1abrvQlNg= 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=CN1hmfij; arc=none smtp.client-ip=209.85.128.50 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="CN1hmfij" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4853aec185aso532025e9.1 for ; Sun, 08 Mar 2026 04:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772969880; x=1773574680; 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=1ZwkrmbppLeWWqEUnrh/KzJg2rgy/xfAqoFTtZYOv+g=; b=CN1hmfijfnULgUgPsyC+4N8c7ySsTpl0vNvaH8Js6LDXBoCa+R0MuFpBBPNS/2BqU3 F8ZCWz1FlrN7J6yyKl4ocW5pAiEYWqRM2o7Y6SAdTGsiASuKxoRGc7P0gS1ySzucMMhY p/Dpw03PE3/28zwoDbD6q477eSf8gMSFiO453KjUdfGRIIxE01r0mYTII9SbtHyZRFd2 bTAjwY225khygAJcQ+GsekbVScBw/vUhn6dpbVAvVMzXl+rn6TsCKT/VZqqBc575KRsS 7/3DdcdJ+JGzV7bHl9m9VJ20N5/e0yYLyd0yFCvQsGS+oJEGYp4E/f3xweJimZiCrmzM pYng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772969880; x=1773574680; 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=1ZwkrmbppLeWWqEUnrh/KzJg2rgy/xfAqoFTtZYOv+g=; b=aSGZnd5XQRVdNtmToB8GQqxUZ56+RIyY4hnYH+XSUNZFNpzWHFuRnZX/iIgKzxaMgO 2OrD3fOr1tIPMgPxWr4FppJUowMeXKcLCjWu9tOncA1vAh7bA0LZJXxzVDRZwn4V40ho +9lmKzBcnVHCLR16Wm7RjquwDPznb/AYpdj6r0ijYtLB8auebeJr9WSW2MG4WZ3jLDfv 5Z9GitcCbqhjy7vnT5+GOsG8b/rBExaOG6LEVT9UC3ko+dnRXYLisjCFIZ1wBl69j/4R 1gaItmiz1S2p4KUGwdS50mqF/P29gHXcYGykUo58oQcQmGz/BvXB7/5RVkT/inxPOtN/ hPEA== X-Forwarded-Encrypted: i=1; AJvYcCUarxs+F8cMdyYs9/ylGI6sDWA5Mrk8ahOm45vToXPKRUTMKa0GwsliYeOxHtPV/txpge/9DdrPNL/edVw=@vger.kernel.org X-Gm-Message-State: AOJu0YxQWBtdLNSUjCHwuS6ffoRgli7ib0JHEDi+vd+uNjlsHjk74bvq JuiDZdd2yHHP+/++C5foIy1pCixrT0h3ggKXuvXiIzNHtqxFpxE3sA/5 X-Gm-Gg: ATEYQzzLiAngxOdKw/n1vqdPvpkEqeRor0sgRboBV8+3alWNcVIR/IIHU6XtlP9nfll s0hheY1H7MW3aQv839MG70NswMRhQftgngSC0KULhF5T3UsfKxZTiAsu6uS83WJH3Ao+bfSLDWZ sTnXraut1npbHlz/iSU+lurKD1G4sn9C/am112GxoztFQN+TICDv0eYatjOCuBMATVpZI8LLoVA m79+hg4Hyw9XzkMwypHO+XOpBzv/maNJl+agW7kdJI2SyQmnfTrsWJ5T6LxEqm06TvbqmW+BXhq 1YyHDr3FrHkHLcBcb96UcFbtQ239E3zeI8UcNDCANUE12f/8YiKfcaXB+qUHfEpb7kq7TGw7ROe Wdmv8W1TIbKMd8erjF3oTEGcmJCBSSv6UGE7f4Bt7f5VfJJA60bxG7gw8AyoZBsXozuO/hWE1I1 OnwHEYzCkeZmWpMSy4u/xCW4Nkzm2xuGZgKX96hLH2AbmtykbwqBB1snLPPOoFVMEbElsQQn4cn AuDHGF/iDpK X-Received: by 2002:a05:600c:8b27:b0:483:abeb:7a5c with SMTP id 5b1f17b1804b1-48526923bfdmr130429805e9.12.1772969879541; Sun, 08 Mar 2026 04:37:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Mar 2026 04:37:59 -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 16/17] tools/nolibc/printf: Add support for octal output Date: Sun, 8 Mar 2026 11:37:41 +0000 Message-Id: <20260308113742.12649-17-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 Octal output isn't often used, but adding it costs very little. Supporting "%#o" is mildly annoying, it has to add a leading '0' if there isn't one present. In simple cases this is the same as adding a sign of '0' - but that adds an extra '0' in a few places. So you need 3 tests, %o, # and no leading '0' (which can only be checked after the zero pad for precision). If all the test are deferred until after zero padding then too many values are 'live' across the call to _nolibc_u64toa_base() and get spilled to stack. Hence the check that ignores the 'sign' if it is the same as the first character of the output string. Add tests for octal output. Acked-by: Willy Tarreau Signed-off-by: David Laight --- Unchanged for v5. v4: - Increase VFPRINTF_LEN to 25 to that 64bit octal output isn't truncated. Change truncation tests to match. (Was done earlier in v3.) New patch for v3. Relies on the changes to u64toa_r() etc in stdlib.h (patch 2). tools/include/nolibc/stdio.h | 50 ++++++++++++++------ tools/testing/selftests/nolibc/nolibc-test.c | 9 ++-- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h index 3b2a5613f603..10c48b88fcbe 100644 --- a/tools/include/nolibc/stdio.h +++ b/tools/include/nolibc/stdio.h @@ -292,7 +292,7 @@ int fseek(FILE *stream, long offset, int whence) /* printf(). Supports most of the normal integer and string formats. - * - %[#0-+ ][width|*[.precision|*}][{l,t,z,ll,L,j,q}]{c,d,i,u,x,X,p,s,m,%} + * - %[#0-+ ][width|*[.precision|*}][{l,t,z,ll,L,j,q}]{c,d,i,u,o,x,X,p,s,m,%} * - %% generates a single % * - %m outputs strerror(errno). * - %X outputs a..f the same as %x. @@ -426,7 +426,7 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list */ 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')) { + _NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'c', 'd', 'i', 'u', 'o', 'x', 'p', 's')) { /* 'long' is needed for pointer/string conversions and ltz lengths. * A single test can be used provided 'p' (the same bit as '0') * is masked from flags. @@ -479,12 +479,19 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list } else if (_NOLIBC_PF_FLAGS_CONTAIN(flags, ' ')) { sign_prefix = ' '; } + } else { + /* "#o" requires that the output always starts with a '0'. + * This needs another check after any zero padding to avoid + * adding an extra leading '0'. + */ + if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'o') && + _NOLIBC_PF_FLAGS_CONTAIN(ch_flag, '#' - 1)) + sign_prefix = '0'; } /* The value is converted offset into the buffer so that * 31 zero pad characters and the sign/prefix can be added in front. - * The longest digit string is 22 + 1 for octal conversions, the - * space is reserved even though octal isn't currently supported. + * The longest digit string is 22 + 1 for octal conversions. */ out = outbuf + 2 + 31; @@ -497,7 +504,7 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list goto do_output; } if (!precision) { - /* Explicit %nn.0d, no digits output */ + /* Explicit %nn.0d, no digits output (except for %#.0o) */ len = 0; goto prepend_sign; } @@ -506,17 +513,23 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list len = 1; } else { /* Convert the number to ascii in the required base. */ + unsigned long long recip; + unsigned int base; if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'i', 'u')) { - /* Base 10 */ - len = u64toa_r(v, out); + base = 10; + recip = _NOLIBC_U64TOA_RECIP(10); + } else if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'o')) { + base = 8; + recip = _NOLIBC_U64TOA_RECIP(8); } else { - /* Base 16 */ + base = 16; + recip = _NOLIBC_U64TOA_RECIP(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 = _nolibc_u64toa_base(v, out, base, recip); } /* Add zero padding */ @@ -547,13 +560,20 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list } } + /* %#o has set sign_prefix to '0', but we don't want so add an extra + * leading zero here. + * Since the only other byte values of sign_prefix are ' ', '+' and '-' + * it is enough to check that out[] doesn't already start with sign_prefix. + */ + if (sign_prefix != *out) { prepend_sign: - /* Add the 0, 1 or 2 ("0x") sign/prefix characters at the front. */ - for (; sign_prefix; sign_prefix >>= 8) { - /* Force gcc to increment len inside the loop. */ - _NOLIBC_OPTIMIZER_HIDE_VAR(len); - len++; - *--out = sign_prefix; + /* Add the 0, 1 or 2 ("0x") sign/prefix characters at the front. */ + for (; sign_prefix; sign_prefix >>= 8) { + /* Force gcc to increment len inside the loop. */ + _NOLIBC_OPTIMIZER_HIDE_VAR(len); + len++; + *--out = sign_prefix; + } } outstr = out; goto do_output; diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 7398827fa08b..ebeb7245005c 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -1663,7 +1663,7 @@ int run_stdlib(int min, int max) #define EXPECT_VFPRINTF(cond, expected, fmt, ...) \ do { if (!(cond)) result(llen, SKIPPED); else ret += expect_vfprintf(llen, expected, fmt, ##__VA_ARGS__); } while (0) -#define VFPRINTF_LEN 20 +#define VFPRINTF_LEN 25 static int expect_vfprintf(int llen, const char *expected, const char *fmt, ...) { char buf[VFPRINTF_LEN + 80]; @@ -1831,6 +1831,9 @@ static int run_printf(int min, int max) 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|d| e|", "|%c|%.0c|%4c|", 'c', 'd', 'e'); break; + CASE_TEST(octal); EXPECT_VFPRINTF(1, "|17| 0033||", "|%o|%6.4o|%.0o|", 017, 033, 0); break; + CASE_TEST(octal_max); EXPECT_VFPRINTF(1, "1777777777777777777777", "%llo", ~0ULL); break; + CASE_TEST(octal_alt); EXPECT_VFPRINTF(1, "|0|01|02|034|0|", "|%#o|%#o|%#02o|%#02o|%#.0o|", 0, 1, 2, 034, 0); 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; @@ -1845,13 +1848,13 @@ static int run_printf(int min, int max) 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(truncation); EXPECT_VFPRINTF(1, "012345678901234567890123456789", "%s", "012345678901234567890123456789"); break; CASE_TEST(string_width); EXPECT_VFPRINTF(1, " 1", "%10s", "1"); break; CASE_TEST(string_trunc); EXPECT_VFPRINTF(1, " 12345", "%10.5s", "1234567890"); break; CASE_TEST(number_width); EXPECT_VFPRINTF(1, " 1", "%10d", 1); break; CASE_TEST(number_left); EXPECT_VFPRINTF(1, "|-5 |", "|%-8d|", -5); break; CASE_TEST(string_align); EXPECT_VFPRINTF(1, "|foo |", "|%-8s|", "foo"); break; - CASE_TEST(width_trunc); EXPECT_VFPRINTF(1, " 1", "%25d", 1); break; + CASE_TEST(width_trunc); EXPECT_VFPRINTF(1, " 1", "%30d", 1); break; CASE_TEST(width_tr_lft); EXPECT_VFPRINTF(1, "1 ", "%-30d", 1); break; CASE_TEST(number_pad); EXPECT_VFPRINTF(1, "0000000005", "%010d", 5); break; CASE_TEST(number_pad); EXPECT_VFPRINTF(1, "|0000000005|0x1234|", "|%010d|%#01x|", 5, 0x1234); break; -- 2.39.5