X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmultibyte%2Fmbrtowc.c;h=ca7da700ed7f0ec7d4b34d982625b8cb7bef0ee5;hb=4260dfe1ecc43d92d1e6d30daa0f22bd746d1740;hp=db803661411519744cb195a802ef52093d0ce4a9;hpb=23ab8c255543a7e0876c7e1858ef0d4bbd562729;p=musl

diff --git a/src/multibyte/mbrtowc.c b/src/multibyte/mbrtowc.c
index db803661..ca7da700 100644
--- a/src/multibyte/mbrtowc.c
+++ b/src/multibyte/mbrtowc.c
@@ -5,10 +5,8 @@
  */
 
 #include <stdlib.h>
-#include <inttypes.h>
 #include <wchar.h>
 #include <errno.h>
-
 #include "internal.h"
 
 size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate_t *restrict st)
@@ -17,6 +15,7 @@ size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate
 	unsigned c;
 	const unsigned char *s = (const void *)src;
 	const unsigned N = n;
+	wchar_t dummy;
 
 	if (!st) st = (void *)&internal_state;
 	c = *(unsigned *)st;
@@ -24,11 +23,12 @@ size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate
 	if (!s) {
 		if (c) goto ilseq;
 		return 0;
-	} else if (!wc) wc = (void *)&wc;
+	} else if (!wc) wc = &dummy;
 
 	if (!n) return -2;
 	if (!c) {
 		if (*s < 0x80) return !!(*wc = *s);
+		if (MB_CUR_MAX==1) return (*wc = CODEUNIT(*s)), 1;
 		if (*s-SA > SB-SA) goto ilseq;
 		c = bittab[*s++-SA]; n--;
 	}