Mercurial > hg > octave-nkf > gnulib-hg
changeset 4106:aa367eec7a72
New file localcharset.h.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 31 Dec 2002 13:20:21 +0000 |
parents | 7f998811f2f0 |
children | 7c1a6b73f48e |
files | lib/ChangeLog lib/localcharset.c lib/localcharset.h lib/unicodeio.c |
diffstat | 4 files changed, 34 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2002-12-23 Bruno Haible <bruno@clisp.org> + + * localcharset.h: New file. + * localcharset.c: Include it. + * unicodeio.c: Likewise. + 2002-12-22 Bruno Haible <bruno@clisp.org> * utime.c (utime_null): No need to call ftruncate if the file was
--- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -23,6 +23,9 @@ # include <config.h> #endif +/* Specification. */ +#include "localcharset.h" + #if HAVE_STDDEF_H # include <stddef.h> #endif
new file mode 100644 --- /dev/null +++ b/lib/localcharset.h @@ -0,0 +1,23 @@ +/* Determine a canonical name for the current locale's character encoding. + Copyright (C) 2002 Free Software Foundation, Inc. + + 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, 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. + + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Determine the current locale's character encoding, and canonicalize it + into one of the canonical names listed in config.charset. + The result must not be freed; it is statically allocated. + If the canonical name cannot be determined, the result is a non-canonical + name. */ +extern const char * locale_charset (void);
--- a/lib/unicodeio.c +++ b/lib/unicodeio.c @@ -51,6 +51,8 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid +#include "localcharset.h" + /* When we pass a Unicode character to iconv(), we must pass it in a suitable encoding. The standardized Unicode encodings are UTF-8, UCS-2, UCS-4, UTF-16, UTF-16BE, UTF-16LE, UTF-7. @@ -127,7 +129,6 @@ if (!initialized) { - extern const char *locale_charset PARAMS ((void)); const char *charset = locale_charset (); is_utf8 = !strcmp (charset, UTF8_NAME);