From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 2171C372B55 for ; Sun, 8 Mar 2026 11:38:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969881; cv=none; b=R8vI0TKa/G2GTDQoDKn0hyY/uGywU4/bxDFN/WBMLJzsxN1FWte5EppIlJNpPcBgcVKsro4xwm+GlLehW6tW4PVAt2fjzA7Z9Zis+UoaJSvv+TR28C4VC44rkFvUThlcEbzbKchoIm6flIYeZ7MhW3xVne4KgCWaCM48SEUV7Cg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969881; c=relaxed/simple; bh=k30EcAPsqOQ7YyGnLrLWTEpHtNLKbAjEHMJ5VI9D6hI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZNHKBVPVrfPak6UADo+Lu1nZQ30aTLeV2odGHUZILgFbs//gixSoLRSdCcGcp+rCbclJV/QWZJIHlIULqpf16WO1Svs6Wpx+iQTXrFrd2cM1VQhqJ2Tv8rZVr9E7yJEc4/LRwiQZAniFOu9eCO0KYZGQjFUQid3OC2SSzqFPgxQ= 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=FxyNGdEp; arc=none smtp.client-ip=209.85.128.46 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="FxyNGdEp" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-48374014a77so127684665e9.3 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=EeouF7RE8WbLplU0H/YiLqlmPfzJu6B4+hEQMjYnszc=; b=FxyNGdEpT3ZXpqewooPw3eOqRaNDVbtNloylnaKb25dig8YjC9Bpq43ejiwgBF9rSR dCCqZr7jMlVgbqgzVnDGnQ61o6VQw9KFYG32HC2MYJwIUR57UeKkW/m8LASC1I/vzQFg Tvtb0v6/ZpZvcVucPkzKksLjTrVKCxWcLJL/t2Tikl7HJo8BpPEnJU2O7gZ8JVtjFGjb surdeFAjbCVBoCnbDuMu5eO1sEWE/uGG8mvsTtp5NHNevFDtb4nFORFTk+H7+66+XAMB 6LgcVdaoPvTyMDqlkDZQFudcWJjPfIj9S28hT6zKdedb4e/Ua3eR5gcxDXYVwsncbBiv Kbzw== 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=EeouF7RE8WbLplU0H/YiLqlmPfzJu6B4+hEQMjYnszc=; b=Di+8FKWK2JTeOswsiHquO0HA3o7zAyw9xK7xT0V4v1jc38Qp+1OzxkLVtLZElq0Qpc uAA88I7013eyYyPr9y5O07bhseY1IaKJyvCgSmQkdP5bvDnTnf3VZBrfl9YyAcyDIlty e3SSdiZSkt0q7Uw0nJwBlGVjUv3mAgFObnIHXzVJATzIVelDuxRd1WnDmAA6zmR2+yDP nZfieGK3gk9KT127P0xdGNwtzGBqVrbN1jDKF+GRKGU8aLubByyo2Yc2DO+CjOyhov11 qtpxiKEvKXqtoUW6sT0l+J0VNtDajzlKEvj6wEYqV6mgsCagor2Na/ZAGYeIcN5Xmpuo aJ0A== X-Forwarded-Encrypted: i=1; AJvYcCWC/b2m0al5fNZYBap/qFG9gQ7/MDWuocQR/+t+XJSYjBTl4G2nsxiv5BKnS8CFPKuFwdWAAJhz20YZ9fk=@vger.kernel.org X-Gm-Message-State: AOJu0YwYbbGKE48NqMW6/UYT7RZRoEBmvag6Kk2d3REG+7psrB3ZP3xi lsjdpFAHBtQD7/GruS84Exbu0WO512NJ2ikbfFlla+v333dWk64WK2lH X-Gm-Gg: ATEYQzzxUfawC0WnI5X6hdKiCnDTul7F7M2pXI1vXaYYdIh7mLO9zn9ulgHA3Gv51VT 8XiQZFBmysWlGNR8X0OTApUsEigOd5ozEHuLdLneIQCl9PCv7b48d0aXuAJpZ7ngBg4WBoXW+Bf YOzH11EfsZ8H3PTK/SsjVT/JxWO39m6PQRjWcF8iDa+MOTkC7PEVxHDOo6tMGfepcyrmXXXCxTV aDvQJBENvtXZrIf3wSSnEuzD3IFCQaxLZg6IbeoeZkLolosFJQOVouYv0lEpJzoc4l12/w17vcx dG6L6iUfqKjMQANKhFFRV/kBDsBD2ISPF7lM/nIKDEa2vEAfMD96ikurq7AelVfpQtKZqs/+RIu nfJYaYFfeJWIMlVoJiY53mFBx91HmlNj/28Vz6HSRCrLENyssjAicpia9MzCHuBwudoqbznsiv7 ufQryT9LV6s4HfIlEp+DAw9mjIf1cVAFwkTtnSNPw8NjxuaqomkHLdaIwbMgAwDMYvh6VmZWodV Y/cycy9dxV5 X-Received: by 2002:a05:600c:a117:b0:483:7eea:b185 with SMTP id 5b1f17b1804b1-4852695aedemr101938895e9.16.1772969878449; Sun, 08 Mar 2026 04:37:58 -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:58 -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 14/17] tools/nolibc/printf: Add support for left aligning fields Date: Sun, 8 Mar 2026 11:37:39 +0000 Message-Id: <20260308113742.12649-15-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 Output the characters before or after the pad - writing the pad takes more code. Include additional/changed tests Acked-by: Willy Tarreau Signed-off-by: David Laight --- Unchanged for v4 and v5. Changes for v3: - Formally part of patch 7. tools/include/nolibc/stdio.h | 6 +++++- tools/testing/selftests/nolibc/nolibc-test.c | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h index 4bb4d08d834e..fccc8a2d9b8a 100644 --- a/tools/include/nolibc/stdio.h +++ b/tools/include/nolibc/stdio.h @@ -546,7 +546,11 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list /* Stop gcc back-merging this code into one of the conditionals above. */ _NOLIBC_OPTIMIZER_HIDE_VAR(len); + /* Output the characters on the required side of any padding. */ width -= len; + flags = _NOLIBC_PF_FLAGS_CONTAIN(flags, '-'); + if (flags && cb(state, outstr, len) != 0) + return -1; while (width > 0) { /* Output pad in 16 byte blocks with the small block first. */ int pad_len = ((width - 1) & 15) + 1; @@ -555,7 +559,7 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list if (cb(state, " ", pad_len) != 0) return -1; } - if (cb(state, outstr, len) != 0) + if (!flags && cb(state, outstr, len) != 0) return -1; } diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 4267c69ec37c..89ded1dd7318 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -1845,9 +1845,11 @@ static int run_printf(int min, int max) 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; + 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(errno); errno = 22; EXPECT_VFPRINTF(is_nolibc, "errno=22", "%m"); break; - CASE_TEST(errno-neg); errno = -22; EXPECT_VFPRINTF(is_nolibc, " errno=-22", "%12m"); break; + CASE_TEST(errno-neg); errno = -22; EXPECT_VFPRINTF(is_nolibc, "errno=-22 ", "%-12m"); break; CASE_TEST(scanf); EXPECT_ZR(1, test_scanf()); break; CASE_TEST(printf_error); EXPECT_ZR(1, test_printf_error()); break; case __LINE__: -- 2.39.5