From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta1.formilux.org (mta1.formilux.org [51.159.59.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E7A021CFE0 for ; Sat, 7 Mar 2026 10:47:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=51.159.59.229 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772880421; cv=none; b=NpUywc/YhBJCQpQHeAWO1b58R2msN43G7rT9gUeIUkZ6WKFw8ETAo+8vKGQrTVKhuD8uSfmjdTXgB6I9NkVAw62KHw/uwfY5YhhaC1QfDXnAbhllWNV2fv0YstUSQ3uwIryVdOsIBoVirchIhYEYEdacXWeYPkUFLCAUgO2cBTI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772880421; c=relaxed/simple; bh=w94JtAga5q/UMXGcXSwuQRXpPk2VN08oQMQfcugog3Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=YjUzoOc2ACBjeyWQWpZOBXb+fIgbjYLIshZ6xoFS6cCd2xovEFx4+fLLfgD0CMNLj/8BTMczsO/0oLc5LD9oxbftLTt3VFf2nqdkEWpR7h9CUhA+/jgQaFYD28Dk14Nvu5f+6KfYwgdQkst6gpimJ7G12MN9D+6/PShhjb6VXrQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=1wt.eu; spf=pass smtp.mailfrom=1wt.eu; dkim=pass (1024-bit key) header.d=1wt.eu header.i=@1wt.eu header.b=LPKBAt5P; arc=none smtp.client-ip=51.159.59.229 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=1wt.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=1wt.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=1wt.eu header.i=@1wt.eu header.b="LPKBAt5P" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1wt.eu; s=mail; t=1772880418; bh=7DINAC96jv2EwM6Eu0u+Hwr5zkH3yJgIyaZZgCZ3Zv8=; h=From:Message-ID:From; b=LPKBAt5PEdFeN6APrjqjlA4epPfuam6VFCKkI/FqUiwaVCGE2HaVxFd6ApovewK+T pGcanbk4z/VSOuJBMDwrCauTchbXlyLXUTYOfPe0w4Pk7WA69rRlc7wS2yvV1MZCqV YNZ1NEPSp5kcdGdeoo8NO/vLQlsHRZNLXzJDdj9U= Received: from 1wt.eu (ded1.1wt.eu [163.172.96.212]) by mta1.formilux.org (Postfix) with ESMTP id 9FBE1C0A05; Sat, 07 Mar 2026 11:46:58 +0100 (CET) Date: Sat, 7 Mar 2026 11:46:58 +0100 From: Willy Tarreau To: david.laight.linux@gmail.com Cc: Thomas =?iso-8859-1?Q?Wei=DFschuh?= , linux-kernel@vger.kernel.org, Cheng Li Subject: Re: [PATCH v4 next 20/23] tools/nolibc/printf: Add support for left aligning fields Message-ID: References: <20260302101815.3043-1-david.laight.linux@gmail.com> <20260302101815.3043-21-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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260302101815.3043-21-david.laight.linux@gmail.com> On Mon, Mar 02, 2026 at 10:18:12AM +0000, david.laight.linux@gmail.com wrote: > From: David Laight > > Output the characters before or after the pad - writing the pad takes more code. > > Include additional/changed tests > > Signed-off-by: David Laight Acked-by: Willy Tarreau Willy > --- > > Unchanged for v4. > > 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 ef8e7069d5cf..695676b44151 100644 > --- a/tools/include/nolibc/stdio.h > +++ b/tools/include/nolibc/stdio.h > @@ -544,7 +544,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; > @@ -553,7 +557,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