aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-07-21 05:09:59 +0000
committerRoland McGrath <roland@gnu.org>2001-07-21 05:09:59 +0000
commit35c53530e9421282bca5f868919b8be13a505903 (patch)
tree6aed888a5635d10e4f029d79782533d9a754969e
parent5cd915d7bab24a6a340e498ce5d500b9b72d0cc6 (diff)
downloadglibc-35c53530e9421282bca5f868919b8be13a505903.zip
glibc-35c53530e9421282bca5f868919b8be13a505903.tar.gz
glibc-35c53530e9421282bca5f868919b8be13a505903.tar.bz2
2001-07-20 Roland McGrath <roland@frob.com>
* 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.
-rw-r--r--include/stdio_ext.h5
-rw-r--r--libio/Makefile3
-rw-r--r--stdio-common/Makefile2
-rw-r--r--stdio-common/stdio_ext.h (renamed from libio/stdio_ext.h)0
-rw-r--r--stdio/Makefile4
-rw-r--r--stdio/Versions5
-rw-r--r--stdio/__fbufsize.c25
-rw-r--r--stdio/__flbf.c25
-rw-r--r--stdio/__fpending.c25
-rw-r--r--stdio/__fpurge.c25
-rw-r--r--stdio/__freadable.c25
-rw-r--r--stdio/__freading.c26
-rw-r--r--stdio/__fsetlocking.c41
-rw-r--r--stdio/__fwritable.c25
-rw-r--r--stdio/__fwriting.c26
15 files changed, 258 insertions, 4 deletions
diff --git a/include/stdio_ext.h b/include/stdio_ext.h
new file mode 100644
index 0000000..09db6f2
--- /dev/null
+++ b/include/stdio_ext.h
@@ -0,0 +1,5 @@
+#ifndef _STDIO_EXT_H
+
+# include <stdio-common/stdio_ext.h>
+
+#endif
diff --git a/libio/Makefile b/libio/Makefile
index 9afb2b4..df8c93c 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/stdio-common/Makefile b/stdio-common/Makefile
index e7f5dd2..f2a26b3 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/libio/stdio_ext.h b/stdio-common/stdio_ext.h
index de04803..de04803 100644
--- a/libio/stdio_ext.h
+++ b/stdio-common/stdio_ext.h
diff --git a/stdio/Makefile b/stdio/Makefile
index 5c56249..53cf73c 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 9700ba6..ccfda9c 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 0000000..ad42ee2
--- /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 <stdio_ext.h>
+
+size_t
+__fbufsize (FILE *fp)
+{
+ return fp->__bufsize;
+}
diff --git a/stdio/__flbf.c b/stdio/__flbf.c
new file mode 100644
index 0000000..9eb80ab
--- /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 <stdio_ext.h>
+
+int
+__flbf (FILE *fp)
+{
+ return fp->__linebuf;
+}
diff --git a/stdio/__fpending.c b/stdio/__fpending.c
new file mode 100644
index 0000000..0e7b8f0
--- /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 <stdio_ext.h>
+
+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 0000000..db882b6
--- /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 <stdio_ext.h>
+
+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 0000000..5674d5b
--- /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 <stdio_ext.h>
+
+int
+__freadable (FILE *fp)
+{
+ return !!fp->__mode.__read;
+}
diff --git a/stdio/__freading.c b/stdio/__freading.c
new file mode 100644
index 0000000..16d0fd9
--- /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 <stdio_ext.h>
+
+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 0000000..a0e40d7
--- /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 <stdio_ext.h>
+#include <errno.h>
+#include <stdlib.h>
+
+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 0000000..3966295
--- /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 <stdio_ext.h>
+
+int
+__fwritable (FILE *fp)
+{
+ return !!fp->__mode.__write;
+}
diff --git a/stdio/__fwriting.c b/stdio/__fwriting.c
new file mode 100644
index 0000000..36266ef
--- /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 <stdio_ext.h>
+
+int
+__fwriting (FILE *fp)
+{
+ /* This is not really right for unbuffered streams. */
+ return (!fp->__mode.__read || fp->__get_limit == fp->__buffer);
+}