From nobody Sat Oct 29 21:10:54 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 4N0BsV4KJjz4gsbm; Sat, 29 Oct 2022 21:10:54 +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 4N0BsV1q11z3Zp0; Sat, 29 Oct 2022 21:10:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667077854; 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=MWCxZ9ORRh9aYSDEg/xDaG7MmRdlrBSpX9FNbFT0eYY=; b=siDtO0d6qSw40M6iaKiI+9AvaQQG/OXYagE18VIQt3Nc1SRl+uv/7M5bWSSs6xZUhqCJzh WAzKml6SkqK+3iLxaAthnA82dKuUNmF5Vq5a29xkg4+hvYym8EfyX8EOLwietW9yNPLVxF jbPZv2KZjNijxVg8hhAuJeVC5K8dhsa/JLehCoMaamDh5AGkMrgZDJ5NPkbyAA59wUbTjH aCOvZ7UtFVLkde+bbdgUUR+tx6z/6OIa2bz6ZffTno8ZMIFpiPyqWK/umCq2gtOM9W/Oy0 zZFkSBbgGeEUKf3LtASQDnU/XJasMMNz0cWqJ0XsKwnXCTTADMhA+kPXZSqXAA== 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 4N0BsV0wvQzX6g; Sat, 29 Oct 2022 21:10:54 +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 29TLAs27068012; Sat, 29 Oct 2022 21:10:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29TLAsC5068011; Sat, 29 Oct 2022 21:10:54 GMT (envelope-from git) Date: Sat, 29 Oct 2022 21:10:54 GMT Message-Id: <202210292110.29TLAsC5068011@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: 621bf91893ad - main - strfmon_l: Use specified locale for number formatting 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: 621bf91893ad96c2ec46e603bf4c5b8762e3f730 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667077854; 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=MWCxZ9ORRh9aYSDEg/xDaG7MmRdlrBSpX9FNbFT0eYY=; b=mxlfkKAdW1kKl0rXg5sKx2V3T/MJFTsDJQBhs1/BaF5hH+e9fQNl3hU1ZLdZ1RRkXToCqe jkHP48hmVVgJ3aq1/zW8C9je1I+YCi7cjnP9qGUxyOsIm9DGZAev/7ThpNmlQK0eO0knaR 6Bwkqx9+z4iVV5xkvtWd5EOSxAyjfhPsDbmszyxgyiPNNn7wOBtkahTc3ayRQP5T3n4ttl 4d5BhKnouesIo1pdgasRAOnE+gDBnGe1EvCub14lc9HT7xJ+V5POSyqRZhxEa1Zni5kJho MFsK8eRJ9Z8IyFRJDpILC9szF1mziaXd1o/upj7TKNXxERQAB+kukqLT7bJniw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667077854; a=rsa-sha256; cv=none; b=NRodp25eI3Y8HPhRHbfSDwvq/E2QVN2jgNdl1b8rGTvtm8g0HD1GdBlBl0gj3/2d2Vmb0G MkuSIfxe/bEB6lb9ciw2mHRPkINBITFs6ou5iKhsJMmDl+giaEAhAJnKkf/49djoQMW2Hx 1EGqqIvXUdumeoVjKl7X3xQgnvtwcHv5dwb+AFSgt+DZvaTm45xL20vT9YLa+uAZaDAujN MdAtJ9OmMUyBrSngpJYfCCxKXd/IVehZTyHtpX8MCNOURBhQ5lzqHNWOOUA5lV9YWk973j dbAEigcMJK+nRzujGM9kaOr7S5N4Ol2m0RqUFnNbgxz17yu3ESKBPhC5A4NiwA== 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=621bf91893ad96c2ec46e603bf4c5b8762e3f730 commit 621bf91893ad96c2ec46e603bf4c5b8762e3f730 Author: Jose Luis Duran AuthorDate: 2022-10-28 01:24:48 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-29 21:09:11 +0000 strfmon_l: Use specified locale for number formatting strfmon_l does not take fully into consideration the explicitly passed locale to perform the formatting. Parallel universe bug report: https://sourceware.org/bugzilla/show_bug.cgi?id=19633 Obtained from: Darwin Reviewed by: kib PR: 267410 Github PR: #620 MFC after: 1 week --- lib/libc/stdlib/strfmon.c | 47 ++++++++++++++++++------------------ lib/libc/tests/stdlib/strfmon_test.c | 4 +-- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c index c0579f31e821..aee053a26ec8 100644 --- a/lib/libc/stdlib/strfmon.c +++ b/lib/libc/stdlib/strfmon.c @@ -71,9 +71,9 @@ __FBSDID("$FreeBSD$"); PRINT(*tmps++); \ } while (0) -#define GET_NUMBER(VAR) do { \ +#define GET_NUMBER(VAR, LOC) do { \ VAR = 0; \ - while (isdigit((unsigned char)*fmt)) { \ + while (isdigit_l((unsigned char)*fmt, LOC)) { \ if (VAR > INT_MAX / 10) \ goto e2big_error; \ VAR *= 10; \ @@ -98,9 +98,10 @@ __FBSDID("$FreeBSD$"); groups++; \ } while (0) -static void __setup_vars(int, char *, char *, char *, char **); -static int __calc_left_pad(int, char *); -static char *__format_grouped_double(double, int *, int, int, int); +static void __setup_vars(int, char *, char *, char *, char **, struct lconv *); +static int __calc_left_pad(int, char *, struct lconv *); +static char *__format_grouped_double(double, int *, int, int, int, + struct lconv *, locale_t); static ssize_t vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, @@ -194,8 +195,8 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, } /* field Width */ - if (isdigit((unsigned char)*fmt)) { - GET_NUMBER(width); + if (isdigit_l((unsigned char)*fmt, loc)) { + GET_NUMBER(width, loc); /* Do we have enough space to put number with * required width ? */ @@ -205,18 +206,18 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, /* Left precision */ if (*fmt == '#') { - if (!isdigit((unsigned char)*++fmt)) + if (!isdigit_l((unsigned char)*++fmt, loc)) goto format_error; - GET_NUMBER(left_prec); + GET_NUMBER(left_prec, loc); if ((unsigned int)left_prec >= maxsize - (dst - s)) goto e2big_error; } /* Right precision */ if (*fmt == '.') { - if (!isdigit((unsigned char)*++fmt)) + if (!isdigit_l((unsigned char)*++fmt, loc)) goto format_error; - GET_NUMBER(right_prec); + GET_NUMBER(right_prec, loc); if ((unsigned int)right_prec >= maxsize - (dst - s) - left_prec) goto e2big_error; @@ -262,8 +263,8 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, /* fill left_prec with amount of padding chars */ if (left_prec >= 0) { pad_size = __calc_left_pad((flags ^ IS_NEGATIVE), - currency_symbol) - - __calc_left_pad(flags, currency_symbol); + currency_symbol, lc) - + __calc_left_pad(flags, currency_symbol, lc); if (pad_size < 0) pad_size = 0; } @@ -271,14 +272,14 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, if (asciivalue != NULL) free(asciivalue); asciivalue = __format_grouped_double(value, &flags, - left_prec, right_prec, pad_char); + left_prec, right_prec, pad_char, lc, loc); if (asciivalue == NULL) goto end_error; /* errno already set */ /* to ENOMEM by malloc() */ /* set some variables for later use */ __setup_vars(flags, &cs_precedes, &sep_by_space, - &sign_posn, &signstr); + &sign_posn, &signstr, lc); /* * Description of some LC_MONETARY's values: @@ -422,10 +423,8 @@ end_error: static void __setup_vars(int flags, char *cs_precedes, char *sep_by_space, - char *sign_posn, char **signstr) + char *sign_posn, char **signstr, struct lconv *lc) { - struct lconv *lc = localeconv(); - if ((flags & IS_NEGATIVE) && (flags & USE_INTL_CURRENCY)) { *cs_precedes = lc->int_n_cs_precedes; *sep_by_space = lc->int_n_sep_by_space; @@ -460,12 +459,13 @@ __setup_vars(int flags, char *cs_precedes, char *sep_by_space, } static int -__calc_left_pad(int flags, char *cur_symb) +__calc_left_pad(int flags, char *cur_symb, struct lconv *lc) { char cs_precedes, sep_by_space, sign_posn, *signstr; int left_chars = 0; - __setup_vars(flags, &cs_precedes, &sep_by_space, &sign_posn, &signstr); + __setup_vars(flags, &cs_precedes, &sep_by_space, &sign_posn, + &signstr, lc); if (cs_precedes != 0) { left_chars += strlen(cur_symb); @@ -515,7 +515,7 @@ get_groups(int size, char *grouping) /* convert double to locale-encoded string */ static char * __format_grouped_double(double value, int *flags, - int left_prec, int right_prec, int pad_char) + int left_prec, int right_prec, int pad_char, struct lconv *lc, locale_t loc) { char *rslt; @@ -527,7 +527,6 @@ __format_grouped_double(double value, int *flags, int padded; - struct lconv *lc = localeconv(); char *grouping; const char *decimal_point; const char *thousands_sep; @@ -566,8 +565,8 @@ __format_grouped_double(double value, int *flags, left_prec += get_groups(left_prec, grouping); /* convert to string */ - avalue_size = asprintf(&avalue, "%*.*f", left_prec + right_prec + 1, - right_prec, value); + avalue_size = asprintf_l(&avalue, loc, "%*.*f", + left_prec + right_prec + 1, right_prec, value); if (avalue_size < 0) return (NULL); diff --git a/lib/libc/tests/stdlib/strfmon_test.c b/lib/libc/tests/stdlib/strfmon_test.c index dcad17d3dbfd..224b3f44911e 100644 --- a/lib/libc/tests/stdlib/strfmon_test.c +++ b/lib/libc/tests/stdlib/strfmon_test.c @@ -224,8 +224,8 @@ ATF_TC_BODY(strfmon_l, tc) const char *expected; } tests[] = { { "C", "[ **1234.57 ] [ **1234.57 ]" }, - { "de_DE.UTF-8", "[ €**1234.57 ] [ EUR**1234.57 ]" }, /* XXX */ - { "en_GB.UTF-8", "[ £**1234.57 ] [ GBP**1234.57 ]" }, /* XXX */ + { "de_DE.UTF-8", "[ **1234,57 €] [ **1.234,57 EUR]" }, + { "en_GB.UTF-8", "[ £**1234.57] [ GBP**1,234.57]" }, }; locale_t loc; size_t i;