From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.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 F08FF371046 for ; Sun, 8 Mar 2026 11:37:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969879; cv=none; b=h77GfLpIMUSIPraTXbnR/VB3MEj4GK1CE+S2JXsR5XQK+gGjkzVP0ng8gB6vIrosEp9TknuU/8+aTJQEqx7vjpCuqMrsSqac1xK4xQysKlpgPHDzi79mel3Hf6AuUIzgYarvM89xbjkSrDjlN6hXpEcxvTi55clLs1pGXocEW80= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772969879; c=relaxed/simple; bh=/utv3YkMMEdn4ERcUD93/hL0dKTeQRq2cCB4DOb6YiY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=upKxsp6vu45hBh4j+zWDgwtuv7Zr8N9eL8Ufc37oMhOYR1ym1RgLkhxjFCsmoZiK7MlMtDV9OkR/exBcQb1kiWW5S+KarAwYEyrj0jAHJUzCIfKZYODwqjAH/3i7saJcksc3IcG+t5dx+b+UQzlDau7yD7Uf3BGKAcwwPCr/d1A= 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=hzt5dxY6; arc=none smtp.client-ip=209.85.221.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="hzt5dxY6" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-439b94a19fdso6599531f8f.0 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=6OCV8pAy1RSi3pKBg5RAu3JfiIqk7cJW6y9lOdmAdOI=; b=hzt5dxY6hCc1Wtcv/DpXScXc/oTvSgdenQHOCUe3Sjh2JNwneS1rWbbtdi61Xc6p4V c17R5LO0czMGUrsz2I3Flzy4vqRoXOtOhjG6TOKOXgcc1karXJN906ErpR8xl+LBjLai EDfqUChdQj1MxXu3TGWv4Z7on4u074+bEH+FV3CbwIO3pPWNLsmnOgSqxFHeezHysPIv Yc2hTUP0+1wItWHVlyyCPiU9CyjQGQ/Q5Z21B7PPquWBnv7MOaOQBHZbPJ08LnI0rMcr Haq7KqC51LrnnCGws+SN9OxCSsi09o+Q1UwgOVttLlgp2ogb1d9GXh7ypuiXNqyNhf0I fTxg== 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=6OCV8pAy1RSi3pKBg5RAu3JfiIqk7cJW6y9lOdmAdOI=; b=hvOxxhH12V3j2on931Qkyq62XUM0ew4ocnQQPNBvhJJD+0wlmoJDAJiE4fKuag9ZaB u7fL/CGzUoyBV0/BZhkmKRYElP7ffCdUI+kMNlzJNUxkK0VyMLWhJ4t6e5PZHdUfFcnc lSqpDWVPi2Fsvp4cB6u6Lg3xN3twNqVwUzt/UKBTGwOCkwCSuvoxU2nbiztpAr3z+6en PlMhOcGL0eVwyOdf00+aByvd+DrCXSFjnj5By1nZuP4z4uz6tbL2JbN6aXh/BMh28MOq kHtlbOAjFETBwPqeC3Sy8Khmlifl2huude7ax/AFLjc+ccKkpXZYGp5PUW5bm1kbHAE3 Dx9A== X-Forwarded-Encrypted: i=1; AJvYcCVIRMgSM4cAWtpuBZxOcd3F+j0qGti9o5vGxJIZs92QcDhvBGy/I1X94EvvBs0rIHocVVD/J8dshtui6hU=@vger.kernel.org X-Gm-Message-State: AOJu0YyVRTkfN5WPtu7CJNB8WtkcWF0GOXs09b/KqwYJl1/174leIV5B PsRRrFpXiG8N0ZiONtkOZJ+MuwnNbxx/M6QoU93Mg8rlftkSdKOGSt1m X-Gm-Gg: ATEYQzwkILu0bB0qtkDDaZz09IO6bkamEwn4wPG3sP9yb77x+KL3/CwXysP2mYER15C 2caNdhVyJq813YOZc0dM1zU61FdSegeDsaccKkaUZx+zhdrt7OB3j6imeWHk87pwA7ClNa/zwyy s2cOSc8KmXk82aRoFEagZWb4zbf6eXlr04mmC4fYLwnEfUSauKfi/enkvPklsMj4vS7pRvqIleU Xmpmr7PPa+D01c8DfpjprfBO5WC7xy1/8j8VnEK0zbFP87gzWEdA72FCqhtjkUfil8tYyw3Ztu7 NTuDoQ1hGz6OV04NJXbb9/0avxcsIlQbCPvdBlXPgwh0+V1Zy2H2zD7Ztbeq8KNo0qQBi9ahD7W hDCRz32sDuehARUm7osGq7sxgJ5Fpn4Fy8qcYdpEk2xrifM4D7Flb3cnRgwZ8Tl6lANIdZoEChk HXnlRol5bAe2+otNgHroFUv+4vWOmmMA46LSE1mlxl9pPIVeRLXJEsFTKI3nY3DM9RTK3Mjv0oi fX3fXZISs5I X-Received: by 2002:a05:600c:820c:b0:485:383b:d5bb with SMTP id 5b1f17b1804b1-485383bd752mr23459605e9.27.1772969876180; Sun, 08 Mar 2026 04:37:56 -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 10/17] tools/nolibc/printf: Handle "%s" with the numeric formats Date: Sun, 8 Mar 2026 11:37:35 +0000 Message-Id: <20260308113742.12649-11-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 Avoids the extra va_arg() call with is non-trivial on a lot of modern ABI. Acked-by: Willy Tarreau Signed-off-by: David Laight --- Unchanched for v4 and v5. Changes for v3: - Moved to its own patch (part of patch 7 in v2).. - Fix 32bit compile. tools/include/nolibc/stdio.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h index 09ea2e0c392f..40ceb7a0b25a 100644 --- a/tools/include/nolibc/stdio.h +++ b/tools/include/nolibc/stdio.h @@ -412,13 +412,13 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list */ ch_flag = _NOLIBC_PF_FLAG(ch); 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. + _NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'c', 'd', 'i', 'u', '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. */ if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag | (flags & ~_NOLIBC_PF_FLAG('p')), - 'p', 'l', 't', 'z')) { + 'p', 's', 'l', 't', 'z')) { v = va_arg(args, unsigned long); signed_v = (long)v; } else if (_NOLIBC_PF_FLAGS_CONTAIN(flags, 'j', 'q')) { @@ -437,6 +437,15 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list goto do_output; } + if (ch == 's') { + /* "%s" - character string. */ + outstr = (const char *)(uintptr_t)v; + if (!outstr) { + outstr = "(null)"; + } + goto do_strlen_output; + } + out = outbuf; if (_NOLIBC_PF_FLAGS_CONTAIN(ch_flag, 'd', 'i')) { @@ -465,13 +474,6 @@ int __nolibc_printf(__nolibc_printf_cb cb, void *state, const char *fmt, va_list goto do_strlen_output; } - if (ch == 's') { - outstr = va_arg(args, char *); - if (!outstr) - outstr="(null)"; - goto do_strlen_output; - } - if (ch == 'm') { #ifdef NOLIBC_IGNORE_ERRNO outstr = "unknown error"; -- 2.39.5