generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am fd5b1bb8: Add stdlib functions mbstowcs() and wcstombs(). DO NOT MERGE.

Browse Source 
Merge commit 'fd5b1bb85d0a971fd8469112a157380c4d3a146f' into eclair-mr2-plus-aosp

* commit 'fd5b1bb85d0a971fd8469112a157380c4d3a146f':
  Add stdlib functions mbstowcs() and wcstombs(). DO NOT MERGE.
This commit is contained in:
Dan Bornstein
2010-03-03 10:51:34 -08:00
committed by Android Git Automerger
parent f197147a78 fd5b1bb85d
commit 71fbeecdbd
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/wchar.h
View File

@@ -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);

10
libc/stdlib/wchar.c
View File

@@ -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 );