From e0e86ccb1d2848678b5c32f65bf6239ba5fb9d24 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 29 Nov 2001 05:00:56 +0000 Subject: Update. * iconv/gconv_open.c (__gconv_open): Empty codeset name now means using the current locale's codeset. * iconv/iconv_open.c (iconv_open): Don't strip out everything for empty input string. * iconv/iconv_prog.c: Pass empty strings as default value for to- and from-charset. Don't determine locale's charset here. if libio is used [PR libc/2575]. --- iconv/gconv_open.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'iconv/gconv_open.c') diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c index dfcd7b772f..94a54f8008 100644 --- a/iconv/gconv_open.c +++ b/iconv/gconv_open.c @@ -20,6 +20,7 @@ #include #include +#include "../locale/localeinfo.h" #include #include @@ -149,6 +150,25 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, fromset = memcpy (newfromset, fromset, ignore - fromset); } + /* If the string is empty define this to mean the charset of the + currently selected locale. */ + if (strcmp (toset, "//") == 0) + { + const char *codeset = _NL_CURRENT (LC_CTYPE, CODESET); + size_t len = strlen (codeset); + char *dest; + toset = dest = (char *) alloca (len + 3); + memcpy (__mempcpy (dest, codeset, len), "//", 3); + } + if (strcmp (fromset, "//") == 0) + { + const char *codeset = _NL_CURRENT (LC_CTYPE, CODESET); + size_t len = strlen (codeset); + char *dest; + fromset = dest = (char *) alloca (len + 3); + memcpy (__mempcpy (dest, codeset, len), "//", 3); + } + res = __gconv_find_transform (toset, fromset, &steps, &nsteps, flags); if (res == __GCONV_OK) { -- cgit v1.2.3