diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/mbstowcs.c | 60 | ||||
| -rw-r--r-- | stdlib/mbtowc.c | 84 | ||||
| -rw-r--r-- | stdlib/wcstombs.c | 72 | ||||
| -rw-r--r-- | stdlib/wctomb.c | 69 |
4 files changed, 75 insertions, 210 deletions
diff --git a/stdlib/mbstowcs.c b/stdlib/mbstowcs.c index 38c710279a..8eda3ba41d 100644 --- a/stdlib/mbstowcs.c +++ b/stdlib/mbstowcs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,62 +16,30 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> -#include <ctype.h> -#include <stddef.h> #include <stdlib.h> +#include <wchar.h> -extern int _mb_shift; /* Defined in mbtowc.c. */ +extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */ /* Convert the string of multibyte characters in S to `wchar_t's in PWCS, writing no more than N. Return the number written, - or (size_t) -1 if an invalid multibyte character is encountered. */ + or (size_t) -1 if an invalid multibyte character is encountered. + + Attention: this function should NEVER be intentionally used. + The interface is completely stupid. The state is shared between + all conversion functions. You should use instead the restartable + version `mbsrtowcs'. */ size_t -DEFUN(mbstowcs, (pwcs, s, n), - register wchar_t *pwcs AND register CONST char *s AND register size_t n) +mbstowcs (wchar_t *pwcs, const char *s, size_t n) { - int save_shift; - register size_t written = 0; - - /* Save the shift state. */ - save_shift = _mb_shift; - /* Reset the shift state. */ - _mb_shift = 0; - - while (*s != '\0') - { - int len; - if (isascii (*s)) - { - *pwcs = (wchar_t) *s; - len = 1; - } - else - len = mbtowc (pwcs, s, n); - - if (len < 1) - { - /* Return an error. */ - written = (size_t) -1; - break; - } - else - { - /* Multibyte character converted. */ - ++pwcs; - ++written; - s += len; - n -= len; - } - } + mbstate_t save_shift = __no_r_state; + size_t written; - /* Terminate the string if it has space. */ - if (n > 0) - *pwcs = (wchar_t) 0; + written = mbsrtowcs (pwcs, s, n, &__no_r_state); /* Restore the old shift state. */ - _mb_shift = save_shift; + __no_r_state = save_shift; /* Return how many we wrote (or maybe an error). */ return written; diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c index fd9449251c..c340dd72a6 100644 --- a/stdlib/mbtowc.c +++ b/stdlib/mbtowc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,73 +16,41 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> -#include "../locale/localeinfo.h" -#include <ctype.h> -#include <stddef.h> -#include <stdio.h> #include <stdlib.h> -#include <string.h> +#include <wchar.h> -long int _mb_shift = 0; +/* Common state for all non-restartable conversion functions. */ +mbstate_t __no_r_state; /* Convert the multibyte character at S, which is no longer than N characters, to its `wchar_t' representation, placing - this n *PWC and returning its length. */ + this n *PWC and returning its length. + + Attention: this function should NEVER be intentionally used. + The interface is completely stupid. The state is shared between + all conversion functions. You should use instead the restartable + version `mbrtowc'. */ int -DEFUN(mbtowc, (pwc, s, n), wchar_t *pwc AND CONST char *s AND size_t n) +mbtowc (wchar_t *pwc, const char *s, size_t n) { -#if 0 - register CONST mb_char *mb; - register wchar_t i; -#endif - + int result; + + /* If S is NULL the function has to return null or not null + depending on the encoding having a state depending encoding or + not. This is nonsense because any multibyte encoding has a + state. The ISO C amendment 1 corrects this while introducing the + restartable functions. We simply say here all encodings have a + state. */ if (s == NULL) - return _mb_shift != 0; - - if (*s == '\0') - /* ANSI 4.10.7.2, line 19. */ - return 0; - - if (isascii (*s)) - { - /* A normal ASCII character translates to itself. */ - if (pwc != NULL) - *pwc = (wchar_t) *s; - return 1; - } - -#if 0 - if (_ctype_info->mbchar == NULL || - _ctype_info->mbchar->mb_chars == NULL) - return -1; + return 1; - if (n > MB_CUR_MAX) - n = MB_CUR_MAX; + result = mbrtowc (pwc, s, n, &__no_r_state); - for (i = 0; i < WCHAR_MAX; ++i) - { - mb = &_ctype_info->mbchar->mb_chars[i]; - /* EOF and NUL aren't MB chars. */ - if (i == (wchar_t) EOF || i == (wchar_t) '\0') - continue; - /* Normal ASCII values can't start MB chars. */ - else if (isascii(i)) - continue; - else if (mb->string == NULL || mb->len == 0) - continue; - else if (mb->len > n) - continue; - else if (!strncmp(mb->string, s, mb->len)) - { - _mb_shift += mb->shift; - if (pwc != NULL) - *pwc = i; - return mb->len; - } - } -#endif + /* The `mbrtowc' functions tell us more than we need. Fold the -1 + and -2 result into -1. */ + if (result < 0) + result = -1; - return -1; + return result; } diff --git a/stdlib/wcstombs.c b/stdlib/wcstombs.c index 6ddbfb1725..6518308181 100644 --- a/stdlib/wcstombs.c +++ b/stdlib/wcstombs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,69 +16,31 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> -#include "../locale/localeinfo.h" -#include <ctype.h> -#include <stddef.h> -#include <stdio.h> #include <stdlib.h> -#include <string.h> +#include <wchar.h> +extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */ + /* Convert the `wchar_t' string in PWCS to a multibyte character string in S, writing no more than N characters. Return the number of bytes - written, or (size_t) -1 if an invalid `wchar_t' was found. */ + written, or (size_t) -1 if an invalid `wchar_t' was found. + + Attention: this function should NEVER be intentionally used. + The interface is completely stupid. The state is shared between + all conversion functions. You should use instead the restartable + version `wcsrtombs'. */ size_t -DEFUN(wcstombs, (s, pwcs, n), - register char *s AND register CONST wchar_t *pwcs AND register size_t n) +wcstombs (char *s, const wchar_t *pwcs, size_t n) { -#if 0 - register CONST mb_char *mb; - register int shift = 0; -#endif - - register size_t written = 0; - register wchar_t w; + mbstate_t save_shift = __no_r_state; + size_t written; - while ((w = *pwcs++) != (wchar_t) '\0') - { - if (isascii (w)) - { - /* A normal character. */ - *s++ = (unsigned char) w; - --n; - ++written; - } - else - { -#if 1 - written = (size_t) -1; - break; -#else - mb = &_ctype_info->mbchar->mb_chars[w + shift]; - if (mb->string == NULL || mb->len == 0) - { - written = (size_t) -1; - break; - } - else if (mb->len > n) - break; - else - { - memcpy ((PTR) s, (CONST PTR) mb->string, mb->len); - s += mb->len; - n -= mb->len; - written += mb->len; - shift += mb->shift; - } -#endif - } - } + written = mbsrtowcs (pwcs, s, n, &__no_r_state); - /* Terminate the string if it has space. */ - if (n > 0) - *s = '\0'; + /* Restore the old shift state. */ + __no_r_state = save_shift; - /* Return the number of characters written (or maybe an error). */ + /* Return how many we wrote (or maybe an error). */ return written; } diff --git a/stdlib/wctomb.c b/stdlib/wctomb.c index 15f32ab71f..f7143add82 100644 --- a/stdlib/wctomb.c +++ b/stdlib/wctomb.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,63 +16,30 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> -#include "../locale/localeinfo.h" -#include <stddef.h> -#include <stdio.h> #include <stdlib.h> -#include <string.h> -#include <ctype.h> +#include <wchar.h> -extern long int _mb_shift; /* Defined in mbtowc.c. */ +extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */ /* Convert WCHAR into its multibyte character representation, - putting this in S and returning its length. */ + putting this in S and returning its length. + + Attention: this function should NEVER be intentionally used. + The interface is completely stupid. The state is shared between + all conversion functions. You should use instead the restartable + version `wcrtomb'. */ int -DEFUN(wctomb, (s, wchar), register char *s AND wchar_t wchar) +wctomb (char *s, wchar_t wchar) { -#if 0 - register CONST mb_char *mb; - - if (_ctype_info->mbchar == NULL) - mb = NULL; - else - mb = _ctype_info->mbchar->mb_chars; -#endif - - /* If S is NULL, just say if we're shifted or not. */ + /* If S is NULL the function has to return null or not null + depending on the encoding having a state depending encoding or + not. This is nonsense because any multibyte encoding has a + state. The ISO C amendment 1 corrects this while introducing the + restartable functions. We simply say here all encodings have a + state. */ if (s == NULL) - return _mb_shift != 0; - - if (wchar == (wchar_t) '\0') - { - _mb_shift = 0; - /* See ANSI 4.4.1.1, line 21. */ - if (s != NULL) - *s = '\0'; - return 1; - } - else /* if (mb == NULL) */ - { - if ((wchar_t) (char) wchar == wchar && isascii ((char) wchar)) - { - /* A normal ASCII character translates to itself. */ - if (s != NULL) - *s = (char) wchar; - return 1; - } - return -1; - } + return 1; -#if 1 - return -1; -#else - mb += wchar + _mb_shift; - if (mb->string == NULL || mb->len == 0) - return -1; - memcpy((PTR) s, (CONST PTR) mb->string, mb->len + 1); - _mb_shift += mb->shift; - return mb->len; -#endif + return wcrtomb (s, wchar, &__no_r_state); } |