mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-31 01:10:24 +02:00
Code Activity

Fix encoding of strings returned by nl-langinfo

Browse source 
Strings returned by nl-langinfo were always being encoded using the
global setlocale and not the scm_t_locale passed to the function.

* libguile/i18n.c (scm_nl_langinfo): fix encoding of strings
This commit is contained in:
Michael Gran 2009-09-25 07:27:11 -07:00
parent aafb5062b8
commit 52642040e2
1 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

43
libguile/i18n.c
View file

@ -1446,15 +1446,16 @@ SCM_DEFINE (scm_locale_string_to_inexact, "locale-string->inexact",
2. `nl_langinfo ()' is not available on Windows. 2. `nl_langinfo ()' is not available on Windows.
3. `nl_langinfo ()' may return strings encoded in a locale different from 3. `nl_langinfo ()' may return strings encoded in a locale different from
the current one, thereby defeating `scm_from_locale_string ()'. the current one.
Example: support the current locale is "Latin-1" and one asks: For example:
(nl-langinfo DAY_1 (make-locale LC_ALL "eo_EO.UTF-8")) (nl-langinfo DAY_1 (make-locale LC_ALL "eo_EO.UTF-8"))
The result will be a UTF-8 string. However, `scm_from_locale_string', returns a result that is a UTF-8 string, regardless of the
which expects a Latin-1 string, won't be able to make much sense of the setting of the current locale. If nl_langinfo supports CODESET,
returned string. Thus, we'd need an `scm_from_string ()' variant where we can convert the string properly using scm_from_stringn. If
the locale (or charset) is explicitly passed. */ CODESET is not supported, we won't be able to make much sense of
the returned string. */
SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0, SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
@ -1472,6 +1473,9 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
nl_item c_item; nl_item c_item;
char *c_result; char *c_result;
scm_t_locale c_locale; scm_t_locale c_locale;
#ifdef HAVE_LANGINFO_CODESET
char *codeset;
#endif
SCM_VALIDATE_INT_COPY (2, item, c_item); SCM_VALIDATE_INT_COPY (2, item, c_item);
SCM_VALIDATE_OPTIONAL_LOCALE_COPY (2, locale, c_locale); SCM_VALIDATE_OPTIONAL_LOCALE_COPY (2, locale, c_locale);
@ -1488,7 +1492,10 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
{ {
#ifdef USE_GNU_LOCALE_API #ifdef USE_GNU_LOCALE_API
c_result = nl_langinfo_l (c_item, c_locale); c_result = nl_langinfo_l (c_item, c_locale);
#else #ifdef HAVE_LANGINFO_CODESET
codeset = nl_langinfo_l (CODESET, c_locale);
#endif /* HAVE_LANGINFO_CODESET */
#else /* !USE_GNU_LOCALE_API */
/* We can't use `RUN_IN_LOCALE_SECTION ()' here because the locale /* We can't use `RUN_IN_LOCALE_SECTION ()' here because the locale
mutex is already taken. */ mutex is already taken. */
int lsec_err; int lsec_err;
@ -1512,6 +1519,9 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
else else
{ {
c_result = nl_langinfo (c_item); c_result = nl_langinfo (c_item);
#ifdef HAVE_LANGINFO_CODESET
codeset = nl_langinfo (CODESET);
#endif /* HAVE_LANGINFO_CODESET */
restore_locale_settings (&lsec_prev_locale); restore_locale_settings (&lsec_prev_locale);
free_locale_settings (&lsec_prev_locale); free_locale_settings (&lsec_prev_locale);
@ -1519,7 +1529,12 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
#endif #endif
} }
else else
c_result = nl_langinfo (c_item); {
c_result = nl_langinfo (c_item);
#ifdef HAVE_LANGINFO_CODESET
codeset = nl_langinfo (CODESET);
#endif /* HAVE_LANGINFO_CODESET */
}
c_result = strdup (c_result); c_result = strdup (c_result);
scm_i_pthread_mutex_unlock (&scm_i_locale_mutex); scm_i_pthread_mutex_unlock (&scm_i_locale_mutex);
@ -1627,9 +1642,15 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
#endif #endif
default: default:
/* FIXME: `locale_string ()' is not appropriate here because of #ifdef HAVE_LANGINFO_CODESET
encoding issues (see comment above). */ result = scm_from_stringn (c_result, strlen (c_result),
result = scm_take_locale_string (c_result); codeset,
SCM_FAILED_CONVERSION_QUESTION_MARK);
#else /* !HAVE_LANGINFO_CODESET */
/* This may be incorrectly encoded if the locale differs
from the c_locale. */
result = scm_from_locale_string (c_result);
#endif /* !HAVE_LANGINFO_CODESET */
} }
} }