New stdio core. Should be more maintainable. Fixes a couple of bugs.

  Codepaths streamlined.  Improved performance for nonthreaded apps
  when linked with a thread-enabled libc.
Minor iconv bug and some locale/thread related startup issues fixed.
  These showed up in getting a gcj-compiled java helloworld app running.
Removed some old extension functions... _stdio_fdout and _stdio_fsfopen.

1 files changed, 61 insertions, 0 deletions

diff --git a/libc/stdio/fgetws.c b/libc/stdio/fgetws.c
new file mode 100644
index 000000000..ec8547e25
--- /dev/null
+++ b/libc/stdio/fgetws.c
@@ -0,0 +1,61 @@
+/* Copyright (C) 2004       Manuel Novoa III    <mjn3@codepoet.org>
+ *
+ * GNU Library General Public License (LGPL) version 2 or later.
+ *
+ * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
+ */
+
+#include "_stdio.h"
+
+extern wchar_t *__fgetws_unlocked(wchar_t *__restrict ws, int n,
+								  FILE *__restrict stream);
+
+#ifdef __DO_UNLOCKED
+
+weak_alias(__fgetws_unlocked,fgetws_unlocked);
+#ifndef __UCLIBC_HAS_THREADS__
+weak_alias(__fgetws_unlocked,fgetws);
+#endif
+
+wchar_t *__fgetws_unlocked(wchar_t *__restrict ws, int n,
+						   FILE *__restrict stream)
+{
+	register wchar_t *p = ws;
+	wint_t wi;
+
+	__STDIO_STREAM_VALIDATE(stream);
+
+	while ((n > 1)
+		   && ((wi = __fgetwc_unlocked(stream)) != WEOF)
+		   && ((*p++ = wi) != '\n')
+		   ) {
+		--n;
+	}
+	if (p == ws) {
+		/* TODO -- should we set errno? */
+/*  		if (n <= 0) { */
+/*  			errno = EINVAL; */
+/*  		} */
+		return NULL;
+	}
+	*p = 0;
+	return ws;
+}
+
+#elif defined __UCLIBC_HAS_THREADS__
+
+wchar_t *fgetws(wchar_t *__restrict ws, int n, FILE *__restrict stream)
+{
+	wchar_t *retval;
+	__STDIO_AUTO_THREADLOCK_VAR;
+
+	__STDIO_AUTO_THREADLOCK(stream);
+
+	retval = __fgetws_unlocked(ws, n, stream);
+
+	__STDIO_AUTO_THREADUNLOCK(stream);
+
+	return retval;
+}
+
+#endif