Associate a multibyte conversion state object with each stream. Reset it

to the initial state when a stream is opened or seeked upon. Use the
stream's conversion state object instead of a freshly-zeroed one in
fgetwc(), fputwc() and ungetwc().

This is only a performance improvement for now, but it would also be
required in order to support state-dependent encodings.

1 files changed, 1 insertions, 5 deletions

diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index 270ec8a..26d4dcf 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -180,11 +180,7 @@ found:
 	fp->_lb._size = 0;
 /*	fp->_lock = NULL; */	/* once set always set (reused) */
 	fp->_extra->orientation = 0;
-#ifdef notdef
-	/* Stateful encoding/decoding is not yet supported. */
-	memset(&fp->_extra->wstate, 0, sizeof(mbstate_t));
-	memset(&fp->_extra->rstate, 0, sizeof(mbstate_t));
-#endif
+	memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t));
 	return (fp);
 }