X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmultibyte%2Fmbrtowc.c;h=c94819e720aac361c70bb61e409ac217b303fdf9;hb=595416b11dfbc82d40a59d0edd7e3b04ba7a2d6d;hp=09badebec20e5959f52844e22f5157bf77176ae2;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/multibyte/mbrtowc.c b/src/multibyte/mbrtowc.c
index 09badebe..c94819e7 100644
--- a/src/multibyte/mbrtowc.c
+++ b/src/multibyte/mbrtowc.c
@@ -1,36 +1,29 @@
-/* 
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
 #include <stdlib.h>
-#include <inttypes.h>
 #include <wchar.h>
 #include <errno.h>
-
 #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;
-	const unsigned char *s = src;
+	const unsigned char *s = (const void *)src;
 	const unsigned N = n;
+	wchar_t dummy;
 
 	if (!st) st = (void *)&internal_state;
 	c = *(unsigned *)st;
 	
 	if (!s) {
-		s = "";
-		wc = (void *)&wc;
-		n = 1;
-	} else if (!wc) wc = (void *)&wc;
+		if (c) goto ilseq;
+		return 0;
+	} else if (!wc) wc = &dummy;
 
 	if (!n) return -2;
 	if (!c) {
-		if ((unsigned)*s < 0x80) return !!(*wc = *s);
-		if ((unsigned)*s-SA > SB-SA) goto ilseq;
+		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--;
 	}
 
@@ -44,7 +37,7 @@ loop:
 			return N-n;
 		}
 		if (n) {
-			if ((unsigned)*s-0x80 >= 0x40) goto ilseq;
+			if (*s-0x80u >= 0x40) goto ilseq;
 			goto loop;
 		}
 	}
@@ -52,7 +45,7 @@ loop:
 	*(unsigned *)st = c;
 	return -2;
 ilseq:
-	*(unsigned *)st = FAILSTATE;
+	*(unsigned *)st = 0;
 	errno = EILSEQ;
 	return -1;
 }