projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regcomp: propagate allocation failures
[musl]
/
src
/
multibyte
/
mbrtowc.c
diff --git
a/src/multibyte/mbrtowc.c
b/src/multibyte/mbrtowc.c
index
ec32385
..
ca7da70
100644
(file)
--- a/
src/multibyte/mbrtowc.c
+++ b/
src/multibyte/mbrtowc.c
@@
-5,10
+5,8
@@
*/
#include <stdlib.h>
*/
#include <stdlib.h>
-#include <inttypes.h>
#include <wchar.h>
#include <errno.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)
#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;
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;
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;
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 (!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--;
}
if (*s-SA > SB-SA) goto ilseq;
c = bittab[*s++-SA]; n--;
}
@@
-51,7
+51,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;
}