diff options
author | Roland McGrath <roland@gnu.org> | 2002-04-30 22:00:59 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2002-04-30 22:00:59 +0000 |
commit | a8c017767721fec8fd4ee53c1937e31e35dfac08 (patch) | |
tree | 11c43b6158f98ebcce0ab0b5555faa3a35d43187 /sysdeps/generic | |
parent | 8543f93de2a52f1e314051aa20f7394a7c13366f (diff) | |
download | glibc-a8c017767721fec8fd4ee53c1937e31e35dfac08.tar.gz glibc-a8c017767721fec8fd4ee53c1937e31e35dfac08.tar.xz glibc-a8c017767721fec8fd4ee53c1937e31e35dfac08.zip |
2002-04-30 Roland McGrath <roland@frob.com>
Removed old GNU stdio implementation; GNU libio is now the only option. * configure.in: Removed --enable-libio option and @stdio@ subst var. Define USE_IN_LIBIO unconditionally. * configure: Regenerated. * Makeconfig (stdio): Set to libio by default. * config.make.in (stdio): Variable removed. * sysdeps/unix/sysv/linux/configure.in: Don't set $stdio. * sysdeps/unix/sysv/linux/configure: Regenerated. * sysdeps/mach/hurd/configure.in: Don't test $stdio. * sysdeps/mach/hurd/configure: Regenerated. * stdio/.cvsignore: File removed. * stdio/Makefile: File removed. * stdio/Versions: File removed. * stdio/__fbufsize.c: File removed. * stdio/__flbf.c: File removed. * stdio/__fpending.c: File removed. * stdio/__fpurge.c: File removed. * stdio/__freadable.c: File removed. * stdio/__freading.c: File removed. * stdio/__fsetlocking.c: File removed. * stdio/__fwritable.c: File removed. * stdio/__fwriting.c: File removed. * stdio/clearerr.c: File removed. * stdio/fclose.c: File removed. * stdio/fcloseall.c: File removed. * stdio/feof.c: File removed. * stdio/ferror.c: File removed. * stdio/fflush.c: File removed. * stdio/fgetc.c: File removed. * stdio/fgetpos.c: File removed. * stdio/fgets.c: File removed. * stdio/fileno.c: File removed. * stdio/fmemopen.c: File removed. * stdio/fopen.c: File removed. * stdio/fopncook.c: File removed. * stdio/fputc.c: File removed. * stdio/fputs.c: File removed. * stdio/fread.c: File removed. * stdio/freopen.c: File removed. * stdio/fseek.c: File removed. * stdio/fsetpos.c: File removed. * stdio/ftell.c: File removed. * stdio/fwrite.c: File removed. * stdio/getc.c: File removed. * stdio/getchar.c: File removed. * stdio/getdelim.c: File removed. * stdio/gets.c: File removed. * stdio/glue.c: File removed. * stdio/internals.c: File removed. * stdio/linewrap.c: File removed. * stdio/linewrap.h: File removed. * stdio/memstream.c: File removed. * stdio/newstream.c: File removed. * stdio/obstream.c: File removed. * stdio/putc.c: File removed. * stdio/putchar.c: File removed. * stdio/puts.c: File removed. * stdio/rewind.c: File removed. * stdio/setbuf.c: File removed. * stdio/setbuffer.c: File removed. * stdio/setlinebuf.c: File removed. * stdio/setvbuf.c: File removed. * stdio/stdio.h: File removed. * stdio/ungetc.c: File removed. * stdio/vasprintf.c: File removed. * stdio/vscanf.c: File removed. * stdio/vsnprintf.c: File removed. * stdio/vsprintf.c: File removed. * stdio/vsscanf.c: File removed. * sysdeps/generic/defs.c: File removed. * sysdeps/generic/fdopen.c: File removed. * sysdeps/generic/pipestream.c: File removed. * sysdeps/generic/stdio_init.c: File removed. * sysdeps/generic/sysd-stdio.c: File removed. * sysdeps/generic/vdprintf.c: File removed. * sysdeps/mach/hurd/defs.c: File removed. * sysdeps/mach/hurd/fdopen.c: File removed. * sysdeps/mach/hurd/pipestream.c: File removed. * sysdeps/mach/hurd/stdio_init.c: File removed. * sysdeps/mach/hurd/sysd-stdio.c: File removed. * sysdeps/mach/hurd/vdprintf.c: File removed. * sysdeps/posix/defs.c: File removed. * sysdeps/posix/fdopen.c: File removed. * sysdeps/posix/pipestream.c: File removed. * sysdeps/posix/stdio_init.c: File removed. * sysdeps/posix/vdprintf.c: File removed. * sysdeps/unix/pipestream.c: File removed. * sysdeps/unix/sysv/sysd-stdio.c: File removed. * sysdeps/unix/sysv/sco3.2.4/pipestream.c: File removed. * sysdeps/unix/sysv/sysv4/pipestream.c: File removed.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r-- | sysdeps/generic/defs.c | 47 | ||||
-rw-r--r-- | sysdeps/generic/fdopen.c | 34 | ||||
-rw-r--r-- | sysdeps/generic/pipestream.c | 60 | ||||
-rw-r--r-- | sysdeps/generic/stdio_init.c | 30 | ||||
-rw-r--r-- | sysdeps/generic/sysd-stdio.c | 191 | ||||
-rw-r--r-- | sysdeps/generic/vdprintf.c | 33 |
6 files changed, 0 insertions, 395 deletions
diff --git a/sysdeps/generic/defs.c b/sysdeps/generic/defs.c deleted file mode 100644 index c71235dd08..0000000000 --- a/sysdeps/generic/defs.c +++ /dev/null @@ -1,47 +0,0 @@ -/* Definitions of global stdio data structures. - Copyright (C) 1991, 1995, 1997 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <stdio.h> - -/* This file should define the following - variables as appropriate for the system. */ - -FILE *stdin, *stdout, *stderr; - -/* Pointer to the first stream in the list. */ -FILE *__stdio_head; - -/* This function MUST be in this file! - This is because we want _cleanup to go into the __libc_atexit set - when any stdio code is used (and to use any stdio code, one must reference - something defined in this file), and since only local symbols can be made - set elements, having the set element stab entry here and _cleanup elsewhere - loses; and having them both elsewhere loses because there is no reference - to cause _cleanup to be linked in. */ - -void -_cleanup () -{ - __fcloseall (); -} - - -#ifdef HAVE_GNU_LD -text_set_element (__libc_atexit, _cleanup); -#endif diff --git a/sysdeps/generic/fdopen.c b/sysdeps/generic/fdopen.c deleted file mode 100644 index d856d0403a..0000000000 --- a/sysdeps/generic/fdopen.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <errno.h> -#include <stdio.h> - -/* Open a new stream on a given system file descriptor. */ -FILE * -__fdopen (fd, mode) - int fd; - const char *mode; -{ - __set_errno (ENOSYS); - return NULL; -} -weak_alias (__fdopen, fdopen) - -stub_warning (fdopen) -#include <stub-tag.h> diff --git a/sysdeps/generic/pipestream.c b/sysdeps/generic/pipestream.c deleted file mode 100644 index f30dbdd36e..0000000000 --- a/sysdeps/generic/pipestream.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright (C) 1991, 1993, 1995, 1996, 1997 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <stddef.h> -#include <signal.h> -#include <stdio.h> -#include <errno.h> - - -/* Open a new stream that is a one-way pipe to a - child process running the given shell command. */ -FILE * -popen (command, mode) - const char *command; - const char *mode; -{ - if (command == NULL || mode == NULL || (*mode != 'r' && *mode != 'w')) - { - __set_errno (EINVAL); - return NULL; - } - - __set_errno (ENOSYS); - return NULL; -} - -/* Close a stream opened by popen and return its status. - Returns -1 if the stream was not opened by popen. */ -int -pclose (stream) - register FILE *stream; -{ - if (!__validfp (stream) || !stream->__ispipe) - { - __set_errno (EINVAL); - return -1; - } - - __set_errno (ENOSYS); - return -1; -} - -stub_warning (popen) -stub_warning (pclose) -#include <stub-tag.h> diff --git a/sysdeps/generic/stdio_init.c b/sysdeps/generic/stdio_init.c deleted file mode 100644 index 426934372d..0000000000 --- a/sysdeps/generic/stdio_init.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 1991, 1997 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <stdio.h> - -/* Initialize STREAM as necessary. - This may change I/O functions, give a buffer, etc. - If no buffer is allocated, but the bufsize is set, - the bufsize will be used to allocate the buffer. */ -void -__stdio_init_stream (stream) - FILE *stream; -{ - stream->__bufsize = BUFSIZ; -} diff --git a/sysdeps/generic/sysd-stdio.c b/sysdeps/generic/sysd-stdio.c deleted file mode 100644 index 032ea60819..0000000000 --- a/sysdeps/generic/sysd-stdio.c +++ /dev/null @@ -1,191 +0,0 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <errno.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> - -extern __io_read_fn __stdio_read; -extern __io_write_fn __stdio_write; -extern __io_seek_fn __stdio_seek; -extern __io_close_fn __stdio_close; -extern __io_fileno_fn __stdio_fileno; - -/* Read N bytes into BUF from COOKIE. */ -int -__stdio_read (void *cookie, char *buf, size_t n) -{ - const int fd = (int) cookie; -#if defined EINTR && defined EINTR_REPEAT - int save = errno; - int nread; - - try:; - __set_errno (0); - nread = __read (fd, buf, (int) n); - if (nread < 0) - { - if (errno == EINTR) - goto try; - return -1; - } - __set_errno (save); - return nread; - -#else /* No EINTR. */ - return __read (fd, buf, n); -#endif -} - - -/* Write N bytes from BUF to COOKIE. */ -int -__stdio_write (void *cookie, const char *buf, size_t n) -{ - const int fd = (int) cookie; - register size_t written = 0; - - while (n > 0) - { - int count = __write (fd, buf, (int) n); - if (count > 0) - { - buf += count; - written += count; - n -= count; - } - else if (count < 0 -#if defined EINTR && defined EINTR_REPEAT - && errno != EINTR -#endif - ) - /* Write error. */ - return -1; - } - - return (int) written; -} - - -/* Move COOKIE's file position *POS bytes, according to WHENCE. - The new file position is stored in *POS. - Returns zero if successful, nonzero if not. */ -int -__stdio_seek (void *cookie, fpos_t *pos, int whence) -{ - off_t new; - new = __lseek ((int) cookie, (off_t) *pos, whence); - if (new < 0) - return 1; - *pos = (fpos_t) new; - return 0; -} - - -/* Close COOKIE. */ -int -__stdio_close (void *cookie) -{ - return __close ((int) cookie); -} - -/* Return the POSIX.1 file descriptor associated with COOKIE, - or -1 for errors. If COOKIE does not relate to any POSIX.1 file - descriptor, this should return -1 with errno set to EOPNOTSUPP. */ -int -__stdio_fileno (void *cookie) -{ - return (int) cookie; -} - - -/* Open the given file with the mode given in the __io_mode argument. */ -int -__stdio_open (const char *filename, __io_mode m, void **cookieptr) -{ - int fd; - int mode; - - if (m.__read && m.__write) - mode = O_RDWR; - else - mode = m.__read ? O_RDONLY : O_WRONLY; - - if (m.__append) - mode |= O_APPEND; - if (m.__exclusive) - mode |= O_EXCL; - if (m.__truncate) - mode |= O_TRUNC; - - if (m.__create) - fd = __open (filename, mode | O_CREAT, - S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); - else - fd = __open (filename, mode); - - if (fd < 0) - return -1; - - *cookieptr = (void *) fd; - return 0; -} - - -/* Open FILENAME with the mode in M. Use the same magic cookie - already in *COOKIEPTR if possible, closing the old cookie with CLOSEFN. */ -int -__stdio_reopen (const char *filename, __io_mode m, void **cookieptr, - __io_close_fn closefn) -{ - void *newcookie; - - /* We leave the old descriptor open while we open the file. - That way ``freopen ("/dev/stdin", "r", stdin)'' works. */ - - if (__stdio_open (filename, m, &newcookie)) - { - if (errno == ENFILE || errno == EMFILE) - { - /* We are out of file descriptors. Try closing the old one and - retrying the open. */ - (void) (*closefn) (*cookieptr); - if (__stdio_open (filename, m, &newcookie)) - return -1; - } - else - return -1; - } - - if (newcookie != *cookieptr) - { - if (closefn != __stdio_close || - /* Try to move the descriptor to the desired one. */ - __dup2 ((int) newcookie, (int) *cookieptr) < 0) - /* Didn't work. Give the caller the new cookie. */ - *cookieptr = newcookie; - } - - return 0; -} diff --git a/sysdeps/generic/vdprintf.c b/sysdeps/generic/vdprintf.c deleted file mode 100644 index d8bd3bca81..0000000000 --- a/sysdeps/generic/vdprintf.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 1997 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <errno.h> -#include <stdio.h> -#include <stdarg.h> - -/* Write formatted output to file descriptor D according to the format string - FORMAT, using the argument list in ARG. */ -int -vdprintf (int d, const char *format, va_list arg) -{ - __set_errno (ENOSYS); - return 0; -} - -stub_warning (vdprintf) -#include <stub-tag.h> |