X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=d194634f654dfca804cfd5d22b29e57b46f42966;hb=2bb71a3d1229189fc5fb6917caeb59fd54274606;hp=bcac52cf58b35b062aa6a45503887d84cc68c780;hpb=655bf3a3917cdf16f99fcbb680d2bf3159126a93;p=pspp-builds.git diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c index bcac52cf..d194634f 100644 --- a/src/libpspp/i18n.c +++ b/src/libpspp/i18n.c @@ -1,33 +1,33 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 2006 Free Software Foundation, Inc. - Written by John Darrington - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include #include #include +#include #include #include #include +#include "assertion.h" #include "i18n.h" #include +#include "xstrndup.h" static char *locale = 0; @@ -36,17 +36,36 @@ static const char *charset; static iconv_t convertor[n_CONV]; + +/* A wrapper around iconv_open */ +static iconv_t +create_iconv (const char* tocode, const char* fromcode) +{ + iconv_t conv = iconv_open (tocode, fromcode); + + /* I don't think it's safe to translate this string or to use messaging + as the convertors have not yet been set up */ + if ( (iconv_t) -1 == conv) + { + const int err = errno; + fprintf (stderr, + "Warning: cannot create a convertor for \"%s\" to \"%s\": %s\n", + fromcode, tocode, strerror (err)); + } + + return conv; +} + /* Return a string based on TEXT converted according to HOW. If length is not -1, then it must be the number of bytes in TEXT. The returned string must be freed when no longer required. */ char * -recode_string(enum conv_id how, const char *text, int length) +recode_string (enum conv_id how, const char *text, int length) { char *outbuf = 0; size_t outbufferlength; size_t result; - char *ip ; char *op ; size_t inbytes = 0; size_t outbytes ; @@ -54,65 +73,75 @@ recode_string(enum conv_id how, const char *text, int length) /* FIXME: Need to ensure that this char is valid in the target encoding */ const char fallbackchar = '?'; - if ( length == -1 ) + if ( text == NULL ) + return NULL; + + if ( length == -1 ) length = strlen(text); - assert(how < n_CONV); + assert (how < n_CONV); + + if (convertor[how] == (iconv_t) -1) + return xstrndup (text, length); for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 ) - if ( outbufferlength > length) + if ( outbufferlength > length) break; outbuf = xmalloc(outbufferlength); op = outbuf; - ip = (char *) text; outbytes = outbufferlength; inbytes = length; - - do { - - result = iconv(convertor[how], &ip, &inbytes, + do { + const char *ip = text; + result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes, &op, &outbytes); - if ( -1 == result ) + if ( -1 == result ) { int the_error = errno; - switch ( the_error) + switch (the_error) { case EILSEQ: case EINVAL: - if ( outbytes > 0 ) + if ( outbytes > 0 ) { *op++ = fallbackchar; outbytes--; - ip++; + text++; inbytes--; break; } /* Fall through */ case E2BIG: - free(outbuf); + free (outbuf); outbufferlength <<= 1; - outbuf = xmalloc(outbufferlength); + outbuf = xmalloc (outbufferlength); op = outbuf; - ip = (char *) text; outbytes = outbufferlength; inbytes = length; + text = ip; break; default: /* should never happen */ + NOT_REACHED (); break; } - } - } while ( -1 == result ); + if (outbytes == 0 ) + { + char *const oldaddr = outbuf; + outbuf = xrealloc (outbuf, outbufferlength + 1); + + op += (outbuf - oldaddr) ; + } + *op = '\0'; - return outbuf; } @@ -120,15 +149,15 @@ recode_string(enum conv_id how, const char *text, int length) /* Returns the current PSPP locale */ const char * -get_pspp_locale(void) +get_pspp_locale (void) { - assert ( locale); + assert (locale); return locale; } /* Set the PSPP locale */ -void -set_pspp_locale(const char *l) +void +set_pspp_locale (const char *l) { char *current_locale; const char *current_charset; @@ -136,41 +165,46 @@ set_pspp_locale(const char *l) free(locale); locale = strdup(l); - current_locale = setlocale(LC_CTYPE, 0); - current_charset = locale_charset(); - setlocale(LC_CTYPE, locale); - - charset = locale_charset(); - setlocale(LC_CTYPE, current_locale); + current_locale = setlocale (LC_CTYPE, 0); + current_charset = locale_charset (); + setlocale (LC_CTYPE, locale); - iconv_close(convertor[CONV_PSPP_TO_UTF8]); - convertor[CONV_PSPP_TO_UTF8] = iconv_open("UTF-8", charset); + charset = locale_charset (); + setlocale (LC_CTYPE, current_locale); - iconv_close(convertor[CONV_SYSTEM_TO_PSPP]); - convertor[CONV_SYSTEM_TO_PSPP] = iconv_open(charset, current_charset); + iconv_close (convertor[CONV_PSPP_TO_UTF8]); + convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset); + + iconv_close (convertor[CONV_SYSTEM_TO_PSPP]); + convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, current_charset); } void -i18n_init(void) +i18n_init (void) { - assert ( ! locale) ; - locale = strdup(setlocale(LC_CTYPE, NULL)); + assert (!locale) ; + locale = strdup (setlocale (LC_CTYPE, NULL)); - setlocale(LC_CTYPE, locale); - charset = locale_charset(); + setlocale (LC_CTYPE, locale); + charset = locale_charset (); - convertor[CONV_PSPP_TO_UTF8] = iconv_open("UTF-8", charset); - convertor[CONV_SYSTEM_TO_PSPP] = iconv_open(charset, charset); + convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset); + convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset); } -void -i18n_done(void) +void +i18n_done (void) { int i; - free(locale); + free (locale); locale = 0; - for(i = 0 ; i < n_CONV; ++i ) - iconv_close(convertor[i]); + for(i = 0 ; i < n_CONV; ++i ) + { + if ( (iconv_t) -1 == convertor[i] ) + continue; + iconv_close (convertor[i]); + } } +