diff options
| -rw-r--r-- | lib/libc/locale/Makefile.inc | 5 | ||||
| -rw-r--r-- | lib/libc/locale/mbrtowc_sb.c | 68 | ||||
| -rw-r--r-- | lib/libc/locale/multibyte_sb.c | 32 |
3 files changed, 73 insertions, 32 deletions
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc index da965f5a11d..c494df24fad 100644 --- a/lib/libc/locale/Makefile.inc +++ b/lib/libc/locale/Makefile.inc @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.8 2005/07/01 08:59:27 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2005/07/24 09:50:49 espie Exp $ # locale sources .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/locale ${LIBCSRCDIR}/locale SRCS+= _def_messages.c _def_monetary.c _def_numeric.c _def_time.c \ - localeconv.c nl_langinfo.c setlocale.c iswctype_sb.c multibyte_sb.c \ + localeconv.c nl_langinfo.c setlocale.c iswctype_sb.c mbrtowc_sb.c \ + multibyte_sb.c \ __mb_cur_max.c wcstod.c wcstol.c wcstoul.c wcstoll.c wcstoull.c MAN+= nl_langinfo.3 setlocale.3 iswalnum.3 towlower.3 \ diff --git a/lib/libc/locale/mbrtowc_sb.c b/lib/libc/locale/mbrtowc_sb.c new file mode 100644 index 00000000000..3b0039b0755 --- /dev/null +++ b/lib/libc/locale/mbrtowc_sb.c @@ -0,0 +1,68 @@ +/* $OpenBSD: mbrtowc_sb.c,v 1.1 2005/07/24 09:50:49 espie Exp $ */ +/* $NetBSD: multibyte_sb.c,v 1.4 2003/08/07 16:43:04 agc Exp $ */ + +/* + * Copyright (c) 1991 The Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. 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 + * 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 + * 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) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char rcsid[] = "$OpenBSD: mbrtowc_sb.c,v 1.1 2005/07/24 09:50:49 espie Exp $"; +#endif /* LIBC_SCCS and not lint */ + +#include <errno.h> +#include <stdlib.h> +#include <wchar.h> + +/*ARGSUSED*/ +size_t +mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) +{ + + /* pwc may be NULL */ + /* s may be NULL */ + /* ps appears to be unused */ + + if (s == NULL) + return 0; + if (n == 0) + return -1; + if (pwc) + *pwc = (wchar_t) *s; + return (*s != '\0'); +} + +int +mbtowc(wchar_t *pwc, const char *s, size_t n) +{ + + /* pwc may be NULL */ + /* s may be NULL */ + + return mbrtowc(pwc, s, n, NULL); +} + diff --git a/lib/libc/locale/multibyte_sb.c b/lib/libc/locale/multibyte_sb.c index 3213766e84b..748601526d4 100644 --- a/lib/libc/locale/multibyte_sb.c +++ b/lib/libc/locale/multibyte_sb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: multibyte_sb.c,v 1.2 2005/06/17 20:40:32 espie Exp $ */ +/* $OpenBSD: multibyte_sb.c,v 1.3 2005/07/24 09:50:49 espie Exp $ */ /* $NetBSD: multibyte_sb.c,v 1.4 2003/08/07 16:43:04 agc Exp $ */ /* @@ -31,7 +31,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: multibyte_sb.c,v 1.2 2005/06/17 20:40:32 espie Exp $"; +static char rcsid[] = "$OpenBSD: multibyte_sb.c,v 1.3 2005/07/24 09:50:49 espie Exp $"; #endif /* LIBC_SCCS and not lint */ #include <errno.h> @@ -77,34 +77,6 @@ mblen(const char *s, size_t n) /*ARGSUSED*/ size_t -mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) -{ - - /* pwc may be NULL */ - /* s may be NULL */ - /* ps appears to be unused */ - - if (s == NULL) - return 0; - if (n == 0) - return -1; - if (pwc) - *pwc = (wchar_t) *s; - return (*s != '\0'); -} - -int -mbtowc(wchar_t *pwc, const char *s, size_t n) -{ - - /* pwc may be NULL */ - /* s may be NULL */ - - return mbrtowc(pwc, s, n, NULL); -} - -/*ARGSUSED*/ -size_t wcrtomb(char *s, wchar_t wchar, mbstate_t *ps) { |