From e34b0f2902588bbbfaf55829692e32c3c7134b74 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 24 Nov 1997 02:08:40 +0000 Subject: Update. 1997-11-24 03:01 Ulrich Drepper * elf/dl-support.c: Call __libc_init_secure to make sure __libc_enable_secure is defined early. * sysdeps/generic/enbl-secure.c: Change function name to __libc_init_secure and make it global instead of a constructor. * iconv/gconv.c: Fix lots of bugs. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.h: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * wcsmbs/Makefile (routines): Add wmemrtowcs and wmemrtombs. * wcsmbs/wchar.h: Add prototypes for wmemrtowcs and wmemrtombs. * wcsmbs/wmemrtombs.c: New file. * wcsmbs/wmemrtowcs.c: New file. --- wcsmbs/Makefile | 2 +- wcsmbs/wchar.h | 20 ++++++++ wcsmbs/wmemrtombs.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ wcsmbs/wmemrtowcs.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 276 insertions(+), 1 deletion(-) create mode 100644 wcsmbs/wmemrtombs.c create mode 100644 wcsmbs/wmemrtowcs.c (limited to 'wcsmbs') diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 985f5957f9..5dd46da551 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -29,7 +29,7 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ wmemcmp wmemcpy wmemmove wmemset wcpcpy wcpncpy \ btowc wctob mbsinit \ mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs \ - mbsnrtowcs wcsnrtombs \ + mbsnrtowcs wcsnrtombs wmemrtowcs wmemrtombs \ wcstol wcstoul wcstoll wcstoull wcstod wcstold wcstof \ wcstol_l wcstoul_l wcstoll_l wcstoull_l \ wcstod_l wcstold_l wcstof_l \ diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 966d20cba1..4c8f9a4dcf 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -253,6 +253,16 @@ extern size_t mbsnrtowcs __P ((wchar_t *__restrict __dst, __const char **__restrict __src, size_t __nmc, size_t __len, mbstate_t *__restrict __ps)); +/* Similar function to the above but this does not stop at NUL bytes. */ +extern size_t __wmemrtowcs __P ((wchar_t *__restrict __dst, + __const char **__restrict __src, + size_t __nmc, size_t __len, + mbstate_t *__restrict __ps)); +extern size_t wmemrtowcs __P ((wchar_t *__restrict __dst, + __const char **__restrict __src, + size_t __nmc, size_t __len, + mbstate_t *__restrict __ps)); + /* Write multibyte character representation of at most NWC characters from the wide character string SRC to DST. */ extern size_t __wcsnrtombs __P ((char *__restrict __dst, @@ -264,6 +274,16 @@ extern size_t wcsnrtombs __P ((char *__restrict __dst, size_t __nwc, size_t __len, mbstate_t *__restrict __ps)); +/* Similar function to the above but this does not stop at NUL bytes. */ +extern size_t __wmemrtombs __P ((char *__restrict __dst, + __const wchar_t **__restrict __src, + size_t __nwc, size_t len, + mbstate_t *__restrict __ps)); +extern size_t wmemrtombs __P ((char *__restrict __dst, + __const wchar_t **__restrict __src, + size_t __nwc, size_t len, + mbstate_t *__restrict __ps)); + /* The following functions are extensions found in X/Open CAE. */ diff --git a/wcsmbs/wmemrtombs.c b/wcsmbs/wmemrtombs.c new file mode 100644 index 0000000000..2bbd66788e --- /dev/null +++ b/wcsmbs/wmemrtombs.c @@ -0,0 +1,121 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 +#include + +#ifndef EILSEQ +#define EILSEQ EINVAL +#endif + + +static const wchar_t encoding_mask[] = +{ + ~0x7ff, ~0xffff, ~0x1fffff, ~0x3ffffff +}; + +static const unsigned char encoding_byte[] = +{ + 0xc0, 0xe0, 0xf0, 0xf8, 0xfc +}; + +/* We don't need the state really because we don't have shift states + to maintain between calls to this function. */ +static mbstate_t internal; + +/* This is a non-standard function but it is very useful in the + implementation of stdio because we have to deal with unterminated + buffers. At most NWC wide character will be converted. */ +size_t +__wmemrtombs (dst, src, nwc, len, ps) + char *dst; + const wchar_t **src; + size_t nwc; + size_t len; + mbstate_t *ps; +{ + size_t written = 0; + const wchar_t *run = *src; + + if (ps == NULL) + ps = &internal; + + if (dst == NULL) + /* The LEN parameter has to be ignored if we don't actually write + anything. */ + len = ~0; + + while (written < len && nwc-- > 0) + { + wchar_t wc = *run++; + + if (wc < 0 || wc > 0x7fffffff) + { + /* This is no correct ISO 10646 character. */ + __set_errno (EILSEQ); + return (size_t) -1; + } + + if (wc < 0x80) + { + /* It's an one byte sequence. */ + if (dst != NULL) + *dst++ = (char) wc; + ++written; + } + else + { + size_t step; + + for (step = 2; step < 6; ++step) + if ((wc & encoding_mask[step - 2]) == 0) + break; + + if (written + step >= len) + /* Too long. */ + break; + + if (dst != NULL) + { + size_t cnt = step; + + dst[0] = encoding_byte[cnt - 2]; + + --cnt; + do + { + dst[cnt] = 0x80 | (wc & 0x3f); + wc >>= 6; + } + while (--cnt > 0); + dst[0] |= wc; + + dst += step; + } + + written += step; + } + } + + /* Store position of first unprocessed word. */ + *src = run; + + return written; +} +weak_alias (__wmemrtombs, wmemrtombs) diff --git a/wcsmbs/wmemrtowcs.c b/wcsmbs/wmemrtowcs.c new file mode 100644 index 0000000000..1686229b8f --- /dev/null +++ b/wcsmbs/wmemrtowcs.c @@ -0,0 +1,134 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 +#include + +#ifndef EILSEQ +#define EILSEQ EINVAL +#endif + + +/* We don't need the state really because we don't have shift states + to maintain between calls to this function. */ +static mbstate_t internal; + +/* This is a non-standard function but it is very useful in the + implementation of stdio because we have to deal with unterminated + buffers. At most NMC bytes will be converted. */ +size_t +__wmemrtowcs (dst, src, nmc, len, ps) + wchar_t *dst; + const char **src; + size_t nmc; + size_t len; + mbstate_t *ps; +{ + size_t written = 0; + const char *run = *src; + const char *last = run + nmc; + + if (ps == NULL) + ps = &internal; + + if (dst == NULL) + /* The LEN parameter has to be ignored if we don't actually write + anything. */ + len = ~0; + + /* Copy all words. */ + while (written < len && run < last) + { + wchar_t value; + size_t count; + unsigned char 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) + { + byte = *run++; + + if ((byte & 0xc0) != 0x80) + { + /* This is an illegal encoding. */ + __set_errno (EILSEQ); + return (size_t) -1; + } + + value <<= 6; + value |= byte & 0x3f; + } + + /* Store value is required. */ + if (dst != NULL) + *dst++ = value; + + /* Increment counter of produced words. */ + ++written; + } + + /* Store address of next byte to process. */ + *src = run; + + return written; +} +weak_alias (__wmemrtowcs, wmemrtowcs) -- cgit 1.4.1