projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
setjmp: optimize x86 longjmp epilogues
[musl]
/
src
/
stdio
/
ungetwc.c
diff --git
a/src/stdio/ungetwc.c
b/src/stdio/ungetwc.c
index
5282fee
..
9edf366
100644
(file)
--- a/
src/stdio/ungetwc.c
+++ b/
src/stdio/ungetwc.c
@@
-1,23
+1,27
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include "locale_impl.h"
+#include <wchar.h>
+#include <limits.h>
+#include <ctype.h>
+#include <string.h>
wint_t ungetwc(wint_t c, FILE *f)
{
unsigned char mbc[MB_LEN_MAX];
wint_t ungetwc(wint_t c, FILE *f)
{
unsigned char mbc[MB_LEN_MAX];
- int l=1;
-
- if (c == WEOF) return c;
-
- /* Try conversion early so we can fail without locking if invalid */
- if (!isascii(c) && (l = wctomb((void *)mbc, c)) < 0)
- return WEOF;
+ int l;
+ locale_t *ploc = &CURRENT_LOCALE, loc = *ploc;
FLOCK(f);
FLOCK(f);
- f->mode |= f->mode+1;
+ if (f->mode <= 0) fwide(f, 1);
+ *ploc = f->locale;
- if ((!f->rend && __toread(f)) || f->rpos < f->buf - UNGET + l) {
+ if (!f->rpos) __toread(f);
+ if (!f->rpos || c == WEOF || (l = wcrtomb((void *)mbc, c, 0)) < 0 ||
+ f->rpos < f->buf - UNGET + l) {
FUNLOCK(f);
FUNLOCK(f);
- return EOF;
+ *ploc = loc;
+ return WEOF;
}
if (isascii(c)) *--f->rpos = c;
}
if (isascii(c)) *--f->rpos = c;
@@
-26,5
+30,6
@@
wint_t ungetwc(wint_t c, FILE *f)
f->flags &= ~F_EOF;
FUNLOCK(f);
f->flags &= ~F_EOF;
FUNLOCK(f);
+ *ploc = loc;
return c;
}
return c;
}