projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix swprintf handling of nul character in output
[musl]
/
src
/
multibyte
/
mbrtowc.c
diff --git
a/src/multibyte/mbrtowc.c
b/src/multibyte/mbrtowc.c
index
09badeb
..
c94819e
100644
(file)
--- 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 <stdlib.h>
-#include <inttypes.h>
#include <wchar.h>
#include <errno.h>
#include <wchar.h>
#include <errno.h>
-
#include "internal.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;
{
static unsigned internal_state;
unsigned c;
- const unsigned char *s = src;
+ const unsigned char *s =
(const void *)
src;
const unsigned N = n;
const unsigned N = n;
+ wchar_t dummy;
if (!st) st = (void *)&internal_state;
c = *(unsigned *)st;
if (!s) {
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 (!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--;
}
c = bittab[*s++-SA]; n--;
}
@@
-44,7
+37,7
@@
loop:
return N-n;
}
if (n) {
return N-n;
}
if (n) {
- if (
(unsigned)*s-0x80
>= 0x40) goto ilseq;
+ if (
*s-0x80u
>= 0x40) goto ilseq;
goto loop;
}
}
goto loop;
}
}
@@
-52,7
+45,7
@@
loop:
*(unsigned *)st = c;
return -2;
ilseq:
*(unsigned *)st = c;
return -2;
ilseq:
- *(unsigned *)st =
FAILSTATE
;
+ *(unsigned *)st =
0
;
errno = EILSEQ;
return -1;
}
errno = EILSEQ;
return -1;
}