Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>

	* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
	libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
	libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
	libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
	libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
	libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
	libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
	libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
	libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
	libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
	libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
	libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
	libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
	libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
	libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
	New files.  Slightly modified version from Linux libc.

	* libio/memstream.c, libio/vdprintf.c: New files for functions not
	(yet) part of GNU libio.

	* libio/iofopncook.c: Implementation of `fopencookie', mainly written
	by Per Bothner.

	* stdio-common/getline.c: Adapted to libio.
	* stdio-common/snprintf.c: Adapted to libio.
	* stdio-common/vfprintf.c: Adapted to libio.
	* stdio-common/vfscanf.c: Adapted to libio.
	* sysdeps/posix/tempname.c: Adapted to libio.

74 files changed, 5783 insertions, 112 deletions

diff --git a/ChangeLog b/ChangeLog
index 207253f998..dd731fce4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Sat Nov 18 16:46:01 1995  Ulrich Drepper  <drepper@gnu.ai.mit.edu>
+
+	* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
+	libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
+	libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
+	libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
+	libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
+	libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
+	libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
+	libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
+	libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
+	libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
+	libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
+	libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
+	libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
+	libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
+	libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
+	New files.  Slightly modified version from Linux libc.
+
+	* libio/memstream.c, libio/vdprintf.c: New files for functions not
+	(yet) part of GNU libio.
+
+	* libio/iofopncook.c: Implementation of `fopencookie', mainly written
+	by Per Bothner.
+
+	* stdio-common/getline.c: Adapted to libio.
+	* stdio-common/snprintf.c: Adapted to libio.
+	* stdio-common/vfprintf.c: Adapted to libio.
+	* stdio-common/vfscanf.c: Adapted to libio.
+	* sysdeps/posix/tempname.c: Adapted to libio.
+
 Fri Nov 17 17:57:00 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* sysdeps/generic/Makefile (make_siglist): Add missing backslash.
diff --git a/Makeconfig b/Makeconfig
index a610d057f5..6b403a1694 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -411,9 +411,12 @@ endif	# gcc
 # files (including ones given in angle brackets) in the current directory
 # and in the parent library source directory.
 # `+sysdep-includes' will be defined by Makerules.
-+includes = -I. $(filter-out -I,-I$(patsubst %/,%,$(..))) \
++includes = -I. $(filter-out -I,-I$(patsubst %/,%,$(..))) $($(stdio)-include) \
 	    $(includes) $(+sysdep-includes) $(last-includes)
 
+# Since libio has several internal header files, we use a -I instead
+# of many little headers in the top level source directory.
+libio-include = -I$(..)libio
 
 # These are the variables that the implicit compilation rules use.
 CPPFLAGS = $(+includes) $(defines) -include $(..)libc-symbols.h \
diff --git a/configure.in b/configure.in
index 6b2624e254..e35769afb2 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AC_ARG_WITH(weak-symbols, dnl
 
 AC_ARG_ENABLE(libio, dnl
 [  --enable-libio          build in GNU libio instead of GNU stdio],
- 	      stdio=libio, stdio=stdio)
+ 	      stdio=libio, stdio=default)
 
 dnl Arguments to enable or disable building the shared, profiled, and
 dnl -fomit-frame-pointer libraries.
@@ -69,13 +69,6 @@ AC_ARG_ENABLE(omitfp, dnl
 [  --enable-omitfp       build undebuggable optimized library [default=no]],
 	    omitfp=$enableval, omitfp=no)
 
-AC_MSG_CHECKING(stdio selection)
-AC_SUBST(stdio)
-if test $stdio = libio; then
-  AC_DEFINE(USE_IN_LIBIO)
-fi
-AC_MSG_RESULT($stdio)
-
 AC_CANONICAL_HOST
 # We keep the original values in `$config_*' and never modify them, so we
 # can write them unchanged into config.make.  Everything else uses
@@ -486,6 +479,14 @@ else
   config_uname=
 fi
 
+AC_MSG_CHECKING(stdio selection)
+AC_SUBST(stdio)
+case $stdio in
+libio) AC_DEFINE(USE_IN_LIBIO) ;;
+default) stdio=stdio ;;
+esac
+AC_MSG_RESULT($stdio)
+
 AC_SUBST(gnu_ld) AC_SUBST(gnu_as) AC_SUBST(elf) AC_SUBST(weak)
 if test $gnu_ld = yes; then
   AC_DEFINE(HAVE_GNU_LD)
diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c
index e1f8c19acc..5aedc582ce 100644
--- a/hurd/hurdfault.c
+++ b/hurd/hurdfault.c
@@ -26,6 +26,7 @@ Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 #include "thread_state.h"
 #include "faultexc.h"		/* mig-generated header for our exc server.  */
+#include <assert.h>
 
 jmp_buf _hurdsig_fault_env;
 
@@ -121,7 +122,7 @@ _hurdsig_fault_init (void)
 			      MACH_PORT_RIGHT_RECEIVE, &forward_sigexc);
   assert_perror (err);
 
-  err = __mach_port_insert_right (__mach_task_self (),
+  err = __mach_port_insert_right (__mach_task_self (), sigexc,
 				  sigexc, MACH_MSG_TYPE_MAKE_SEND);
   assert_perror (err);
   err = __thread_set_special_port (_hurd_msgport_thread,
diff --git a/libio/Makefile b/libio/Makefile
new file mode 100644
index 0000000000..8d09a5ecce
--- /dev/null
+++ b/libio/Makefile
@@ -0,0 +1,44 @@
+# Copyright (C) 1995 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+
+# You should have received a copy of the GNU Library General Public
+# License along with the GNU C Library; see the file COPYING.LIB.  If
+# not, write to the Free Software Foundation, Inc., 675 Mass Ave