X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmultibyte%2Fmbrtowc.c;h=db803661411519744cb195a802ef52093d0ce4a9;hb=062446a85db9b58b4900df82e17cb8c07ec50453;hp=a354573a1bde6100021808000dbb50643de21c86;hpb=f9d880d25893dbf4caaa2f4e0c4d9bc8c1aea22a;p=musl

diff --git a/src/multibyte/mbrtowc.c b/src/multibyte/mbrtowc.c
index a354573a..db803661 100644
--- a/src/multibyte/mbrtowc.c
+++ b/src/multibyte/mbrtowc.c
@@ -11,7 +11,7 @@
 
 #include "internal.h"
 
-size_t mbrtowc(wchar_t *wc, const char *src, size_t n, mbstate_t *st)
+size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate_t *restrict st)
 {
 	static unsigned internal_state;
 	unsigned c;
@@ -22,9 +22,8 @@ size_t mbrtowc(wchar_t *wc, const char *src, size_t n, mbstate_t *st)
 	c = *(unsigned *)st;
 	
 	if (!s) {
-		s = "";
-		wc = (void *)&wc;
-		n = 1;
+		if (c) goto ilseq;
+		return 0;
 	} else if (!wc) wc = (void *)&wc;
 
 	if (!n) return -2;
@@ -52,7 +51,7 @@ loop:
 	*(unsigned *)st = c;
 	return -2;
 ilseq:
-	*(unsigned *)st = FAILSTATE;
+	*(unsigned *)st = 0;
 	errno = EILSEQ;
 	return -1;
 }