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 /wcsmbs | |
parent | e34b0f2902588bbbfaf55829692e32c3c7134b74 (diff) | |
download | glibc-f4017d205738b913f1002433cde5d4b4e93fbd81.zip glibc-f4017d205738b913f1002433cde5d4b4e93fbd81.tar.gz glibc-f4017d205738b913f1002433cde5d4b4e93fbd81.tar.bz2 |
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 'wcsmbs')
-rw-r--r-- | wcsmbs/mbrtowc.c | 7 | ||||
-rw-r--r-- | wcsmbs/mbsnrtowcs.c | 112 | ||||
-rw-r--r-- | wcsmbs/mbsrtowcs.c | 7 | ||||
-rw-r--r-- | wcsmbs/wcrtomb.c | 9 | ||||
-rw-r--r-- | wcsmbs/wcsnrtombs.c | 7 | ||||
-rw-r--r-- | wcsmbs/wcsrtombs.c | 11 | ||||
-rw-r--r-- | wcsmbs/wmemrtombs.c | 7 | ||||
-rw-r--r-- | wcsmbs/wmemrtowcs.c | 111 |
8 files changed, 172 insertions, 99 deletions
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c index 8b4dbe2..cf0bbd6 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. @@ -38,9 +38,8 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) if (s == NULL) { /* See first paragraph of description in 7.16.6.3.2. */ - pwc = NULL; - s = ""; - n = 1; + ps->count = 0; + return 0; } if (n > 0) diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c index bb79a30..db67d5c 100644 --- a/wcsmbs/mbsnrtowcs.c +++ b/wcsmbs/mbsnrtowcs.c @@ -43,10 +43,16 @@ __mbsnrtowcs (dst, src, nmc, len, ps) size_t written = 0; const char *run = *src; const char *last = run + nmc; + wchar_t value; + size_t count; if (ps == NULL) ps = &internal; + /* Get information from last use of this state. */ + count = ps->count; + value = ps->value; + if (dst == NULL) /* The LEN parameter has to be ignored if we don't actually write anything. */ @@ -55,57 +61,66 @@ __mbsnrtowcs (dst, src, nmc, len, ps) /* Copy all words. */ while (written < len && run < last) { - wchar_t value; - size_t count; - unsigned char byte = *run++; + unsigned char byte; - /* We expect a start of a new multibyte character. */ - if (byte < 0x80) - { - /* One byte sequence. */ - count = 0; - value = byte; - } - else if ((byte & 0xe0) == 0xc0) - { - count = 1; - value = byte & 0x1f; - } - else if ((byte & 0xf0) == 0xe0) - { - /* We expect three bytes. */ - count = 2; - value = byte & 0x0f; - } - else if ((byte & 0xf8) == 0xf0) - { - /* We expect four bytes. */ - count = 3; - value = byte & 0x07; - } - else if ((byte & 0xfc) == 0xf8) - { - /* We expect five bytes. */ - count = 4; - value = byte & 0x03; - } - else if ((byte & 0xfe) == 0xfc) - { - /* We expect six bytes. */ - count = 5; - value = byte & 0x01; - } - else + /* Store address of next byte to process. */ + *src = run; + + /* Start reading a new character only if we are in the initial + state. */ + if (count == 0) { - /* This is an illegal encoding. */ - __set_errno (EILSEQ); - return (size_t) -1; + byte = *run++; + + /* We expect a start of a new multibyte character. */ + if (byte < 0x80) + { + /* One byte sequence. */ + count = 0; + value = byte; + } + else if ((byte & 0xe0) == 0xc0) + { + count = 1; + value = byte & 0x1f; + } + else if ((byte & 0xf0) == 0xe0) + { + /* We expect three bytes. */ + count = 2; + value = byte & 0x0f; + } + else if ((byte & 0xf8) == 0xf0) + { + /* We expect four bytes. */ + count = 3; + value = byte & 0x07; + } + else if ((byte & 0xfc) == 0xf8) + { + /* We expect five bytes. */ + count = 4; + value = byte & 0x03; + } + else if ((byte & 0xfe) == 0xfc) + { + /* We expect six bytes. */ + count = 5; + value = byte & 0x01; + } + else + { + /* This is an illegal encoding. */ + __set_errno (EILSEQ); + return (size_t) -1; + } } /* Read the possible remaining bytes. */ - while (count-- > 0) + while (run < last && count > 0) { byte = *run++; + --count; if ((byte & 0xc0) != 0x80) { @@ -118,6 +133,14 @@ __mbsnrtowcs (dst, src, nmc, len, ps) value |= byte & 0x3f; } + /* If this character is only partially available remember this. */ + if (run == last && count != 0) + { + ps->count = count; + ps->value = value; + break; + } + /* Store value is required. */ if (dst != NULL) *dst++ = value; @@ -128,6 +151,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps) { /* Found the end of the string. */ *src = NULL; + ps->count = 0; return written; } diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index 7ae30b4..84d4cbf 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -52,7 +52,12 @@ __mbsrtowcs (dst, src, len, ps) { wchar_t value; size_t count; - unsigned char byte = *run++; + unsigned char byte; + + /* Store address of next byte to process. */ + *src = run; + + byte = *run++; /* We expect a start of a new multibyte character. */ if (byte < 0x80) diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index c5b887d..69c6770 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. @@ -48,8 +48,10 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) if (s == NULL) { - s = fake; - wc = L'\0'; + /* This is equivalent to wcrtomb (<<internal>, L'\0', ps). We + only have to reset the state. */ + ps->count = 0; + return 1; } /* Store the UTF8 representation of WC. */ @@ -65,6 +67,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) /* It's a one byte sequence. */ if (s != NULL) *s = (char) wc; + ps->count = 0; return 1; } diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c index ddd4e95..f6c8048 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.c @@ -63,7 +63,12 @@ __wcsnrtombs (dst, src, nwc, len, ps) while (written < len && nwc-- > 0) { - wchar_t wc = *run++; + wchar_t wc; + + /* Store position of first unprocessed word. */ + *src = run; + + wc = *run++; if (wc < 0 || wc > 0x7fffffff) { diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index b2c0c73..cc21a51 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -59,7 +59,12 @@ __wcsrtombs (dst, src, len, ps) while (written < len) { - wchar_t wc = *run++; + wchar_t wc; + + /* Store position of first unprocessed word. */ + *src = run; + + wc = *run++; if (wc < 0 || wc > 0x7fffffff) { @@ -73,6 +78,7 @@ __wcsrtombs (dst, src, len, ps) /* Found the end. */ if (dst != NULL) *dst = '\0'; + ps->count = 0; *src = NULL; return written; } @@ -120,6 +126,9 @@ __wcsrtombs (dst, src, len, ps) /* Store position of first unprocessed word. */ *src = run; + /* Signal that we finished correctly. */ + ps->count = 0; + return written; } weak_alias (__wcsrtombs, wcsrtombs) diff --git a/wcsmbs/wmemrtombs.c b/wcsmbs/wmemrtombs.c index 2bbd667..5b8e39c 100644 --- a/wcsmbs/wmemrtombs.c +++ b/wcsmbs/wmemrtombs.c @@ -63,7 +63,12 @@ __wmemrtombs (dst, src, nwc, len, ps) while (written < len && nwc-- > 0) { - wchar_t wc = *run++; + wchar_t wc; + + /* Store position of first unprocessed word. */ + *src = run; + + wc = *run++; if (wc < 0 || wc > 0x7fffffff) { diff --git a/wcsmbs/wmemrtowcs.c b/wcsmbs/wmemrtowcs.c index 1686229..4efdd72 100644 --- a/wcsmbs/wmemrtowcs.c +++ b/wcsmbs/wmemrtowcs.c @@ -43,10 +43,16 @@ __wmemrtowcs (dst, src, nmc, len, ps) size_t written = 0; const char *run = *src; const char *last = run + nmc; + wchar_t value; + size_t count; if (ps == NULL) ps = &internal; + /* Get information from last use of this state. */ + count = ps->count; + value = ps->value; + if (dst == NULL) /* The LEN parameter has to be ignored if we don't actually write anything. */ @@ -55,57 +61,66 @@ __wmemrtowcs (dst, src, nmc, len, ps) /* Copy all words. */ while (written < len && run < last) { - wchar_t value; - size_t count; - unsigned char byte = *run++; + unsigned char byte; - /* We expect a start of a new multibyte character. */ - if (byte < 0x80) - { - /* One byte sequence. */ - count = 0; - value = byte; - } - else if ((byte & 0xe0) == 0xc0) - { - count = 1; - value = byte & 0x1f; - } - else if ((byte & 0xf0) == 0xe0) - { - /* We expect three bytes. */ - count = 2; - value = byte & 0x0f; - } - else if ((byte & 0xf8) == 0xf0) - { - /* We expect four bytes. */ - count = 3; - value = byte & 0x07; - } - else if ((byte & 0xfc) == 0xf8) - { - /* We expect five bytes. */ - count = 4; - value = byte & 0x03; - } - else if ((byte & 0xfe) == 0xfc) - { - /* We expect six bytes. */ - count = 5; - value = byte & 0x01; - } - else + /* Store address of next byte to process. */ + *src = run; + + /* Start reading a new character only if we are in the initial + state. */ + if (count == 0) { - /* This is an illegal encoding. */ - __set_errno (EILSEQ); - return (size_t) -1; + byte = *run++; + + /* We expect a start of a new multibyte character. */ + if (byte < 0x80) + { + /* One byte sequence. */ + count = 0; + value = byte; + } + else if ((byte & 0xe0) == 0xc0) + { + count = 1; + value = byte & 0x1f; + } + else if ((byte & 0xf0) == 0xe0) + { + /* We expect three bytes. */ + count = 2; + value = byte & 0x0f; + } + else if ((byte & 0xf8) == 0xf0) + { + /* We expect four bytes. */ + count = 3; + value = byte & 0x07; + } + else if ((byte & 0xfc) == 0xf8) + { + /* We expect five bytes. */ + count = 4; + value = byte & 0x03; + } + else if ((byte & 0xfe) == 0xfc) + { + /* We expect six bytes. */ + count = 5; + value = byte & 0x01; + } + else + { + /* This is an illegal encoding. */ + __set_errno (EILSEQ); + return (size_t) -1; + } } /* Read the possible remaining bytes. */ - while (count-- > 0) + while (run < last && count > 0) { byte = *run++; + --count; if ((byte & 0xc0) != 0x80) { @@ -118,6 +133,14 @@ __wmemrtowcs (dst, src, nmc, len, ps) value |= byte & 0x3f; } + /* If this character is only partially available remember this. */ + if (run == last && count != 0) + { + ps->count = count; + ps->value = value; + break; + } + /* Store value is required. */ if (dst != NULL) *dst++ = value; |