From nobody Tue Oct 25 21:51:26 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mxly72K9Vz4g5xg; Tue, 25 Oct 2022 21:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mxly66DM1z3gMg; Tue, 25 Oct 2022 21:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666734686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpm3nBR324yDnJBtFeTeEtgyeaYJkXWTlovyNV/XPiM=; b=AnyXI0U/XxFlBq+Sbl3c9fcBQ3hwqxjO0Qy32OU8tvOFLVB2JdphDJg2+uIxyfyBTO17p6 qGeVQ3YVn8yWWfDJnWJTeY4f1MLA8DZXnTh7qir4a0YfbEPm22+ShYcHZdrjn4lIyUyfv1 C+/gMyPlyXlK3ivuU/whcocKJp103SdM6ckFSQXB2zQl7/RhTswY5zJ2ovayz8Vuc5BMYQ tJhpm+7radGZJHLkDgArj3hPjW77LhnW+QVEBlh+gojlLxKmbLqmWmXK8QNZdKQSUqh2fB TZ4TiTuScCw9A3oanxR0ywdPTUWojXGs06QViCDFyjfms9IWYSZyUXrOekIUyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mxly65KPKztMY; Tue, 25 Oct 2022 21:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29PLpQA0086545; Tue, 25 Oct 2022 21:51:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PLpQG6086530; Tue, 25 Oct 2022 21:51:26 GMT (envelope-from git) Date: Tue, 25 Oct 2022 21:51:26 GMT Message-Id: <202210252151.29PLpQG6086530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6da51e19e347 - main - strfmon: Trim the SPACE from international currency symbol List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6da51e19e347c13e133bcba68cc6100c16320a01 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666734686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpm3nBR324yDnJBtFeTeEtgyeaYJkXWTlovyNV/XPiM=; b=MElSZ8eLd/phwvJRKL1FDiUcpij+2bc2D2vuWP1tcOhePoXySoO5fZNSpPFuVhaRr8YhBw E5s53vf/GeVXqT0/wXkHBLCdydGAcZ5Jx7AwcX34s2a6DxKLLix7aTkA71ePPaRmY9KRLM CQ3atbB5YmOCSLeQxZKfxRNCLH3h8CMmNRHbrQCDG9dQydj0OA3Y1aso5ObdyFJVcjuIob sBh94SVMpbS6iCF+JdFMCR7uX0lEomX0GgugC/7mF/lS/QDTK//N3IkP+dQUaXuFdAKUxz Y3YbOQpMdOgq3GKWvWA9ugclWktnPYVgc76h8ZHIs8rd+FMfNPPVluAE3qBpiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666734686; a=rsa-sha256; cv=none; b=QMcyKV+Noc8MJKYX2l1EcoTdncerOXOKAHqTaN9V1r4uTEyT1f6ne86fv4qd3wlUF44AZn DkFPe5XVYC86njCAtLaAmy+K5O1pralkUASAWbghsiTEHw9YLryoGk6pVA4JDSBYKDxptF 3LswpUJ64m5aWYyvf84LxkhPhxdF/9V/pzAZTkR1WzkvPss4hQ48fMW2p1SoCVcRl1tzhd +SHVgemn9PjD08l+Pxozb8o6muBgS4baQWNviZvjy/Soa6a6/gvryDNQXQDzaz1Aldyj8O OlkidYJeRP3OP671+nChBAlOmWDCeGLcGO/ZGuMM4mgUQjXpP4paoUxrkS8ufg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6da51e19e347c13e133bcba68cc6100c16320a01 commit 6da51e19e347c13e133bcba68cc6100c16320a01 Author: Jose Luis Duran AuthorDate: 2022-10-21 16:13:27 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-25 21:40:17 +0000 strfmon: Trim the SPACE from international currency symbol The international currency symbol (int_curr_symbol) has a mandatory SPACE character as the last character. Trim this space after reading it, otherwise this extra space will always be printed when displaying the int_curr_symbol. Fixes the output when the international currency format is selected (%i). Locale Format Before After en_US.UTF-8 [%i] [USD 123.45] [USD123.45] fr_FR.UTF-8 [%i] [123,45 EUR ] [123,45 EUR] Note that the en_US.UTF-8 locale states that no space should be printed between the currency symbol and the value (sep_by_space = 0). Reviewed by: kib PR: 267282 Github PR: #619 MFC after: 1 week --- lib/libc/stdlib/strfmon.c | 4 +++- lib/libc/tests/stdlib/strfmon_test.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c index 2526ab8fd8b1..a7a48317c97c 100644 --- a/lib/libc/stdlib/strfmon.c +++ b/lib/libc/stdlib/strfmon.c @@ -240,8 +240,10 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, if (flags & USE_INTL_CURRENCY) { currency_symbol = strdup(lc->int_curr_symbol); if (currency_symbol != NULL && - strlen(currency_symbol) > 3) + strlen(currency_symbol) > 3) { space_char = currency_symbol[3]; + currency_symbol[3] = '\0'; + } } else currency_symbol = strdup(lc->currency_symbol); diff --git a/lib/libc/tests/stdlib/strfmon_test.c b/lib/libc/tests/stdlib/strfmon_test.c index dc328e974bb8..b5b22f9a483d 100644 --- a/lib/libc/tests/stdlib/strfmon_test.c +++ b/lib/libc/tests/stdlib/strfmon_test.c @@ -195,8 +195,8 @@ ATF_TC_BODY(strfmon_international_currency_code, tc) const char *locale; const char *expected; } tests[] = { - { "en_US.UTF-8", "[USD 123.45]" }, /* XXX */ - { "de_DE.UTF-8", "[123,45 EUR ]" }, /* XXX */ + { "en_US.UTF-8", "[USD123.45]" }, + { "de_DE.UTF-8", "[123,45 EUR]" }, { "C", "[123.45]" }, }; size_t i;