diff options
Diffstat (limited to 'stdlib/mbstowcs.c')
| -rw-r--r-- | stdlib/mbstowcs.c | 60 |
1 files changed, 14 insertions, 46 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; |