numfmt: fix dropped custom suffix when failing to parse

* src/numfmt.c (process_suffixed_number): Restore custom suffix
upon failure to parse number.
* tests/numfmt/numfmt.pl: Add test cases.
* NEWS: Mention the bug fix.
Fixes https://bugs.debian.org/1094581
This commit is contained in:
Pádraig Brady committed 2025-12-22 13:17:37 +00:00
1 parent 1313c24056
commit 955dfdafa2
3 files changed
+19 -2

No files matched your search

+12 -2
View File
@@ -1320,14 +1320,17 @@ print_padded_number (intmax_t padding)
/* Converts the TEXT number string to the requested representation,
and handles automatic suffix addition. */
static int
static bool
process_suffixed_number (char *text, long double *result,
size_t *precision, long int field)
{
char saved_suffix = '\0';
if (suffix)
{
if (mbs_endswith (text, suffix))
{
saved_suffix = *(text + strlen (text) - strlen (suffix));
*(text + strlen (text) - strlen (suffix)) = '\0';
devmsg ("trimming suffix %s\n", quote (suffix));
}
@@ -1361,7 +1364,14 @@ process_suffixed_number (char *text, long double *result,
*result = val;
return (e == SSE_OK || e == SSE_OK_PRECISION_LOSS);
if (e == SSE_OK || e == SSE_OK_PRECISION_LOSS)
return true;
else
{
if (saved_suffix)
*(text + strlen (text)) = saved_suffix;
return false;
}
}
/* Return true if the current charset is UTF-8. */