mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-07-09 19:00:27 +02:00
Code Activity

Make `locale-digit-grouping' more robust.

Browse source 
* libguile/i18n.c (scm_nl_langinfo)[GROUPING]: Consider negative numbers
  like `CHAR_MAX'.  Reported by David Fang <fang@csl.cornell.edu>.
  Fix suggested by Bruno Haible <bruno@clisp.org>.
This commit is contained in:
Ludovic Courtès 2011-02-24 23:17:06 +01:00
parent cfad56a444
commit 914c4300b2
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libguile/i18n.c
View file

@ -1564,11 +1564,14 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
{ {
char *p; char *p;
/* In this cases, the result is to be interpreted as a list of /* In this cases, the result is to be interpreted as a list
numbers. If the last item is `CHARS_MAX', it has the special of numbers. If the last item is `CHAR_MAX' or a negative
meaning "no more grouping". */ number, it has the special meaning "no more grouping"
(negative numbers aren't specified in POSIX but can be
used by glibc; see
<http://lists.gnu.org/archive/html/bug-guile/2011-02/msg00159.html>). */
result = SCM_EOL; result = SCM_EOL;
for (p = c_result; (*p != '\0') && (*p != CHAR_MAX); p++) for (p = c_result; (*p > 0) && (*p != CHAR_MAX); p++)
result = scm_cons (SCM_I_MAKINUM ((int) *p), result); result = scm_cons (SCM_I_MAKINUM ((int) *p), result);
{ {
@ -1576,7 +1579,7 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
result = scm_reverse_x (result, SCM_EOL); result = scm_reverse_x (result, SCM_EOL);
if (*p != CHAR_MAX) if (*p == 0)
{ {
/* Cyclic grouping information. */ /* Cyclic grouping information. */
if (last_pair != SCM_EOL) if (last_pair != SCM_EOL)