Module Name: src
Committed By: joerg
Date: Thu Apr 18 22:22:21 UTC 2013
Modified Files:
src/include: stdlib.h
src/lib/libc/locale: multibyte_c90.c
Log Message:
Add mblen_l, mbstowcs_l, wctomb_l, mbtowc_l and wcstombs_l.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/include/stdlib.h
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/locale/multibyte_c90.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/stdlib.h
diff -u src/include/stdlib.h:1.102 src/include/stdlib.h:1.103
--- src/include/stdlib.h:1.102 Thu Apr 18 21:54:10 2013
+++ src/include/stdlib.h Thu Apr 18 22:22:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stdlib.h,v 1.102 2013/04/18 21:54:10 joerg Exp $ */
+/* $NetBSD: stdlib.h,v 1.103 2013/04/18 22:22:20 joerg Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -351,7 +351,17 @@ unsigned long long int
# if defined(_NETBSD_SOURCE)
quad_t strtoq_l(const char * __restrict, char ** __restrict, int, locale_t);
u_quad_t strtouq_l(const char * __restrict, char ** __restrict, int, locale_t);
-# endif
+
+int mblen_l(const char *, size_t, locale_t);
+size_t mbstowcs_l(wchar_t * __restrict, const char * __restrict, size_t,
+ locale_t);
+int wctomb_l(char *, wchar_t, locale_t);
+int mbtowc_l(wchar_t * __restrict, const char * __restrict, size_t,
+ locale_t);
+size_t wcstombs_l(char * __restrict, const wchar_t * __restrict, size_t,
+ locale_t);
+
+# endif /* _NETBSD_SOURCE */
#endif /* _POSIX_C_SOURCE >= 200809 || _NETBSD_SOURCE */
__END_DECLS
Index: src/lib/libc/locale/multibyte_c90.c
diff -u src/lib/libc/locale/multibyte_c90.c:1.8 src/lib/libc/locale/multibyte_c90.c:1.9
--- src/lib/libc/locale/multibyte_c90.c:1.8 Sun Jun 13 04:14:57 2010
+++ src/lib/libc/locale/multibyte_c90.c Thu Apr 18 22:22:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: multibyte_c90.c,v 1.8 2010/06/13 04:14:57 tnozaki Exp $ */
+/* $NetBSD: multibyte_c90.c,v 1.9 2013/04/18 22:22:21 joerg Exp $ */
/*-
* Copyright (c)2002, 2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: multibyte_c90.c,v 1.8 2010/06/13 04:14:57 tnozaki Exp $");
+__RCSID("$NetBSD: multibyte_c90.c,v 1.9 2013/04/18 22:22:21 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -46,73 +46,116 @@ __RCSID("$NetBSD: multibyte_c90.c,v 1.8
#include "citrus_ctype.h"
#include "runetype_local.h"
-#define _RUNE_LOCALE() \
- ((_RuneLocale *)(*_current_locale())->part_impl[(size_t)LC_CTYPE])
-
-#define _CITRUS_CTYPE() \
- (_RUNE_LOCALE()->rl_citrus_ctype)
+#define _CITRUS_CTYPE(loc) \
+ (((_RuneLocale *)((loc)->part_impl[(size_t)LC_CTYPE]))->rl_citrus_ctype)
int
-mblen(const char *s, size_t n)
+mblen_l(const char *s, size_t n, locale_t loc)
{
int ret;
int err0;
- err0 = _citrus_ctype_mblen(_CITRUS_CTYPE(), s, n, &ret);
+ if (loc == NULL)
+ loc = _C_locale;
+
+ err0 = _citrus_ctype_mblen(_CITRUS_CTYPE(loc), s, n, &ret);
if (err0)
errno = err0;
return ret;
}
+
+int
+mblen(const char *s, size_t n)
+{
+ return mblen_l(s, n, *_current_locale());
+}
+
size_t
-mbstowcs(wchar_t *pwcs, const char *s, size_t n)
+mbstowcs_l(wchar_t *pwcs, const char *s, size_t n, locale_t loc)
{
size_t ret;
int err0;
- err0 = _citrus_ctype_mbstowcs(_CITRUS_CTYPE(), pwcs, s, n, &ret);
+ if (loc == NULL)
+ loc = _C_locale;
+
+ err0 = _citrus_ctype_mbstowcs(_CITRUS_CTYPE(loc), pwcs, s, n, &ret);
if (err0)
errno = err0;
return ret;
}
+size_t
+mbstowcs(wchar_t *pwcs, const char *s, size_t n)
+{
+ return mbstowcs_l(pwcs, s, n, *_current_locale());
+}
+
int
-mbtowc(wchar_t *pw, const char *s, size_t n)
+mbtowc_l(wchar_t *pw, const char *s, size_t n, locale_t loc)
{
int ret;
int err0;
- err0 = _citrus_ctype_mbtowc(_CITRUS_CTYPE(), pw, s, n, &ret);
+ if (loc == NULL)
+ loc = _C_locale;
+
+ err0 = _citrus_ctype_mbtowc(_CITRUS_CTYPE(loc), pw, s, n, &ret);
if (err0)
errno = err0;
return ret;
}
+int
+mbtowc(wchar_t *pw, const char *s, size_t n)
+{
+ return mbtowc_l(pw, s, n, *_current_locale());
+}
+
size_t
-wcstombs(char *s, const wchar_t *wcs, size_t n)
+wcstombs_l(char *s, const wchar_t *wcs, size_t n, locale_t loc)
{
size_t ret;
int err0;
- err0 = _citrus_ctype_wcstombs(_CITRUS_CTYPE(), s, wcs, n, &ret);
+ if (loc == NULL)
+ loc = _C_locale;
+
+ err0 = _citrus_ctype_wcstombs(_CITRUS_CTYPE(loc), s, wcs, n, &ret);
if (err0)
errno = err0;
return ret;
}
+size_t
+wcstombs(char *s, const wchar_t *wcs, size_t n)
+{
+ return wcstombs_l(s, wcs, n, *_current_locale());
+}
+
int
-wctomb(char *s, wchar_t wc)
+wctomb_l(char *s, wchar_t wc, locale_t loc)
{
int ret;
int err0;
- err0 = _citrus_ctype_wctomb(_CITRUS_CTYPE(), s, wc, &ret);
+ if (loc == NULL)
+ loc = _C_locale;
+
+ err0 = _citrus_ctype_wctomb(_CITRUS_CTYPE(loc), s, wc, &ret);
if (err0)
errno = err0;
return ret;
}
+
+int
+wctomb(char *s, wchar_t wc)
+{
+ return wctomb_l(s, wc, *_current_locale());
+}
