projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove obsolete and unused gethostbyaddr implementation
[musl]
/
src
/
multibyte
/
mbsrtowcs.c
diff --git
a/src/multibyte/mbsrtowcs.c
b/src/multibyte/mbsrtowcs.c
index
b9bbc33
..
0ee8b69
100644
(file)
--- a/
src/multibyte/mbsrtowcs.c
+++ b/
src/multibyte/mbsrtowcs.c
@@
-1,14
+1,8
@@
-/*
- * 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 <stdint.h>
#include <wchar.h>
#include <errno.h>
#include <wchar.h>
#include <errno.h>
-
+#include <string.h>
+#include <stdlib.h>
#include "internal.h"
size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbstate_t *restrict st)
#include "internal.h"
size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbstate_t *restrict st)
@@
-26,6
+20,23
@@
size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbs
}
}
}
}
+ if (MB_CUR_MAX==1) {
+ if (!ws) return strlen((const char *)s);
+ for (;;) {
+ if (!wn) {
+ *src = (const void *)s;
+ return wn0;
+ }
+ if (!*s) break;
+ c = *s++;
+ *ws++ = CODEUNIT(c);
+ wn--;
+ }
+ *ws = 0;
+ *src = 0;
+ return wn0-wn;
+ }
+
if (!ws) for (;;) {
if (*s-1u < 0x7f && (uintptr_t)s%4 == 0) {
while (!(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) {
if (!ws) for (;;) {
if (*s-1u < 0x7f && (uintptr_t)s%4 == 0) {
while (!(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) {
@@
-59,7
+70,7
@@
resume0:
return wn0;
}
if (*s-1u < 0x7f && (uintptr_t)s%4 == 0) {
return wn0;
}
if (*s-1u < 0x7f && (uintptr_t)s%4 == 0) {
- while (wn>=
4
&& !(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) {
+ while (wn>=
5
&& !(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) {
*ws++ = *s++;
*ws++ = *s++;
*ws++ = *s++;
*ws++ = *s++;
*ws++ = *s++;
*ws++ = *s++;