diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | extra/locale/.gitignore | 26 | ||||
| -rw-r--r-- | extra/locale/programs/locale.c | 3 | ||||
| -rw-r--r-- | libc/misc/wchar/wchar.c | 255 | ||||
| -rw-r--r-- | utils/.gitignore | 4 | ||||
| -rw-r--r-- | utils/Makefile.in | 45 | ||||
| -rw-r--r-- | utils/iconv.c | 264 | ||||
| -rw-r--r-- | utils/porting.h | 2 |
8 files changed, 375 insertions, 232 deletions
diff --git a/Makefile.in b/Makefile.in index f02b6bd55..b84ed15f5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -372,19 +372,19 @@ ifeq ($(HAVE_SHARED),y) endif utils: - $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils + $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils $@ # Installs helper applications, such as 'ldd' and 'ldconfig' install_utils: utils - $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install + $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install endif # ifeq ($(HAVE_DOT_CONFIG),y) hostutils: - $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" -C utils hostutils + $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils $@ install_hostutils: hostutils - $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install DOTHOST=.host + $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils utils_install $(addprefix $(top_builddir),include/bits include/sys include/config extra/config/lxdialog extra/locale $(subdirs)): $(do_mkdir) diff --git a/extra/locale/.gitignore b/extra/locale/.gitignore new file mode 100644 index 000000000..3ea196522 --- /dev/null +++ b/extra/locale/.gitignore @@ -0,0 +1,26 @@ +# +# Never ignore these +# +!.gitignore + +# +# Generated files +# +/c8tables.h +/codesets.txt +/locale_collate.h +/locale_data.c +/locale_tables.h +/locales.txt +/lt_defines.h +/uClibc_locale_data.h +/wctables.h +# +# generators +# +/gen_collate +/gen_ldc +/gen_locale +/gen_wc8bit +/gen_wctype + diff --git a/extra/locale/programs/locale.c b/extra/locale/programs/locale.c index 462a57913..dfd202954 100644 --- a/extra/locale/programs/locale.c +++ b/extra/locale/programs/locale.c @@ -10,10 +10,9 @@ * */ - +#include <string.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> #include <langinfo.h> #include <unistd.h> #ifdef __UCLIBC_HAS_GETOPT_LONG__ diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 099ac3935..9b7196238 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -97,7 +97,7 @@ * * Manuel */ - +#ifdef _LIBC #include <errno.h> #include <stddef.h> #include <limits.h> @@ -170,7 +170,7 @@ extern size_t _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn, extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n, const wchar_t **__restrict src, size_t wn) attribute_hidden; - +#endif /**********************************************************************/ #ifdef L_btowc @@ -1199,45 +1199,6 @@ typedef struct { int skip_invalid_input; /* To support iconv -c option. */ } _UC_iconv_t; - - -#ifdef L_iconv - -#include <iconv.h> -#include <string.h> -#include <endian.h> -#include <byteswap.h> - -#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN) -#error unsupported endianness for iconv -#endif - -#ifndef __CTYPE_HAS_8_BIT_LOCALES -#error currently iconv requires 8 bit locales -#endif -#ifndef __CTYPE_HAS_UTF_8_LOCALES -#error currently iconv requires UTF-8 locales -#endif - - -enum { - IC_WCHAR_T = 0xe0, - IC_MULTIBYTE = 0xe0, -#if __BYTE_ORDER == __BIG_ENDIAN - IC_UCS_4 = 0xec, - IC_UTF_32 = 0xe4, - IC_UCS_2 = 0xe2, - IC_UTF_16 = 0xea, -#else - IC_UCS_4 = 0xed, - IC_UTF_32 = 0xe5, - IC_UCS_2 = 0xe3, - IC_UTF_16 = 0xeb, -#endif - IC_UTF_8 = 2, - IC_ASCII = 1 -}; - /* For the multibyte * bit 0 means swap endian * bit 1 means 2 byte @@ -1245,10 +1206,13 @@ enum { * */ +#if defined L_iconv && defined _LIBC /* Used externally only by iconv utility */ extern const unsigned char __iconv_codesets[]; libc_hidden_proto(__iconv_codesets) +#endif +#if defined L_iconv || defined L_iconv_main const unsigned char __iconv_codesets[] = "\x0a\xe0""WCHAR_T\x00" /* superset of UCS-4 but platform-endian */ #if __BYTE_ORDER == __BIG_ENDIAN @@ -1281,7 +1245,48 @@ const unsigned char __iconv_codesets[] = "\x08\x02""UTF-8\x00" "\x0b\x01""US-ASCII\x00" "\x07\x01""ASCII"; /* Must be last! (special case to save a nul) */ +#endif +#if defined L_iconv && defined _LIBC libc_hidden_data_def(__iconv_codesets) +#endif + + +#ifdef L_iconv + +#include <iconv.h> +#include <string.h> +#include <endian.h> +#include <byteswap.h> + +#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN) +#error unsupported endianness for iconv +#endif + +#ifndef __CTYPE_HAS_8_BIT_LOCALES +#error currently iconv requires 8 bit locales +#endif +#ifndef __CTYPE_HAS_UTF_8_LOCALES +#error currently iconv requires UTF-8 locales +#endif + + +enum { + IC_WCHAR_T = 0xe0, + IC_MULTIBYTE = 0xe0, +#if __BYTE_ORDER == __BIG_ENDIAN + IC_UCS_4 = 0xec, + IC_UTF_32 = 0xe4, + IC_UCS_2 = 0xe2, + IC_UTF_16 = 0xea, +#else + IC_UCS_4 = 0xed, + IC_UTF_32 = 0xe5, + IC_UCS_2 = 0xe3, + IC_UTF_16 = 0xeb, +#endif + IC_UTF_8 = 2, + IC_ASCII = 1 +}; /* Experimentally off - libc_hidden_proto(strcasecmp) */ @@ -1575,172 +1580,4 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf, } return nrcount; } - -#endif -/**********************************************************************/ -#ifdef L_iconv_main - -#include <string.h> -#include <iconv.h> -#include <stdarg.h> -#include <libgen.h> - -extern const unsigned char __iconv_codesets[]; - -#define IBUF BUFSIZ -#define OBUF BUFSIZ - -static char *progname; -static int hide_errors; - -static void error_msg(const char *fmt, ...) - __attribute__ ((noreturn, format (printf, 1, 2))); - -static void error_msg(const char *fmt, ...) -{ - va_list arg; - - if (!hide_errors) { - fprintf(stderr, "%s: ", progname); - va_start(arg, fmt); - vfprintf(stderr, fmt, arg); - va_end(arg); - } - - exit(EXIT_FAILURE); -} - -int main(int argc, char **argv) -{ - FILE *ifile; - FILE *ofile = stdout; - const char *p; - const char *s; - static const char opt_chars[] = "tfocsl"; - /* 012345 */ - const char *opts[sizeof(opt_chars)]; /* last is infile name */ - iconv_t ic; - char ibuf[IBUF]; - char obuf[OBUF]; - char *pi; - char *po; - size_t ni, no, r, pos; - - hide_errors = 0; - - for (s = opt_chars ; *s ; s++) { - opts[ s - opt_chars ] = NULL; - } - - progname = *argv; - while (--argc) { - p = *++argv; - if ((*p != '-') || (*++p == 0)) { - break; - } - do { - if ((s = strchr(opt_chars,*p)) == NULL) { - USAGE: - s = basename(progname); - fprintf(stderr, - "%s [-cs] -f fromcode -t tocode [-o outputfile] [inputfile ...]\n" - " or\n%s -l\n", s, s); - return EXIT_FAILURE; - } - if ((s - opt_chars) < 3) { - if ((--argc == 0) || opts[s - opt_chars]) { - goto USAGE; - } - opts[s - opt_chars] = *++argv; - } else { - opts[s - opt_chars] = p; - } - } while (*++p); - } - - if (opts[5]) { /* -l */ - fprintf(stderr, "Recognized codesets:\n"); - for (s = (char *)__iconv_codesets ; *s ; s += *s) { - fprintf(stderr," %s\n", s+2); - } - s = __LOCALE_DATA_CODESET_LIST; - do { - fprintf(stderr," %s\n", __LOCALE_DATA_CODESET_LIST+ (unsigned char)(*s)); - } while (*++s); - - return EXIT_SUCCESS; - } - - if (opts[4]) { - hide_errors = 1; - } - - if (!opts[0] || !opts[1]) { - goto USAGE; - } - if ((ic = iconv_open(opts[0],opts[1])) == ((iconv_t)(-1))) { - error_msg( "unsupported codeset in %s -> %s conversion\n", opts[1], opts[0]); - } - if (opts[3]) { /* -c */ - ((_UC_iconv_t *) ic)->skip_invalid_input = 1; - } - - if ((s = opts[2]) != NULL) { - if (!(ofile = fopen(s, "w"))) { - error_msg( "couldn't open %s for writing\n", s); - } - } - - pos = ni = 0; - do { - if (!argc || ((**argv == '-') && !((*argv)[1]))) { - ifile = stdin; /* we don't check for duplicates */ - } else if (!(ifile = fopen(*argv, "r"))) { - error_msg( "couldn't open %s for reading\n", *argv); - } - - while ((r = fread(ibuf + ni, 1, IBUF - ni, ifile)) > 0) { - pos += r; - ni += r; - no = OBUF; - pi = ibuf; - po = obuf; - if ((r = iconv(ic, &pi, &ni, &po, &no)) == ((size_t)(-1))) { - if ((errno != EINVAL) && (errno != E2BIG)) { - error_msg( "iconv failed at pos %lu : %m\n", (unsigned long) (pos - ni)); - } - } - if ((r = OBUF - no) > 0) { - if (fwrite(obuf, 1, OBUF - no, ofile) < r) { - error_msg( "write error\n"); - } - } - if (ni) { /* still bytes in buffer! */ - memmove(ibuf, pi, ni); - } - } - - if (ferror(ifile)) { - error_msg( "read error\n"); - } - - ++argv; - - if (ifile != stdin) { - fclose(ifile); - } - - } while (--argc > 0); - - iconv_close(ic); - - if (ni) { - error_msg( "incomplete sequence\n"); - } - - return (((_UC_iconv_t *) ic)->skip_invalid_input < 2) - ? EXIT_SUCCESS : EXIT_FAILURE; -} - #endif -/**********************************************************************/ diff --git a/utils/.gitignore b/utils/.gitignore index af2888834..8b2853db0 100644 --- a/utils/.gitignore +++ b/utils/.gitignore @@ -2,3 +2,7 @@ ldconfig ldconfig.host ldd ldd.host +iconv +iconv.host +locale +locale.host diff --git a/utils/Makefile.in b/utils/Makefile.in index 5e1628231..c2466542c 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -1,6 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2009 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. @@ -24,18 +24,19 @@ else CFLAGS-utils-shared := endif -CFLAGS-ldconfig := +CFLAGS-ldconfig := -DBUILDING_LINKAGE ifeq ($(UCLIBC_STATIC_LDCONFIG),y) CFLAGS-ldconfig += -static else CFLAGS-ldconfig += $(CFLAGS-utils-shared) endif -CFLAGS-ldd := $(CFLAGS-utils-shared) +CFLAGS-ldd := $(CFLAGS-utils-shared) -DBUILDING_LINKAGE # Need CFLAGS-utils explicitly, because the source file is not located in utils CFLAGS-iconv := $(CFLAGS-utils) \ $(CFLAGS-utils-shared) \ + -I$(top_srcdir)libc/misc/wchar \ -DL_iconv_main \ CFLAGS-locale := $(CFLAGS-utils) @@ -48,13 +49,23 @@ LDSO_CACHE_SUPPORT := -D__LDSO_CACHE_SUPPORT__=1 endif BUILD_CFLAGS-utils := \ - -include $(top_srcdir)include/elf.h \ - -I$(top_srcdir)ldso/include \ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \ -DUCLIBC_LDSO=$(UCLIBC_LDSO) \ $(LDSO_CACHE_SUPPORT) -BUILD_CFLAGS-ldconfig.host := $(BUILD_CFLAGS-utils) -BUILD_CFLAGS-ldd.host := $(BUILD_CFLAGS-utils) +BUILD_CFLAGS-ldconfig.host := $(BUILD_CFLAGS-utils) \ + -DBUILDING_LINKAGE \ + -I$(top_srcdir)ldso/include +BUILD_CFLAGS-ldd.host := $(BUILD_CFLAGS-utils) \ + -DBUILDING_LINKAGE \ + -I$(top_srcdir)ldso/include \ + -include $(top_srcdir)include/elf.h +BUILD_CFLAGS-locale.host := $(BUILD_CFLAGS-utils) \ + -DNOT_IN_libc \ + -I$(top_srcdir)utils/ \ + -I. +BUILD_CFLAGS-iconv.host := $(BUILD_CFLAGS-utils) \ + -include $(top_builddir)extra/locale/c8tables.h \ + -I$(top_srcdir)libc/misc/wchar -DL_iconv_main # Rules @@ -69,31 +80,31 @@ ifeq ($(HAVE_SHARED),y) utils_OBJ += ldconfig ldd endif -utils_ICONV_OBJ := utils_LOCALE_OBJ := ifeq ($(UCLIBC_HAS_LOCALE),y) -utils_ICONV_OBJ := $(utils_OUT)/iconv -utils_LOCALE_OBJ := $(utils_OUT)/locale +utils_OBJ += iconv +#utils_LOCALE_OBJ += $(utils_OUT)/locale endif utils_OBJ := $(patsubst %,$(utils_OUT)/%,$(utils_OBJ)) hostutils_OBJ := $(patsubst %,%.host,$(utils_OBJ)) +hostutils_LOCALE_OBJ := $(patsubst %,%.host,$(utils_LOCALE_OBJ)) -utils: $(utils_OBJ) $(utils_ICONV_OBJ) $(utils_LOCALE_OBJ) +utils: $(utils_OBJ) $(utils_LOCALE_OBJ) # NOTE: We build the utils AFTER we have a uClibc-targeted toolchain. $(utils_OBJ): $(utils_OUT)/% : $(utils_DIR)/%.c | $(libc) $(compile.u) -$(utils_OUT)/iconv: $(top_srcdir)libc/misc/wchar/wchar.c | $(libc) - $(compile.u) - $(utils_OUT)/locale: $(top_srcdir)extra/locale/programs/locale.c | $(libc) $(compile.u) -hostutils: $(hostutils_OBJ) +$(utils_OUT)/locale.host: $(top_srcdir)extra/locale/programs/locale.c | $(libc) + $(hcompile.u) + +hostutils: $(hostutils_OBJ) $(hostutils_LOCALE_OBJ) $(hostutils_OBJ): $(utils_OUT)/%.host : $(utils_DIR)/%.c $(hcompile.u) @@ -103,14 +114,14 @@ install-y += utils_install # This installs both utils and hostutils, so doesn't depend on either. -utils_install: $(addsuffix $(DOTHOST), $(utils_OBJ) $(utils_ICONV_OBJ) $(utils_LOCALE_OBJ)) +utils_install: $(addsuffix $(DOTHOST), $(utils_OBJ) $(utils_LOCALE_OBJ)) ifeq ($(HAVE_SHARED),y) $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig endif ifeq ($(UCLIBC_HAS_LOCALE),y) $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv - $(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale + #$(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale endif diff --git a/utils/iconv.c b/utils/iconv.c new file mode 100644 index 000000000..589c64cbd --- /dev/null +++ b/utils/iconv.c @@ -0,0 +1,264 @@ + +/* Copyright (C) 2002, 2003, 2004 Manuel Novoa III + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! + * + * Besides uClibc, I'm using this code in my libc for elks, which is + * a 16-bit environment with a fairly limited compiler. It would make + * things much easier for me if this file isn't modified unnecessarily. + * In particular, please put any new or replacement functions somewhere + * else, and modify the makefile to use your version instead. + * Thanks. Manuel + * + * ATTENTION! ATTENTION! ATTENTION! ATTENTION! ATTENTION! */ + + +/* May 23, 2002 Initial Notes: + * + * I'm still tweaking this stuff, but it passes the tests I've thrown + * at it, and Erik needs it for the gcc port. The glibc extension + * __wcsnrtombs() hasn't been tested, as I didn't find a test for it + * in the glibc source. I also need to fix the behavior of + * _wchar_utf8sntowcs() if the max number of wchars to convert is 0. + * + * UTF-8 -> wchar -> UTF-8 conversion tests on Markus Kuhn's UTF-8-demo.txt + * file on my platform (x86) show about 5-10% faster conversion speed than + * glibc with mbsrtowcs()/wcsrtombs() and almost twice as fast as glibc with + * individual mbrtowc()/wcrtomb() calls. + * + * If 'DECODER' is defined, then _wchar_utf8sntowcs() will be compiled + * as a fail-safe UTF-8 decoder appropriate for a terminal, etc. which + * needs to deal gracefully with whatever is sent to it. In that mode, + * it passes Markus Kuhn's UTF-8-test.txt stress test. I plan to add + * an arg to force that behavior, so the interface will be changing. + * + * I need to fix the error checking for 16-bit wide chars. This isn't + * an issue for uClibc, but may be for ELKS. I'm currently not sure + * if I'll use 16-bit, 32-bit, or configureable wchars in ELKS. + * + * July 1, 2002 + * + * Fixed _wchar_utf8sntowcs() for the max number of wchars == 0 case. + * Fixed nul-char bug in btowc(), and another in __mbsnrtowcs() for 8-bit + * locales. + * Enabled building of a C/POSIX-locale-only version, so full locale support + * no longer needs to be enabled. + * + * Nov 4, 2002 + * + * Fixed a bug in _wchar_wcsntoutf8s(). Don't store wcs position if dst is NULL. + * Also, introduce an awful hack into _wchar_wcsntoutf8s() and wcsrtombs() in + * order to support %ls in printf. See comments below for details. + * Change behaviour of wc<->mb functions when in the C locale. Now they do + * a 1-1 map for the range 0x80-UCHAR_MAX. This is for backwards compatibility + * and consistency with the stds requirements that a printf format string by + * a valid multibyte string beginning and ending in it's initial shift state. + * + * Nov 5, 2002 + * + * Forgot to change btowc and wctob when I changed the wc<->mb functions yesterday. + * + * Nov 7, 2002 + * + * Add wcwidth and wcswidth, based on Markus Kuhn's wcwidth of 2002-05-08. + * Added some size/speed optimizations and integrated it into my locale + * framework. Minimally tested at the moment, but the stub C-locale + * version (which most people would probably be using) should be fine. + * + * Nov 21, 2002 + * + * Revert the wc<->mb changes from earlier this month involving the C-locale. + * Add a couple of ugly hacks to support *wprintf. + * Add a mini iconv() and iconv implementation (requires locale support). + * + * Aug 1, 2003 + * Bug fix for mbrtowc. + * + * Aug 18, 2003 + * Bug fix: _wchar_utf8sntowcs and _wchar_wcsntoutf8s now set errno if EILSEQ. + * + * Feb 11, 2004 + * Bug fix: Fix size check for remaining output space in iconv(). + * + * Manuel + */ + +#include "porting.h" +#include <string.h> +#include <iconv.h> +#include <stdarg.h> +#include <libgen.h> +#include <wchar.h> +#include "wchar.c" /* for _UC_iconv_t and __iconv_codesets */ + +extern const unsigned char __iconv_codesets[]; + +#define IBUF BUFSIZ +#define OBUF BUFSIZ + +static char *progname; +static int hide_errors; + +static void error_msg(const char *fmt, ...) + __attribute__ ((noreturn, format (printf, 1, 2))); + +static void error_msg(const char *fmt, ...) +{ + va_list arg; + + if (!hide_errors) { + fprintf(stderr, "%s: ", progname); + va_start(arg, fmt); + vfprintf(stderr, fmt, arg); + va_end(arg); + } + + exit(EXIT_FAILURE); +} + +int main(int argc, char **argv) +{ + FILE *ifile; + FILE *ofile = stdout; + const char *p; + const char *s; + static const char opt_chars[] = "tfocsl"; + /* 012345 */ + const char *opts[sizeof(opt_chars)]; /* last is infile name */ + iconv_t ic; + char ibuf[IBUF]; + char obuf[OBUF]; + char *pi; + char *po; + size_t ni, no, r, pos; + + hide_errors = 0; + + for (s = opt_chars ; *s ; s++) { + opts[ s - opt_chars ] = NULL; + } + + progname = *argv; + while (--argc) { + p = *++argv; + if ((*p != '-') || (*++p == 0)) { + break; + } + do { + if ((s = strchr(opt_chars,*p)) == NULL) { + USAGE: + s = basename(progname); + fprintf(stderr, + "%s [-cs] -f fromcode -t tocode [-o outputfile] [inputfile ...]\n" + " or\n%s -l\n", s, s); + return EXIT_FAILURE; + } + if ((s - opt_chars) < 3) { + if ((--argc == 0) || opts[s - opt_chars]) { + goto USAGE; + } + opts[s - opt_chars] = *++argv; + } else { + opts[s - opt_chars] = p; + } + } while (*++p); + } + + if (opts[5]) { /* -l */ + fprintf(stderr, "Recognized codesets:\n"); + for (s = (char *)__iconv_codesets ; *s ; s += *s) { + fprintf(stderr," %s\n", s+2); + } + s = __LOCALE_DATA_CODESET_LIST; + do { + fprintf(stderr," %s\n", __LOCALE_DATA_CODESET_LIST+ (unsigned char)(*s)); + } while (*++s); + + return EXIT_SUCCESS; + } + + if (opts[4]) { + hide_errors = 1; + } + + if (!opts[0] || !opts[1]) { + goto USAGE; + } + if ((ic = iconv_open(opts[0],opts[1])) == ((iconv_t)(-1))) { + error_msg( "unsupported codeset in %s -> %s conversion\n", opts[1], opts[0]); + } + if (opts[3]) { /* -c */ + ((_UC_iconv_t *) ic)->skip_invalid_input = 1; + } + + if ((s = opts[2]) != NULL) { + if (!(ofile = fopen(s, "w"))) { + error_msg( "couldn't open %s for writing\n", s); + } + } + + pos = ni = 0; + do { + if (!argc || ((**argv == '-') && !((*argv)[1]))) { + ifile = stdin; /* we don't check for duplicates */ + } else if (!(ifile = fopen(*argv, "r"))) { + error_msg( "couldn't open %s for reading\n", *argv); + } + + while ((r = fread(ibuf + ni, 1, IBUF - ni, ifile)) > 0) { + pos += r; + ni += r; + no = OBUF; + pi = ibuf; + po = obuf; + if ((r = iconv(ic, &pi, &ni, &po, &no)) == ((size_t)(-1))) { + if ((errno != EINVAL) && (errno != E2BIG)) { + error_msg( "iconv failed at pos %lu : %m\n", (unsigned long) (pos - ni)); + } + } + if ((r = OBUF - no) > 0) { + if (fwrite(obuf, 1, OBUF - no, ofile) < r) { + error_msg( "write error\n"); + } + } + if (ni) { /* still bytes in buffer! */ + memmove(ibuf, pi, ni); + } + } + + if (ferror(ifile)) { + error_msg( "read error\n"); + } + + ++argv; + + if (ifile != stdin) { + fclose(ifile); + } + + } while (--argc > 0); + + iconv_close(ic); + + if (ni) { + error_msg( "incomplete sequence\n"); + } + + return (((_UC_iconv_t *) ic)->skip_invalid_input < 2) + ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/utils/porting.h b/utils/porting.h index b0d1f1af9..d4ead17d4 100644 --- a/utils/porting.h +++ b/utils/porting.h @@ -33,11 +33,13 @@ # include <sys/mman.h> #endif +#ifdef BUILDING_LINKAGE #include <link.h> /* makefile will include elf.h for us */ #include "bswap.h" #include "dl-defs.h" +#endif #ifdef DMALLOC #include <dmalloc.h> |