git: 02a810d9b4cc - stable/13 - strfmon: Fix negative sign handling for C locale
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Dec 2025 02:38:53 UTC
The branch stable/13 has been updated by jlduran:
URL: https://cgit.FreeBSD.org/src/commit/?id=02a810d9b4cc8b3cd30d7e6bfe01b5e3c68ee492
commit 02a810d9b4cc8b3cd30d7e6bfe01b5e3c68ee492
Author: Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2025-11-26 20:34:56 +0000
Commit: Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2025-12-03 02:35:56 +0000
strfmon: Fix negative sign handling for C locale
If the locale's positive_sign and negative_sign values would both be
returned by localeconv() as empty strings, strfmon() shall behave as if
the negative_sign value was the string "-".
This occurs with the C locale. The implementation previously assigned
"0" to sign_posn (parentheses around the entire string); now it assigns
it to "1" (sign before the string) when it is undefined (CHAR_MAX).
Austin Group Defect 1199[1] is applied, changing the requirements for
the '+' and '(' flags.
[1]: https://www.austingroupbugs.net/view.php?id=1199
Reviewed by: kib
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D53913
(cherry picked from commit cf85e7034ad5640b18a3b68d6b291b7bf89bfc80)
---
lib/libc/stdlib/strfmon.c | 2 +-
lib/libc/tests/stdlib/strfmon_test.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
index 2dfc7d99510e..7a4e1093fc4d 100644
--- a/lib/libc/stdlib/strfmon.c
+++ b/lib/libc/stdlib/strfmon.c
@@ -458,7 +458,7 @@ __setup_vars(int flags, char *cs_precedes, char *sep_by_space, char *sign_posn,
if (*sep_by_space == CHAR_MAX)
*sep_by_space = 0;
if (*sign_posn == CHAR_MAX)
- *sign_posn = 0;
+ *sign_posn = 1;
}
static int
diff --git a/lib/libc/tests/stdlib/strfmon_test.c b/lib/libc/tests/stdlib/strfmon_test.c
index 7fc0afc9e229..a112fbf65c1d 100644
--- a/lib/libc/tests/stdlib/strfmon_test.c
+++ b/lib/libc/tests/stdlib/strfmon_test.c
@@ -206,8 +206,8 @@ ATF_TC_BODY(strfmon_plus_or_parenthesis, tc)
{ "%(i", "C", "[123.45] [(123.45)]" },
{ "%(n", "en_US.UTF-8", "[$123.45] [($123.45)]" },
{ "%(i", "en_US.UTF-8", "[USD123.45] [(USD123.45)]" },
- { "%n", "C", "[123.45] [(123.45)]" }, /* XXX */
- { "%i", "C", "[123.45] [(123.45)]" }, /* XXX */
+ { "%n", "C", "[123.45] [-123.45]" },
+ { "%i", "C", "[123.45] [-123.45]" },
{ "%n", "en_US.UTF-8", "[$123.45] [-$123.45]" },
{ "%i", "en_US.UTF-8", "[USD123.45] [-USD123.45]" },
};
@@ -254,7 +254,7 @@ ATF_TC_BODY(strfmon_l, tc)
const char *locale;
const char *expected;
} tests[] = {
- { "C", "[ **1234.57 ] [ **1234.57 ]" }, /* XXX */
+ { "C", "[ **1234.57] [ **1234.57]" },
{ "de_DE.UTF-8", "[ **1234,57 €] [ **1.234,57 EUR]" },
{ "en_GB.UTF-8", "[ £**1234.57] [ GBP**1,234.57]" },
};