diff options
author | tjr <tjr@FreeBSD.org> | 2003-08-07 08:04:01 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2003-08-07 08:04:01 +0000 |
commit | 84d24ef34087646f92d050bb9b2b5bc9df7b6bd0 (patch) | |
tree | 9904d2ee510aeec6287a6fe1a5131d42345ed17d /lib/libc/locale/mbstowcs.c | |
parent | 0dae1482723408fa760bf4b8cf973955a4b195a1 (diff) | |
download | FreeBSD-src-84d24ef34087646f92d050bb9b2b5bc9df7b6bd0.zip FreeBSD-src-84d24ef34087646f92d050bb9b2b5bc9df7b6bd0.tar.gz |
Implement mbstowcs() as a wrapper around mbsrtowcs(), and wcstombs()
as a wrapper around wcsrtombs().
Diffstat (limited to 'lib/libc/locale/mbstowcs.c')
-rw-r--r-- | lib/libc/locale/mbstowcs.c | 68 |
1 files changed, 12 insertions, 56 deletions
diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c index 7fd8663..419c1d3 100644 --- a/lib/libc/locale/mbstowcs.c +++ b/lib/libc/locale/mbstowcs.c @@ -1,9 +1,6 @@ /*- - * Copyright (c) 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Paul Borman at Krystal Technologies. + * Copyright (c) 2002, 2003 Tim J. Robbins. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -13,18 +10,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -37,52 +27,18 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <errno.h> #include <stdlib.h> -#include <limits.h> -#include <stddef.h> -#include <rune.h> +#include <string.h> +#include <wchar.h> size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n) { - const char *e; - int cnt; - rune_t r; - - if (s == NULL) { - errno = EINVAL; - return (-1); - } - - if (pwcs == NULL) { - /* Convert and count only, do not store. */ - cnt = 0; - while ((r = sgetrune(s, MB_LEN_MAX, &e)) != _INVALID_RUNE && - r != 0) { - s = e; - cnt++; - } - if (r == _INVALID_RUNE) { - errno = EILSEQ; - return (-1); - } - return (cnt); - } - - /* Convert, store and count characters. */ - cnt = 0; - while (n-- > 0) { - *pwcs = sgetrune(s, MB_LEN_MAX, &e); - if (*pwcs == _INVALID_RUNE) { - errno = EILSEQ; - return (-1); - } - if (*pwcs++ == L'\0') - break; - s = e; - ++cnt; - } - return (cnt); + /* + * We pass NULL as the state pointer to mbsrtowcs() because we don't + * support state-dependent encodings and don't want to waste time + * creating a zeroed mbstate_t that will not be used. + */ + return (mbsrtowcs(pwcs, &s, n, NULL)); } |