From 35c53530e9421282bca5f868919b8be13a505903 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 21 Jul 2001 05:09:59 +0000 Subject: 2001-07-20 Roland McGrath * libio/stdio_ext.h: Moved to ... * stdio-common/stdio_ext.h: ... here. * libio/Makefile (headers): Move stdio_ext.h from here ... * stdio-common/Makefile (headers): ... to here. * include/stdio_ext.h: New file. * stdio/Makefile (routines): Add the stdio_ext.h functions here. * stdio/Versions (GLIBC_2.2.4): Export the stdio_ext.h functions. * stdio/__flbf.c: New file. * stdio/__fbufsize.c: New file. * stdio/__fpending.c: New file. * stdio/__fpurge.c: New file. * stdio/__freadable.c: New file. * stdio/__freading.c: New file. * stdio/__fsetlocking.c: New file. * stdio/__fwritable.c: New file. * stdio/__fwriting.c: New file. --- include/stdio_ext.h | 5 +++ libio/Makefile | 3 +- libio/stdio_ext.h | 87 ------------------------------------------------ stdio-common/Makefile | 2 +- stdio-common/stdio_ext.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ stdio/Makefile | 4 ++- stdio/Versions | 5 +++ stdio/__fbufsize.c | 25 ++++++++++++++ stdio/__flbf.c | 25 ++++++++++++++ stdio/__fpending.c | 25 ++++++++++++++ stdio/__fpurge.c | 25 ++++++++++++++ stdio/__freadable.c | 25 ++++++++++++++ stdio/__freading.c | 26 +++++++++++++++ stdio/__fsetlocking.c | 41 +++++++++++++++++++++++ stdio/__fwritable.c | 25 ++++++++++++++ stdio/__fwriting.c | 26 +++++++++++++++ 16 files changed, 345 insertions(+), 91 deletions(-) create mode 100644 include/stdio_ext.h delete mode 100644 libio/stdio_ext.h create mode 100644 stdio-common/stdio_ext.h create mode 100644 stdio/__fbufsize.c create mode 100644 stdio/__flbf.c create mode 100644 stdio/__fpending.c create mode 100644 stdio/__fpurge.c create mode 100644 stdio/__freadable.c create mode 100644 stdio/__freading.c create mode 100644 stdio/__fsetlocking.c create mode 100644 stdio/__fwritable.c create mode 100644 stdio/__fwriting.c diff --git a/include/stdio_ext.h b/include/stdio_ext.h new file mode 100644 index 0000000000..09db6f2c9c --- /dev/null +++ b/include/stdio_ext.h @@ -0,0 +1,5 @@ +#ifndef _STDIO_EXT_H + +# include + +#endif diff --git a/libio/Makefile b/libio/Makefile index 9afb2b48cf..df8c93c0c2 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -21,8 +21,7 @@ # subdir := libio -headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \ - stdio_ext.h +headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h routines := \ filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen \ diff --git a/libio/stdio_ext.h b/libio/stdio_ext.h deleted file mode 100644 index de04803fe9..0000000000 --- a/libio/stdio_ext.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Functions to access FILE structure internals. - Copyright (C) 2000 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. */ - -/* This header contains the same definitions as the header of the same name - on Sun's Solaris OS. */ - -#ifndef _STDIO_EXT_H -#define _STDIO_EXT_H 1 - -#include - -enum -{ - /* Query current state of the locking status. */ - FSETLOCKING_QUERY = 0, -#define FSETLOCKING_QUERY FSETLOCKING_QUERY - /* The library protects all uses of the stream functions, except for - uses of the *_unlocked functions, by calls equivalent to flockfile(). */ - FSETLOCKING_INTERNAL, -#define FSETLOCKING_INTERNAL FSETLOCKING_INTERNAL - /* The user will take care of locking. */ - FSETLOCKING_BYCALLER -#define FSETLOCKING_BYCALLER FSETLOCKING_BYCALLER -}; - - -__BEGIN_DECLS - -/* Return the size of the buffer of FP in bytes currently in use by - the given stream. */ -extern size_t __fbufsize (FILE *__fp); - - -/* Return non-zero value iff the stream FP is opened readonly, or if the - last operation on the stream was a read operation. */ -extern int __freading (FILE *__fp); - -/* Return non-zero value iff the stream FP is opened write-only or - append-only, or if the last operation on the stream was a write - operation. */ -extern int __fwriting (FILE *__fp); - - -/* Return non-zero value iff stream FP is not opened write-only or - append-only. */ -extern int __freadable (FILE *__fp); - -/* Return non-zero value iff stream FP is not opened read-only. */ -extern int __fwritable (FILE *__fp); - - -/* Return non-zero value iff the stream FP is line-buffered. */ -extern int __flbf (FILE *__fp); - - -/* Discard all pending buffered I/O on the stream FP. */ -extern void __fpurge (FILE *__fp); - -/* Return amount of output in bytes pending on a stream FP. */ -extern size_t __fpending (FILE *__fp); - -/* Flush all line-buffered files. */ -extern void _flushlbf (void); - - -/* Set locking statis of stream FP to TYPE. */ -extern int __fsetlocking (FILE *__fp, int __type); - -__END_DECLS - -#endif /* stdio_ext.h */ diff --git a/stdio-common/Makefile b/stdio-common/Makefile index e7f5dd23f2..f2a26b367e 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -21,7 +21,7 @@ # subdir := stdio-common -headers := printf.h +headers := printf.h stdio_ext.h routines := \ ctermid cuserid \ diff --git a/stdio-common/stdio_ext.h b/stdio-common/stdio_ext.h new file mode 100644 index 0000000000..de04803fe9 --- /dev/null +++ b/stdio-common/stdio_ext.h @@ -0,0 +1,87 @@ +/* Functions to access FILE structure internals. + Copyright (C) 2000 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. */ + +/* This header contains the same definitions as the header of the same name + on Sun's Solaris OS. */ + +#ifndef _STDIO_EXT_H +#define _STDIO_EXT_H 1 + +#include + +enum +{ + /* Query current state of the locking status. */ + FSETLOCKING_QUERY = 0, +#define FSETLOCKING_QUERY FSETLOCKING_QUERY + /* The library protects all uses of the stream functions, except for + uses of the *_unlocked functions, by calls equivalent to flockfile(). */ + FSETLOCKING_INTERNAL, +#define FSETLOCKING_INTERNAL FSETLOCKING_INTERNAL + /* The user will take care of locking. */ + FSETLOCKING_BYCALLER +#define FSETLOCKING_BYCALLER FSETLOCKING_BYCALLER +}; + + +__BEGIN_DECLS + +/* Return the size of the buffer of FP in bytes currently in use by + the given stream. */ +extern size_t __fbufsize (FILE *__fp); + + +/* Return non-zero value iff the stream FP is opened readonly, or if the + last operation on the stream was a read operation. */ +extern int __freading (FILE *__fp); + +/* Return non-zero value iff the stream FP is opened write-only or + append-only, or if the last operation on the stream was a write + operation. */ +extern int __fwriting (FILE *__fp); + + +/* Return non-zero value iff stream FP is not opened write-only or + append-only. */ +extern int __freadable (FILE *__fp); + +/* Return non-zero value iff stream FP is not opened read-only. */ +extern int __fwritable (FILE *__fp); + + +/* Return non-zero value iff the stream FP is line-buffered. */ +extern int __flbf (FILE *__fp); + + +/* Discard all pending buffered I/O on the stream FP. */ +extern void __fpurge (FILE *__fp); + +/* Return amount of output in bytes pending on a stream FP. */ +extern size_t __fpending (FILE *__fp); + +/* Flush all line-buffered files. */ +extern void _flushlbf (void); + + +/* Set locking statis of stream FP to TYPE. */ +extern int __fsetlocking (FILE *__fp, int __type); + +__END_DECLS + +#endif /* stdio_ext.h */ diff --git a/stdio/Makefile b/stdio/Makefile index 5c56249646..53cf73cdb4 100644 --- a/stdio/Makefile +++ b/stdio/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. +# Copyright (C) 1991,92,93,94,95,96,2001 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 @@ -37,6 +37,8 @@ routines := \ fclose fcloseall fflush \ vdprintf vsnprintf vsprintf vasprintf vsscanf vscanf \ memstream obstream linewrap \ + __fbufsize __freading __fwriting __freadable __fwritable __flbf \ + __fpurge __fpending __fsetlocking \ internals sysd-stdio pipestream stdio_init libc_fatal aux := defs glue diff --git a/stdio/Versions b/stdio/Versions index 9700ba68cc..ccfda9c268 100644 --- a/stdio/Versions +++ b/stdio/Versions @@ -62,4 +62,9 @@ libc { # p* putc_unlocked; putchar_unlocked; } + GLIBC_2.2.4 { + # Functions to access FILE internals. + __fbufsize; __freading; __fwriting; __freadable; __fwritable; __flbf; + __fpurge; __fpending; __fsetlocking; _flushlbf; + } } diff --git a/stdio/__fbufsize.c b/stdio/__fbufsize.c new file mode 100644 index 0000000000..ad42ee2427 --- /dev/null +++ b/stdio/__fbufsize.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2001 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 + +size_t +__fbufsize (FILE *fp) +{ + return fp->__bufsize; +} diff --git a/stdio/__flbf.c b/stdio/__flbf.c new file mode 100644 index 0000000000..9eb80abdbf --- /dev/null +++ b/stdio/__flbf.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2001 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 + +int +__flbf (FILE *fp) +{ + return fp->__linebuf; +} diff --git a/stdio/__fpending.c b/stdio/__fpending.c new file mode 100644 index 0000000000..0e7b8f02f0 --- /dev/null +++ b/stdio/__fpending.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2001 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 + +size_t +__fpending (FILE *fp) +{ + return (fp->__put_limit >= fp->__bufp ? fp->__bufp - fp->__buffer : 0); +} diff --git a/stdio/__fpurge.c b/stdio/__fpurge.c new file mode 100644 index 0000000000..db882b68f5 --- /dev/null +++ b/stdio/__fpurge.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2001 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 + +void +__fpurge (FILE *fp) +{ + fp->__get_limit = fp->__put_limit = fp->__bufp = fp->__buffer; +} diff --git a/stdio/__freadable.c b/stdio/__freadable.c new file mode 100644 index 0000000000..5674d5bef5 --- /dev/null +++ b/stdio/__freadable.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2001 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 + +int +__freadable (FILE *fp) +{ + return !!fp->__mode.__read; +} diff --git a/stdio/__freading.c b/stdio/__freading.c new file mode 100644 index 0000000000..16d0fd97f8 --- /dev/null +++ b/stdio/__freading.c @@ -0,0 +1,26 @@ +/* Copyright (C) 2001 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 + +int +__freading (FILE *fp) +{ + /* This is not really right for unbuffered streams. */ + return (!fp->__mode.__write || fp->__put_limit == fp->__buffer); +} diff --git a/stdio/__fsetlocking.c b/stdio/__fsetlocking.c new file mode 100644 index 0000000000..a0e40d71c9 --- /dev/null +++ b/stdio/__fsetlocking.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2001 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 +#include +#include + +int +__fsetlocking (FILE *fp, int type) +{ + /* We don't really support locking. */ + + switch (type) + { + case FSETLOCKING_QUERY: + case FSETLOCKING_BYCALLER: + break; + case FSETLOCKING_INTERNAL: + abort (); + default: + __set_errno (EINVAL); + return -1; + } + + return FSETLOCKING_BYCALLER; +} diff --git a/stdio/__fwritable.c b/stdio/__fwritable.c new file mode 100644 index 0000000000..396629542c --- /dev/null +++ b/stdio/__fwritable.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2001 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 + +int +__fwritable (FILE *fp) +{ + return !!fp->__mode.__write; +} diff --git a/stdio/__fwriting.c b/stdio/__fwriting.c new file mode 100644 index 0000000000..36266ef34d --- /dev/null +++ b/stdio/__fwriting.c @@ -0,0 +1,26 @@ +/* Copyright (C) 2001 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 + +int +__fwriting (FILE *fp) +{ + /* This is not really right for unbuffered streams. */ + return (!fp->__mode.__read || fp->__get_limit == fp->__buffer); +} -- cgit v1.2.3