Update.

	* stdlib/grouping.h: Accept ungrouped numbers even if locale
	defines grouping.

diff --git a/ChangeLog b/ChangeLog
index 1e518c794da30416e3308ef4b80d74185c95901a..5d0580006c3c736773dafac8850ca48aee69abf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1998-04-28  Ulrich Drepper  <drepper@cygnus.com>
 
+       * stdlib/grouping.h: Accept ungrouped numbers even if locale
+       defines grouping.
+
        * intl/hash-string.h: Don't include values.h.
 
        * inet/Makefile (tests): Add tst-ether_aton.

diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index c3e90eb5e7bd374ef4a2c265902834716273c510..615a35e022a370309dd0e14930352d347933fce3 100644 (file)
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -2162,8 +2162,8 @@ END LC_MONETARY
 
 LC_NUMERIC
 decimal_point             "<,>"
-thousands_sep             ""
-grouping                  0;0
+thousands_sep             "<.>"
+grouping                  3;3
 END LC_NUMERIC
 
 LC_TIME

diff --git a/stdlib/grouping.h b/stdlib/grouping.h
index deb7a15cfb3c025c9f597adc37bba3ac0c3f815d..71b89f9133d39e89155040032af8b5a50da5f7b2 100644 (file)
--- a/stdlib/grouping.h
+++ b/stdlib/grouping.h
@@ -1,5 +1,5 @@
 /* Internal header for proving correct grouping in strings of numbers.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -53,6 +53,11 @@ correctly_grouped_prefix (const STRING_TYPE *begin, const STRING_TYPE *end,
       while (cp >= begin && (wchar_t) *cp != thousands)
        --cp;
 
+      /* We allow the representation to contain no grouping at all even if
+        the locale specifies we can have grouping.  */
+      if (cp < begin)
+       return end;
+
       if (end - cp == (int) *gp + 1)
        {
          /* This group matches the specification.  */