diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-11-26 04:23:08 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-11-26 04:23:08 +0000 |
commit | f4017d205738b913f1002433cde5d4b4e93fbd81 (patch) | |
tree | 078a2f6aab0f3faf7355b41e12d8a06be81663a2 /iconvdata/iso8859-generic.c | |
parent | e34b0f2902588bbbfaf55829692e32c3c7134b74 (diff) |
Update.cvs/libc-ud-971125
1997-11-26 04:28 Ulrich Drepper <drepper@cygnus.com>
* eld/dl-profile.c (_dl_start_profile): Avoid FP calculation when
computing s_scale. Patch by a sun <asun@zoology.washington.edu>.
* iconv/gconv_close.c: Correct freeing of descriptor data.
* iconv/gconv_simple.c: Return correct error values for illegal or
incomplete characters.
* Makefile (iconvdata/%): Special goal to simplify iconvdata
development.
* iconvdata/Makefile: New file.
* iconvdata/configure: Likewise.
* iconvdata/extra-module.mk: Likewise.
* iconvdata/gconv-modules: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-10.h: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-2.h: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-3.h: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-4.h: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-5.h: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-6.h: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-7.h: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-8.h: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/iso8859-9.h: Likewise.
* iconvdata/iso8859-generic.c: Likewise.
* iconvdata/t61.c: Likewise.
* string/Makefile (routines): Add strcasestr.
* string/string.h: Add prototype for strcasestr.
* sysdeps/generic/strcasestr.c: New file.
* wcsmbs/mbrtowc.c: Simplify special case a bit.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Correctly handle incomplete characters.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Make sure SRC argument is correct when
partial character is read.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wmemrtombs.c: Likewise.
* wcsmbs/wmemrtowcs.c: Likewise.
* io/ftw.h: Include <sys/stat.h> instead of <bits/stat.h>.
* login/pty.h: Include <sys/ioctl.h> instead og <bits/ioctl-types.h>.
* sysdeps/i386/__longjmp.S: Define _SETJMP_H.
* sysdeps/i386/elf/setjmp.S: Likewise.
* sysdeps/unix/sysv/linux/kernel_termios.h: Do include
<bits/termios.h>.
* sysdeps/posix/mk-stdiolim.c: Output file with comment.
* sysdeps/unix/sysv/linux/stdio_lim.h.in: Add comment.
* sysdeps/unix/sysv/linux/sys/mman.h: Pretty print.
* sysvipc/sys/ipc.h: Likewise.
* sysvipc/sys/msg.h: Likewise.
* sysvipc/sys/sem.h: Likewise.
* sysvipc/sys/shm.h: Likewise.
* sysdeps/alpha/bits/endian.h: Issue error message if the header is
used directly.
* sysdeps/alpha/bits/setjmp.h: Likewise.
* sysdeps/alpha/fpu/bits/fenv.h: Likewise.
* sysdeps/arm/bits/endian.h: Likewise.
* sysdeps/arm/bits/setjmp.h: Likewise.
* sysdeps/generic/bits/byteswap.h: Likewise.
* sysdeps/generic/bits/confname.h: Likewise.
* sysdeps/generic/bits/dirent.h: Likewise.
* sysdeps/generic/bits/dlfcn.h: Likewise.
* sysdeps/generic/bits/endian.h: Likewise.
* sysdeps/generic/bits/fenv.h: Likewise.
* sysdeps/generic/bits/huge_val.h: Likewise.
* sysdeps/generic/bits/in.h: Likewise.
* sysdeps/generic/bits/ioctl-types.h: Likewise.
* sysdeps/generic/bits/ioctls.h: Likewise.
* sysdeps/generic/bits/ipc.h: Likewise.
* sysdeps/generic/bits/msq.h: Likewise.
* sysdeps/generic/bits/poll.h: Likewise.
* sysdeps/generic/bits/resource.h: Likewise.
* sysdeps/generic/bits/sched.h: Likewise.
* sysdeps/generic/bits/sem.h: Likewise.
* sysdeps/generic/bits/setjmp.h: Likewise.
* sysdeps/generic/bits/shm.h: Likewise.
* sysdeps/generic/bits/sigaction.h: Likewise.
* sysdeps/generic/bits/sigcontext.h: Likewise.
* sysdeps/generic/bits/socket.h: Likewise.
* sysdeps/generic/bits/stat.h: Likewise.
* sysdeps/generic/bits/statfs.h: Likewise.
* sysdeps/generic/bits/stdio_lim.h: Likewise.
* sysdeps/generic/bits/termios.h: Likewise.
* sysdeps/generic/bits/time.h: Likewise.
* sysdeps/generic/bits/uio.h: Likewise.
* sysdeps/generic/bits/utmp.h: Likewise.
* sysdeps/generic/bits/utmpx.h: Likewise.
* sysdeps/generic/bits/utsname.h: Likewise.
* sysdeps/generic/bits/waitflags.h: Likewise.
* sysdeps/generic/bits/waitstatus.h: Likewise.
* sysdeps/gnu/bits/utmp.h: Likewise.
* sysdeps/gnu/bits/utmpx.h: Likewise.
* sysdeps/i386/bits/byteswap.h: Likewise.
* sysdeps/i386/bits/endian.h: Likewise.
* sysdeps/i386/bits/huge_val.h: Likewise.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/i386/fpu/bits/fenv.h: Likewise.
* sysdeps/ieee754/bits/huge_val.h: Likewise.
* sysdeps/m68k/bits/byteswap.h: Likewise.
* sysdeps/m68k/bits/endian.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/m68k/fpu/bits/fenv.h: Likewise.
* sysdeps/mach/hurd/alpha/bits/sigcontext.h: Likewise.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
* sysdeps/mach/hurd/bits/stat.h: Likewise.
* sysdeps/mach/hurd/hppa/bits/sigcontext.h: Likewise.
* sysdeps/mach/hurd/i386/bits/sigcontext.h: Likewise.
* sysdeps/mach/hurd/mips/bits/sigcontext.h: Likewise.
* sysdeps/mips/bits/dlfcn.h: Likewise.
* sysdeps/mips/bits/endian.h: Likewise.
* sysdeps/mips/bits/setjmp.h: Likewise.
* sysdeps/mips/dec/bits/endian.h: Likewise.
* sysdeps/mips/mips64/bits/setjmp.h: Likewise.
* sysdeps/mips/mipsel/bits/endian.h: Likewise.
* sysdeps/mips/p40/bits/endian.h: Likewise.
* sysdeps/powerpc/bits/endian.h: Likewise.
* sysdeps/powerpc/bits/fenv.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/endian.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Likewise.
* sysdeps/sparc/sparc64/bits/endian.h: Likewise.
* sysdeps/sparc/sparc64/fpu/bits/fenv.h: Likewise.
* sysdeps/unix/bsd/bits/dirent.h: Likewise.
* sysdeps/unix/bsd/bits/stat.h: Likewise.
* sysdeps/unix/bsd/bits/waitflags.h: Likewise.
* sysdeps/unix/bsd/bsd4.4/bits/dirent.h: Likewise.
* sysdeps/unix/bsd/osf/alpha/bits/stat.h: Likewise.
* sysdeps/unix/bsd/osf/bits/sigaction.h: Likewise.
* sysdeps/unix/bsd/sun/m68k/bits/sigcontext.h: Likewise.
* sysdeps/unix/bsd/sun/sparc/bits/sigcontext.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/bits/resource.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/bits/termios.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/bits/utsname.h: Likewise.
* sysdeps/unix/bsd/ultrix4/bits/utsname.h: Likewise.
* sysdeps/unix/bsd/ultrix4/mips/bits/sigcontext.h: Likewise.
* sysdeps/unix/common/bits/dirent.h: Likewise.
* sysdeps/unix/sysv/bits/dirent.h: Likewise.
* sysdeps/unix/sysv/bits/stat.h: Likewise.
* sysdeps/unix/sysv/bits/utmp.h: Likewise.
* sysdeps/unix/sysv/bits/utsname.h: Likewise.
* sysdeps/unix/sysv/irix4/bits/confname.h: Likewise.
* sysdeps/unix/sysv/irix4/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/ioctls.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/termios.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/time.h: Likewise.
* sysdeps/unix/sysv/linux/bits/dirent.h: Likewise.
* sysdeps/unix/sysv/linux/bits/in.h: Likewise.
* sysdeps/unix/sysv/linux/bits/ioctl-types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/ioctls.h: Likewise.
* sysdeps/unix/sysv/linux/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/bits/poll.h: Likewise.
* sysdeps/unix/sysv/linux/bits/resource.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sched.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sigcontext.h: Likewise.
* sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/bits/statfs.h: Likewise.
* sysdeps/unix/sysv/linux/bits/termios.h: Likewise.
* sysdeps/unix/sysv/linux/bits/time.h: Likewise.
* sysdeps/unix/sysv/linux/bits/uio.h: Likewise.
* sysdeps/unix/sysv/linux/bits/utsname.h: Likewise.
* sysdeps/unix/sysv/linux/bits/waitflags.h: Likewise.
* sysdeps/unix/sysv/linux/i386/bits/mman.h: Likewise.
* sysdeps/unix/sysv/linux/m68k/bits/mman.h: Likewise.
* sysdeps/unix/sysv/linux/m68k/bits/poll.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/endian.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/mman.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/poll.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/statfs.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/termios.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/time.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/ioctl-types.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/poll.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/termios.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/bits/mman.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/mman.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/setjmp.h: Likewise.
* sysdeps/unix/sysv/minix/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sco3.2.4/bits/confname.h: Likewise.
* sysdeps/unix/sysv/sco3.2.4/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/sigaction.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/utsname.h: Likewise.
* sysdeps/unix/sysv/sysv4/bits/waitflags.h: Likewise.
* sysdeps/unix/sysv/sysv4/i386/bits/stat.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/stat.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/sparc/bits/sigcontext.h: Likewise.
* sysdeps/vax/bits/huge_val.h: Likewise.
* sysdeps/vax/bits/setjmp.h: Likewise.
* sysdeps/wordsize-32/bits/elfclass.h: Likewise.
* sysdeps/wordsize-64/bits/elfclass.h: Likewise.
1997-11-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* libio/stdio.h: Correct comment of sys_nerr/sys_errlist
1997-11-25 Paul Eggert <eggert@shade.twinsun.com>
* strftime.c (strftime):
No longer any need to undef or declare if emacs is defined.
(my_strftime): When checking a -1 returned by mktime, don't blow up
if localtime_r returns NULL.
1997-11-24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* README.template: Fix spelling.
1997-11-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* configure.in: Enhance --enable-add-ons description a wee bit.
1997-11-24 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* glibcbug.in: Add more information of build environment and flags.
1997-11-23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/posix/getcwd.c: Recognize EOF from readdir and translate
it into ENOENT.
Diffstat (limited to 'iconvdata/iso8859-generic.c')
-rw-r--r-- | iconvdata/iso8859-generic.c | 228 |
1 files changed, 228 insertions, 0 deletions
diff --git a/iconvdata/iso8859-generic.c b/iconvdata/iso8859-generic.c new file mode 100644 index 0000000000..e33e1d0a87 --- /dev/null +++ b/iconvdata/iso8859-generic.c @@ -0,0 +1,228 @@ +/* Generic conversion to and from ISO 8859-XXX. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. + + The GNU C 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. + + The GNU C 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 the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <gconv.h> +#include <stdlib.h> +#include <string.h> + +/* Direction of the transformation. */ +enum direction +{ + illegal, + to_iso8859, + from_iso8859 +}; + +struct iso8859_data +{ + enum direction dir; +}; + + +int +gconv_init (struct gconv_step *step, struct gconv_step_data *data) +{ + /* Determine which direction. */ + struct iso8859_data *new_data; + enum direction dir; + int result; + + if (__strcasestr (step->from_name, NAME) != NULL) + dir = from_iso8859; + else if (__strcasestr (step->to_name, NAME) != NULL) + dir = to_iso8859; + else + dir = illegal; + + result = GCONV_NOCONV; + if (dir != illegal + && ((new_data + = (struct iso8859_data *) malloc (sizeof (struct iso8859_data))) + != NULL)) + { + new_data->dir = dir; + data->data = new_data; + result = GCONV_OK; + } + + return result; +} + + +void +gconv_end (struct gconv_step_data *data) +{ + free (data->data); +} + + +int +gconv (struct gconv_step *step, struct gconv_step_data *data, + const char *inbuf, size_t *inbufsize, size_t *written, int do_flush) +{ + struct gconv_step *next_step = step + 1; + struct gconv_step_data *next_data = data + 1; + gconv_fct fct = next_step->fct; + size_t do_write; + int result; + + /* If the function is called with no input this means we have to reset + to the initial state. The possibly partly converted input is + dropped. */ + if (do_flush) + { + do_write = 0; + + /* Call the steps down the chain if there are any. */ + if (data->is_last) + result = GCONV_OK; + else + { + struct gconv_step *next_step = step + 1; + struct gconv_step_data *next_data = data + 1; + + result = (*fct) (next_step, next_data, NULL, 0, written, 1); + + /* Clear output buffer. */ + data->outbufavail = 0; + } + } + else + { + enum direction dir = ((struct iso8859_data *) data->data)->dir; + + do_write = 0; + + do + { + result = GCONV_OK; + + if (dir == from_iso8859) + { + size_t inchars = *inbufsize; + size_t outwchars = data->outbufavail; + char *outbuf = data->outbuf; + size_t cnt = 0; + + while (cnt < inchars + && (outwchars + sizeof (wchar_t) <= data->outbufsize)) + { + wchar_t ch = to_ucs4[(int) inbuf[cnt]]; + + if (ch == L'\0' && inbuf[cnt] != '\0') + { + /* This is an illegal character. */ + result = GCONV_ILLEGAL_INPUT; + break; + } + + *((wchar_t *) (outbuf + outwchars)) = ch; + ++do_write; + outwchars += sizeof (wchar_t); + ++cnt; + } + *inbufsize -= cnt; + data->outbufavail = outwchars; + } + else + { + size_t inwchars = *inbufsize; + size_t outchars = data->outbufavail; + char *outbuf = data->outbuf; + size_t cnt = 0; + + while (inwchars >= cnt + sizeof (wchar_t) + && outchars < data->outbufsize) + { + int ch = *((wchar_t *) (inbuf + cnt)); + + if (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]) + || ch < 0 || (from_ucs4[ch] == '\0' && ch != 0)) + break; + + outbuf[outchars] = from_ucs4[ch]; + ++do_write; + ++outchars; + cnt += sizeof (wchar_t); + } + *inbufsize -= cnt; + data->outbufavail = outchars; + + if (outchars < data->outbufsize) + { + /* If there is still room in the output buffer something + is wrong with the input. */ + if (inwchars >= cnt + sizeof (wchar_t)) + { + /* An error occurred. */ + result = GCONV_ILLEGAL_INPUT; + break; + } + if (inwchars != cnt) + { + /* There are some unprocessed bytes at the end of the + input buffer. */ + result = GCONV_INCOMPLETE_INPUT; + break; + } + } + } + + if (result != GCONV_OK) + break; + + if (data->is_last) + { + /* This is the last step. */ + result = (*inbufsize > (dir == from_iso8859 + ? 0 : sizeof (wchar_t) - 1) + ? GCONV_FULL_OUTPUT : GCONV_EMPTY_INPUT); + break; + } + + /* Status so far. */ + result = GCONV_EMPTY_INPUT; + + if (data->outbufavail > 0) + { + /* Call the functions below in the chain. */ + size_t newavail = data->outbufavail; + + result = (*fct) (next_step, next_data, data->outbuf, &newavail, + written, 0); + + /* Correct the output buffer. */ + if (newavail != data->outbufavail && newavail > 0) + { + memmove (data->outbuf, + &data->outbuf[data->outbufavail - newavail], + newavail); + data->outbufavail = newavail; + } + } + } + while (*inbufsize > 0 && result == GCONV_EMPTY_INPUT); + } + + if (written != NULL && data->is_last) + *written = do_write; + + return result; +} |