diff options
Diffstat (limited to 'stdlib/mbtowc.c')
| -rw-r--r-- | stdlib/mbtowc.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c index 50e7c09834..938d54750c 100644 --- a/stdlib/mbtowc.c +++ b/stdlib/mbtowc.c @@ -18,6 +18,8 @@ #include <stdlib.h> #include <wchar.h> +#include <gconv.h> +#include <wcsmbs/wcsmbsload.h> /* Common state for all non-restartable conversion functions. */ @@ -38,12 +40,14 @@ mbtowc (wchar_t *pwc, const char *s, size_t n) /* If S is NULL the function has to return null or not null depending on the encoding having a state depending encoding or - not. This is nonsense because any multibyte encoding has a - state. The ISO C amendment 1 corrects this while introducing the - restartable functions. We simply say here all encodings have a - state. */ + not. */ if (s == NULL) - result = 1; + { + /* Make sure we use the correct value. */ + update_conversion_ptrs (); + + result = __wcsmbs_gconv_fcts.towc->stateful; + } else if (*s == '\0') { if (pwc != NULL) |