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, 86 insertions, 0 deletions

diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
new file mode 100644
index 000000000..4df2e4229
--- /dev/null
+++ b/libc/stdio/fclose.c
@@ -0,0 +1,86 @@
+/* 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"
+
+int fclose(register FILE *stream)
+{
+	int rv = 0;
+	__STDIO_AUTO_THREADLOCK_VAR;
+
+	/* First, remove the file from the open file list. */
+#ifdef __STDIO_HAS_OPENLIST
+	{
+		register FILE *ptr;
+
+		__STDIO_THREADLOCK_OPENLIST;
+		if ((ptr = _stdio_openlist) == stream) {
+			_stdio_openlist = stream->__nextopen;
+		} else {
+			while (ptr) {
+				if (ptr->__nextopen == stream) {
+					ptr->__nextopen = stream->__nextopen;
+					break;
+				}
+				ptr = ptr->__nextopen;
+			}
+		}
+		__STDIO_THREADUNLOCK_OPENLIST;
+
+		if (!ptr) {	  /* Did not find stream in the open file list! */
+			return EOF;
+		}
+	}
+#endif
+
+	__STDIO_AUTO_THREADLOCK(stream);
+
+	__STDIO_STREAM_VALIDATE(stream);
+
+#ifdef __STDIO_BUFFERS
+	/* Write any pending buffered chars. */
+	if (__STDIO_STREAM_IS_WRITING(stream)) {
+		rv = __fflush_unlocked(stream);
+	}
+#endif
+
+	if (__CLOSE(stream) < 0) {	/* Must close even if fflush failed. */
+		rv = EOF;
+	}
+
+	stream->__filedes = -1;
+
+	/* We need a way for freopen to know that a file has been closed.
+	 * Since a file can't be both readonly and writeonly, that makes
+	 * an effective signal.  It also has the benefit of disabling
+	 * transitions to either reading or writing. */
+	stream->__modeflags &= (__FLAG_FREEBUF|__FLAG_FREEFILE);
+	stream->__modeflags |= (__FLAG_READONLY|__FLAG_WRITEONLY);
+
+#ifndef NDEBUG
+	__STDIO_STREAM_RESET_GCS(stream);
+
+	/* Reinitialize everything (including putc since fflush could fail). */
+	__STDIO_STREAM_DISABLE_GETC(stream);
+	__STDIO_STREAM_DISABLE_PUTC(stream);
+	__STDIO_STREAM_INIT_BUFREAD_BUFPOS(stream);
+
+# ifdef __UCLIBC_HAS_WCHAR__
+	stream->__ungot_width[0] = 0;
+# endif
+# ifdef __STDIO_MBSTATE
+	__INIT_MBSTATE(&(stream->__state));
+# endif
+#endif
+
+	__STDIO_AUTO_THREADUNLOCK(stream);
+
+	__STDIO_STREAM_FREE_BUFFER(stream);
+	__STDIO_STREAM_FREE_FILE(stream);
+
+	return rv;
+}