numfmt: use multi-byte aware suffix matching

* src/numfmt.c (process_suffixed_number): Use gnulib's
mbs_endswith() helper, which is more robust in non UTF-8 locales.
Also always output a devmsg if a suffix is specified.

diff --git a/bootstrap.conf b/bootstrap.conf
index f470aa48b31eff69cd396cc85b4cdea78e755fff..8f91943417c0e333fe5a223868ab624bb0e9c4ad 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -173,6 +173,7 @@ gnulib_modules="
   mbrlen
   mbrtoc32
   mbrtowc
+  mbs_endswith
   mbschr
   mbslen
   mbswidth

diff --git a/src/numfmt.c b/src/numfmt.c
index 67458558a747d6f9f724882fcc7d2e066a88bf9e..cc80ccc5d85e733d0c8ace7a455e932680fd85dd 100644 (file)
--- a/src/numfmt.c
+++ b/src/numfmt.c
@@ -1326,14 +1326,11 @@ static int
 process_suffixed_number (char *text, long double *result,
                          size_t *precision, long int field)
 {
-  if (suffix && strlen (text) > strlen (suffix))
+  if (suffix)
     {
-      char *possible_suffix = text + strlen (text) - strlen (suffix);
-
-      if (streq (suffix, possible_suffix))
+      if (mbs_endswith (text, suffix))
         {
-          /* trim suffix, ONLY if it's at the end of the text.  */
-          *possible_suffix = '\0';
+          *(text + strlen (text) - strlen (suffix)) = '\0';
           devmsg ("trimming suffix %s\n", quote (suffix));
         }
       else