From nobody Tue Nov 1 00:46:31 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 4N1WYM73xNz4gy7j; Tue, 1 Nov 2022 00:46:31 +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 4N1WYM6VFDz3Qx4; Tue, 1 Nov 2022 00:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667263591; 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=tPNHqfG/vAxNlIFedIIo2ypx81D9J4L6yzDzCrFmRJs=; b=XONPFndZn7tgUSD3O2LdZS9GYFHWerarDHeJvxc5nDrz9hJPPiDJJvv4EmfY3JEYJHIU6p IBjyiEdX1YcOMj2v7Q+xnT2LAbyvxiFNyXV1Rs12Radluo0/c/gEdo5MKZsu+nnyDr6A/V Gh0PQnzGE8X3FeRmg/hWR7TFWH2J7ST8oI3zpKftsBpQZOpsOToK2YfecCa7mfKyDHjLEm hA94d5qZlmP9WMezaUm/0iB55AfECJ44es4m5Z8U9VkbXNxmz2E5lPtnRUA7NxlJqfb771 pv2upB0xdvTG19GUyokF0IFxecoQhBcn+upipJ0NsOm1jcJHC0WCBqsViiqdXA== 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 4N1WYM5K3qzwhD; Tue, 1 Nov 2022 00:46:31 +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 2A10kVVk042028; Tue, 1 Nov 2022 00:46:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A10kVDJ042027; Tue, 1 Nov 2022 00:46:31 GMT (envelope-from git) Date: Tue, 1 Nov 2022 00:46:31 GMT Message-Id: <202211010046.2A10kVDJ042027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 56462db9422c - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 56462db9422c785534a5bbcf8812ec9dc7160270 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667263591; 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=tPNHqfG/vAxNlIFedIIo2ypx81D9J4L6yzDzCrFmRJs=; b=GPYb0GZpPNB+agLm35jK9DtZPhnNTdYiv8u8yBRlN9ovpxZffnCYEpYh3rC2JAxPgJ/D4N vZw/+ZCBHrp4il++4ku1JXY5acDCL+M5dBmkqofgIgZFkUkEOWbWcIuIxekorB0FvoZg2q DmIYnNWAQ5H/kDRBQqvjxH8gIg36E/qZn2vm0cSfjDnSjjHNFQ9cgpvsdGMl6fHgsLpo+D IC6kyu/1/SP2TnyCkvbYKMEyS9+VdqSrbyfqC8k3VdMEIJseY8BoRSAPNYe4GGtpEJVXWH lrPzcR/Nc2rfu+dbvVDewhe/zWWlPz48JlxMa7/OZotw/ulTlqhyhxGbFiE/ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667263591; a=rsa-sha256; cv=none; b=hFYZAS9Gmtt03eq7qAV4rVvntrchgkVTM+BFfkSHp00qZFeuMDdbRdUiljYV0crz1M/IQJ lQA1j0ORcHvIH9l/L5QQKLZhNwz9M/S6tHM3vhZUsfx+TdISgLN0qJDbfyOPetfp4fwjub y+zc9cSZ4GRnlMfOHOLbQKlYIZwFaTxpZC5tDi1e/Op676HM05zoPbqSU/ioCXLSPGA1Fu FymbwHkDanSp9GeDR/XL9HXIgIi4XXlmpktcHmHfy7fQksfU5MYnNvCZKtzkrJAYEAYVMF /u+O8PcPHBODoBSu99wcg4bBcJUzUyfpoPemdrFVBJAdxav+jfNHFrt+toYwmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56462db9422c785534a5bbcf8812ec9dc7160270 commit 56462db9422c785534a5bbcf8812ec9dc7160270 Author: Jose Luis Duran AuthorDate: 2022-10-21 16:13:27 +0000 Commit: Konstantin Belousov CommitDate: 2022-11-01 00:44:41 +0000 strfmon: Trim the SPACE from international currency symbol (cherry picked from commit 6da51e19e347c13e133bcba68cc6100c16320a01) --- 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 0f327585f5a2..d6619f4d7d54 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;