diff options
| author | Dan Bornstein <danfuzz@android.com> | 2010-03-03 10:51:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-03 10:51:34 -0800 |
| commit | 71fbeecdbd7bcf2282e4b032ceb2f6ead13dc9cb (patch) | |
| tree | 614c8284cd1c609dcc2ebc540ccd77b2a7ff5481 | |
| parent | f197147a787d7415e6e0a1bad15566836c55befb (diff) | |
| parent | fd5b1bb85d0a971fd8469112a157380c4d3a146f (diff) | |
| download | bionic-71fbeecdbd7bcf2282e4b032ceb2f6ead13dc9cb.zip bionic-71fbeecdbd7bcf2282e4b032ceb2f6ead13dc9cb.tar.gz bionic-71fbeecdbd7bcf2282e4b032ceb2f6ead13dc9cb.tar.bz2 | |
am fd5b1bb8: Add stdlib functions mbstowcs() and wcstombs(). DO NOT MERGE.
Merge commit 'fd5b1bb85d0a971fd8469112a157380c4d3a146f' into eclair-mr2-plus-aosp
* commit 'fd5b1bb85d0a971fd8469112a157380c4d3a146f':
Add stdlib functions mbstowcs() and wcstombs(). DO NOT MERGE.
| -rw-r--r-- | libc/include/wchar.h | 2 | ||||
| -rw-r--r-- | libc/stdlib/wchar.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libc/include/wchar.h b/libc/include/wchar.h index e2feb60..97e1b5c 100644 --- a/libc/include/wchar.h +++ b/libc/include/wchar.h @@ -100,6 +100,7 @@ extern int mbsinit(const mbstate_t *); extern size_t mbrlen(const char *, size_t, mbstate_t *); extern size_t mbrtowc(wchar_t *, const char *, size_t, mbstate_t *); extern size_t mbsrtowcs(wchar_t *, const char **, size_t, mbstate_t *); +extern size_t mbstowcs(wchar_t *, const char *, size_t); extern wint_t putwc(wchar_t, FILE *); extern wint_t putwchar(wchar_t); extern int swprintf(wchar_t *, size_t, const wchar_t *, ...); @@ -130,6 +131,7 @@ extern wchar_t *wcsstr(const wchar_t *, const wchar_t *); extern double wcstod(const wchar_t *, wchar_t **); extern wchar_t *wcstok(wchar_t *, const wchar_t *, wchar_t **); extern long int wcstol(const wchar_t *, wchar_t **, int); +extern size_t wcstombs(char *, const wchar_t *, size_t); extern unsigned long int wcstoul(const wchar_t *, wchar_t **, int); extern wchar_t *wcswcs(const wchar_t *, const wchar_t *); extern int wcswidth(const wchar_t *, size_t); diff --git a/libc/stdlib/wchar.c b/libc/stdlib/wchar.c index d805333..7722b34 100644 --- a/libc/stdlib/wchar.c +++ b/libc/stdlib/wchar.c @@ -227,6 +227,11 @@ size_t mbsrtowcs(wchar_t *dst, const char **src, size_t len, mbstate_t *ps) return len; } +size_t mbstowcs(wchar_t *dst, const char *src, size_t len) +{ + return mbsrtowcs(dst, &src, len, NULL); +} + wint_t putwc(wchar_t wc, FILE *stream) { return fputc((char)wc, stream); @@ -339,6 +344,11 @@ size_t wcsrtombs(char *dst, const wchar_t **src, size_t len, mbstate_t *ps) return len; } +size_t wcstombs(char *dst, const wchar_t *src, size_t len) +{ + return wcsrtombs(dst, &src, len, NULL); +} + size_t wcsspn(const wchar_t *ws1, const wchar_t *ws2) { return strspn( (const char*)ws1, (const char*)ws2 ); |