X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffputwc.c;h=789fe9c90e98e72faccb570f373bb0ef8f5c384d;hb=e1a51185ceb4386481491e11f6dd39569b9e54f7;hp=292a53fb8ed46b0ae14ce609862300f402c17f1a;hpb=e3cd6c5c265cd481db6e0c5b529855d99f0bda30;p=musl

diff --git a/src/stdio/fputwc.c b/src/stdio/fputwc.c
index 292a53fb..789fe9c9 100644
--- a/src/stdio/fputwc.c
+++ b/src/stdio/fputwc.c
@@ -1,11 +1,17 @@
 #include "stdio_impl.h"
+#include "locale_impl.h"
+#include <wchar.h>
+#include <limits.h>
+#include <ctype.h>
 
 wint_t __fputwc_unlocked(wchar_t c, FILE *f)
 {
 	char mbc[MB_LEN_MAX];
 	int l;
+	locale_t *ploc = &CURRENT_LOCALE, loc = *ploc;
 
-	f->mode |= f->mode+1;
+	if (f->mode <= 0) fwide(f, 1);
+	*ploc = f->locale;
 
 	if (isascii(c)) {
 		c = putc_unlocked(c, f);
@@ -17,6 +23,8 @@ wint_t __fputwc_unlocked(wchar_t c, FILE *f)
 		l = wctomb(mbc, c);
 		if (l < 0 || __fwritex((void *)mbc, l, f) < l) c = WEOF;
 	}
+	if (c==WEOF) f->flags |= F_ERR;
+	*ploc = loc;
 	return c;
 }
 
@@ -25,7 +33,7 @@ wint_t fputwc(wchar_t c, FILE *f)
 	FLOCK(f);
 	c = __fputwc_unlocked(c, f);
 	FUNLOCK(f);
-	return 0;
+	return c;
 }
 
 weak_alias(__fputwc_unlocked, fputwc_unlocked);