diff options
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | bits/_G_config.h (renamed from sysdeps/generic/_G_config.h) | 10 | ||||
| -rw-r--r-- | csu/init.c | 2 | ||||
| -rw-r--r-- | include/bits/libio.h (renamed from include/libio.h) | 2 | ||||
| -rw-r--r-- | libio/Makefile | 3 | ||||
| -rw-r--r-- | libio/_G_config.h | 25 | ||||
| -rw-r--r-- | libio/bits/libio.h | 527 | ||||
| -rw-r--r-- | libio/fmemopen.c | 1 | ||||
| -rw-r--r-- | libio/iofgetpos.c | 2 | ||||
| -rw-r--r-- | libio/iofsetpos.c | 2 | ||||
| -rw-r--r-- | libio/iolibio.h | 2 | ||||
| -rw-r--r-- | libio/libio.h | 510 | ||||
| -rw-r--r-- | libio/oldfmemopen.c | 1 | ||||
| -rw-r--r-- | libio/stdio.h | 2 | ||||
| -rw-r--r-- | libio/strfile.h | 5 | ||||
| -rw-r--r-- | scripts/check-installed-headers.sh | 5 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 1 | ||||
| -rw-r--r-- | sysdeps/pthread/flockfile.c | 1 | ||||
| -rw-r--r-- | sysdeps/pthread/funlockfile.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/_G_config.h (renamed from sysdeps/unix/sysv/linux/_G_config.h) | 10 |
21 files changed, 626 insertions, 524 deletions
@@ -1,3 +1,30 @@ +2017-12-24 Zack Weinberg <zackw@panix.com> + + * libio/libio.h, libio/_G_config.h: New stub headers which issue a + deprecation warning and then include <bits/libio.h>, <bits/_G_config.h> + respectively. + * libio/libio.h: Rename the original version of this file to + libio/bits/libio.h. Error out if not included by stdio.h or the + stub libio.h. + * include/libio.h: Move to include/bits. Forward to libio/bits/libio.h. + * sysdeps/generic/_G_config.h: Move to top-level bits/. Error out + if not included by bits/libio.h or the stub _G_config.h. + * sysdeps/unix/sysv/linux/_G_config.h: Move to + sysdeps/unix/sysv/linux/bits. Error out if not included by + bits/libio.h or the stub _G_config.h. + * libio/stdio.h: Include bits/libio.h, not libio.h. + * libio/Makefile: Install bits/libio.h and bits/_G_config.h as + well as libio.h and _G_config.h. + + * csu/init.c, libio/fmemopen.c, libio/iolibio.h, libio/oldfmemopen.c + * libio/strfile.h, stdio-common/vfscanf.c + * sysdeps/pthread/flockfile.c, sysdeps/pthread/funlockfile.c + Include stdio.h, not _G_config.h nor libio.h. + * libio/iofgetpos.c: Also rename fgetpos64 out of the way. + * libio/iofsetpos.c: Also rename fsetpos64 out of the way. + + * scripts/check-installed-headers.sh: Skip libio.h and _G_config.h. + 2017-12-23 Dmitry V. Levin <ldv@altlinux.org> [BZ #22347] @@ -110,6 +110,17 @@ Deprecated and removed features, and other changes affecting compatibility: * The tilepro-*-linux-gnu configuration is no longer supported. +* The nonstandard header files <libio.h> and <_G_config.h> are deprecated + and will be removed in a future release. Software that is still using + either header should be updated to use standard <stdio.h> interfaces + instead. + + libio.h was originally the header for a set of supported GNU extensions, + but they have not been maintained as such in many years, they are now + standing in the way of improvements to stdio, and we don't think there are + any remaining external users. _G_config.h was never intended for public + use, but predates the bits convention. + Changes to build and runtime requirements: * bison version 2.7 or later is required to generate code in the 'intl' diff --git a/sysdeps/generic/_G_config.h b/bits/_G_config.h index c49eed395b..2b60d29f5f 100644 --- a/sysdeps/generic/_G_config.h +++ b/bits/_G_config.h @@ -1,8 +1,12 @@ /* This file is needed by libio to define various configuration parameters. These are always the same in the GNU C library. */ -#ifndef _G_config_h -#define _G_config_h 1 +#ifndef _BITS_G_CONFIG_H +#define _BITS_G_CONFIG_H 1 + +#if !defined _BITS_LIBIO_H && !defined _G_CONFIG_H +# error "Never include <bits/_G_config.h> directly; use <stdio.h> instead." +#endif /* Define types for libio in terms of the standard internal type names. */ @@ -55,4 +59,4 @@ typedef union #define _G_BUFSIZ 8192 -#endif /* _G_config.h */ +#endif /* bits/_G_config.h */ diff --git a/csu/init.c b/csu/init.c index bb68386c9b..c50bb35e65 100644 --- a/csu/init.c +++ b/csu/init.c @@ -18,7 +18,7 @@ #if defined __GNUC__ && __GNUC__ >= 2 -#include <_G_config.h> +#include <stdio.h> /* This records which stdio is linked against in the application. */ const int _IO_stdin_used = _G_IO_IO_FILE_VERSION; diff --git a/include/libio.h b/include/bits/libio.h index d2fa796758..572395d5ff 100644 --- a/include/libio.h +++ b/include/bits/libio.h @@ -1,7 +1,7 @@ #if !defined _ISOMAC && defined _IO_MTSAFE_IO # include <stdio-lock.h> #endif -#include <libio/libio.h> +#include <libio/bits/libio.h> #ifndef _ISOMAC #ifndef _LIBC_LIBIO_H diff --git a/libio/Makefile b/libio/Makefile index c75e0d8e50..6eb03ab1fa 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -22,7 +22,8 @@ subdir := libio include ../Makeconfig -headers := stdio.h libio.h _G_config.h bits/stdio.h \ +headers := stdio.h libio.h _G_config.h \ + bits/stdio.h bits/libio.h bits/_G_config.h \ bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h \ bits/types/FILE.h bits/types/__FILE.h diff --git a/libio/_G_config.h b/libio/_G_config.h new file mode 100644 index 0000000000..a0d70f6f0c --- /dev/null +++ b/libio/_G_config.h @@ -0,0 +1,25 @@ +/* Copyright (C) 2017 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, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _G_CONFIG_H +#define _G_CONFIG_H 1 + +#warning "<_G_config.h> is deprecated; use <stdio.h> instead." + +#include <bits/_G_config.h> + +#endif diff --git a/libio/bits/libio.h b/libio/bits/libio.h new file mode 100644 index 0000000000..485b4577e6 --- /dev/null +++ b/libio/bits/libio.h @@ -0,0 +1,527 @@ +/* Copyright (C) 1991-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Written by Per Bothner <bothner@cygnus.com>. + + 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, see + <http://www.gnu.org/licenses/>. + + As a special exception, if you link the code in this file with + files compiled with a GNU compiler to produce an executable, + that does not cause the resulting executable to be covered by + the GNU Lesser General Public License. This exception does not + however invalidate any other reasons why the executable file + might be covered by the GNU Lesser General Public License. + This exception applies to code released by its copyright holders + in files containing the exception. */ + +#ifndef _BITS_LIBIO_H +#define _BITS_LIBIO_H 1 + +#if !defined _STDIO_H && !defined _LIBIO_H +# error "Never include <bits/libio.h> directly; use <stdio.h> instead." +#endif + +#include <bits/_G_config.h> +/* ALL of these should be defined in _G_config.h */ +#define _IO_fpos_t _G_fpos_t +#define _IO_fpos64_t _G_fpos64_t +#define _IO_size_t size_t +#define _IO_ssize_t __ssize_t +#define _IO_off_t __off_t +#define _IO_off64_t __off64_t +#define _IO_pid_t __pid_t +#define _IO_uid_t __uid_t +#define _IO_iconv_t _G_iconv_t +#define _IO_HAVE_ST_BLKSIZE _G_HAVE_ST_BLKSIZE +#define _IO_BUFSIZ _G_BUFSIZ +#define _IO_va_list _G_va_list +#define _IO_wint_t wint_t + +/* This define avoids name pollution if we're using GNU stdarg.h */ +#define __need___va_list +#include <stdarg.h> +#ifdef __GNUC_VA_LIST +# undef _IO_va_list +# define _IO_va_list __gnuc_va_list +#endif /* __GNUC_VA_LIST */ + +#ifndef __P +# include <sys/cdefs.h> +#endif /*!__P*/ + +#define _IO_UNIFIED_JUMPTABLES 1 + +#ifndef EOF +# define EOF (-1) +#endif +#ifndef NULL +# if defined __GNUG__ && \ + (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) +# define NULL (__null) +# else +# if !defined(__cplusplus) +# define NULL ((void*)0) +# else +# define NULL (0) +# endif +# endif +#endif + +#define _IOS_INPUT 1 +#define _IOS_OUTPUT 2 +#define _IOS_ATEND 4 +#define _IOS_APPEND 8 +#define _IOS_TRUNC 16 +#define _IOS_NOCREATE 32 +#define _IOS_NOREPLACE 64 +#define _IOS_BIN 128 + +/* Magic numbers and bits for the _flags field. + The magic numbers use the high-order bits of _flags; + the remaining bits are available for variable flags. + Note: The magic numbers must all be negative if stdio + emulation is desired. */ + +#define _IO_MAGIC 0xFBAD0000 /* Magic number */ +#define _OLD_STDIO_MAGIC 0xFABC0000 /* Emulate old stdio. */ +#define _IO_MAGIC_MASK 0xFFFF0000 +#define _IO_USER_BUF 1 /* User owns buffer; don't delete it on close. */ +#define _IO_UNBUFFERED 2 +#define _IO_NO_READS 4 /* Reading not allowed */ +#define _IO_NO_WRITES 8 /* Writing not allowd */ +#define _IO_EOF_SEEN 0x10 +#define _IO_ERR_SEEN 0x20 +#define _IO_DELETE_DONT_CLOSE 0x40 /* Don't call close(_fileno) on cleanup. */ +#define _IO_LINKED 0x80 /* Set if linked (using _chain) to streambuf::_list_all.*/ +#define _IO_IN_BACKUP 0x100 +#define _IO_LINE_BUF 0x200 +#define _IO_TIED_PUT_GET 0x400 /* Set if put and get pointer logicly tied. */ +#define _IO_CURRENTLY_PUTTING 0x800 +#define _IO_IS_APPENDING 0x1000 +#define _IO_IS_FILEBUF 0x2000 +#define _IO_BAD_SEEN 0x4000 +#define _IO_USER_LOCK 0x8000 + +#define _IO_FLAGS2_MMAP 1 +#define _IO_FLAGS2_NOTCANCEL 2 +#ifdef _LIBC +# define _IO_FLAGS2_FORTIFY 4 +#endif +#define _IO_FLAGS2_USER_WBUF 8 +#ifdef _LIBC +# define _IO_FLAGS2_SCANF_STD 16 +# define _IO_FLAGS2_NOCLOSE 32 +# define _IO_FLAGS2_CLOEXEC 64 +# define _IO_FLAGS2_NEED_LOCK 128 +#endif + +/* These are "formatting flags" matching the iostream fmtflags enum values. */ +#define _IO_SKIPWS 01 +#define _IO_LEFT 02 +#define _IO_RIGHT 04 +#define _IO_INTERNAL 010 +#define _IO_DEC 020 +#define _IO_OCT 040 +#define _IO_HEX 0100 +#define _IO_SHOWBASE 0200 +#define _IO_SHOWPOINT 0400 +#define _IO_UPPERCASE 01000 +#define _IO_SHOWPOS 02000 +#define _IO_SCIENTIFIC 04000 +#define _IO_FIXED 010000 +#define _IO_UNITBUF 020000 +#define _IO_STDIO 040000 +#define _IO_DONT_CLOSE 0100000 +#define _IO_BOOLALPHA 0200000 + + +struct _IO_jump_t; struct _IO_FILE; + +/* During the build of glibc itself, _IO_lock_t will already have been + defined by internal headers. */ +#ifndef _IO_lock_t_defined +typedef void _IO_lock_t; +#endif + + +/* A streammarker remembers a position in a buffer. */ + +struct _IO_marker { + struct _IO_marker *_next; + struct _IO_FILE *_sbuf; + /* If _pos >= 0 + it points to _buf->Gbase()+_pos. FIXME comment */ + /* if _pos < 0, it points to _buf->eBptr()+_pos. FIXME comment */ + int _pos; +#if 0 + void set_streampos(streampos sp) { _spos = sp; } + void set_offset(int offset) { _pos = offset; _spos = (streampos)(-2); } + public: + streammarker(streambuf *sb); + ~streammarker(); + int saving() { return _spos == -2; } + int delta(streammarker&); + int delta(); +#endif +}; + +/* This is the structure from the libstdc++ codecvt class. */ +enum __codecvt_result +{ + __codecvt_ok, + __codecvt_partial, + __codecvt_error, + __codecvt_noconv +}; + +#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T +/* The order of the elements in the following struct must match the order + of the virtual functions in the libstdc++ codecvt class. */ +struct _IO_codecvt +{ + void (*__codecvt_destr) (struct _IO_codecvt *); + enum __codecvt_result (*__codecvt_do_out) (struct _IO_codecvt *, + __mbstate_t *, + const wchar_t *, + const wchar_t *, + const wchar_t **, char *, + char *, char **); + enum __codecvt_result (*__codecvt_do_unshift) (struct _IO_codecvt *, + __mbstate_t *, char *, + char *, char **); + enum __codecvt_result (*__codecvt_do_in) (struct _IO_codecvt *, + __mbstate_t *, + const char *, const char *, + const char **, wchar_t *, + wchar_t *, wchar_t **); + int (*__codecvt_do_encoding) (struct _IO_codecvt *); + int (*__codecvt_do_always_noconv) (struct _IO_codecvt *); + int (*__codecvt_do_length) (struct _IO_codecvt *, __mbstate_t *, + const char *, const char *, _IO_size_t); + int (*__codecvt_do_max_length) (struct _IO_codecvt *); + + _IO_iconv_t __cd_in; + _IO_iconv_t __cd_out; +}; + +/* Extra data for wide character streams. */ +struct _IO_wide_data +{ + wchar_t *_IO_read_ptr; /* Current read pointer */ + wchar_t *_IO_read_end; /* End of get area. */ + wchar_t *_IO_read_base; /* Start of putback+get area. */ + wchar_t *_IO_write_base; /* Start of put area. */ + wchar_t *_IO_write_ptr; /* Current put pointer. */ + wchar_t *_IO_write_end; /* End of put area. */ + wchar_t *_IO_buf_base; /* Start of reserve area. */ + wchar_t *_IO_buf_end; /* End of reserve area. */ + /* The following fields are used to support backing up and undo. */ + wchar_t *_IO_save_base; /* Pointer to start of non-current get area. */ + wchar_t *_IO_backup_base; /* Pointer to first valid character of + backup area */ + wchar_t *_IO_save_end; /* Pointer to end of non-current get area. */ + + __mbstate_t _IO_state; + __mbstate_t _IO_last_state; + struct _IO_codecvt _codecvt; + + wchar_t _shortbuf[1]; + + const struct _IO_jump_t *_wide_vtable; +}; +#endif + +struct _IO_FILE { + int _flags; /* High-order word is _IO_MAGIC; rest is flags. */ +#define _IO_file_flags _flags + + /* The following pointers correspond to the C++ streambuf protocol. */ + /* Note: Tk uses the _IO_read_ptr and _IO_read_end fields directly. */ + char* _IO_read_ptr; /* Current read pointer */ + char* _IO_read_end; /* End of get area. */ + char* _IO_read_base; /* Start of putback+get area. */ + char* _IO_write_base; /* Start of put area. */ + char* _IO_write_ptr; /* Current put pointer. */ + char* _IO_write_end; /* End of put area. */ + char* _IO_buf_base; /* Start of reserve area. */ + char* _IO_buf_end; /* End of reserve area. */ + /* The following fields are used to support backing up and undo. */ + char *_IO_save_base; /* Pointer to start of non-current get area. */ + char *_IO_backup_base; /* Pointer to first valid character of backup area */ + char *_IO_save_end; /* Pointer to end of non-current get area. */ + + struct _IO_marker *_markers; + + struct _IO_FILE *_chain; + + int _fileno; +#if 0 + int _blksize; +#else + int _flags2; +#endif + _IO_off_t _old_offset; /* This used to be _offset but it's too small. */ + +#define __HAVE_COLUMN /* temporary */ + /* 1+column number of pbase(); 0 is unknown. */ + unsigned short _cur_column; + signed char _vtable_offset; + char _shortbuf[1]; + + /* char* _save_gptr; char* _save_egptr; */ + + _IO_lock_t *_lock; +#ifdef _IO_USE_OLD_IO_FILE +}; + +struct _IO_FILE_complete +{ + struct _IO_FILE _file; +#endif +#if defined _G_IO_IO_FILE_VERSION && _G_IO_IO_FILE_VERSION == 0x20001 + _IO_off64_t _offset; +# if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T + /* Wide character stream stuff. */ + struct _IO_codecvt *_codecvt; + struct _IO_wide_data *_wide_data; + struct _IO_FILE *_freeres_list; + void *_freeres_buf; +# else + void *__pad1; + void *__pad2; + void *__pad3; + void *__pad4; +# endif + size_t __pad5; + int _mode; + /* Make sure we don't get into trouble again. */ + char _unused2[15 * sizeof (int) - 4 * sizeof (void *) - sizeof (size_t)]; +#endif +}; + +#ifndef __cplusplus +typedef struct _IO_FILE _IO_FILE; +#endif + +struct _IO_FILE_plus; + +extern struct _IO_FILE_plus _IO_2_1_stdin_; +extern struct _IO_FILE_plus _IO_2_1_stdout_; +extern struct _IO_FILE_plus _IO_2_1_stderr_; +#ifndef _LIBC +#define _IO_stdin ((_IO_FILE*)(&_IO_2_1_stdin_)) +#define _IO_stdout ((_IO_FILE*)(&_IO_2_1_stdout_)) +#define _IO_stderr ((_IO_FILE*)(&_IO_2_1_stderr_)) +#else +extern _IO_FILE *_IO_stdin attribute_hidden; +extern _IO_FILE *_IO_stdout attribute_hidden; +extern _IO_FILE *_IO_stderr attribute_hidden; +#endif + + +/* Functions to do I/O and file management for a stream. */ + +/* Read NBYTES bytes from COOKIE into a buffer pointed to by BUF. + Return number of bytes read. */ +typedef __ssize_t __io_read_fn (void *__cookie, char *__buf, size_t __nbytes); + +/* Write N bytes pointed to by BUF to COOKIE. Write all N bytes + unless there is an error. Return number of bytes written. If + there is an error, return 0 and do not write anything. If the file + has been opened for append (__mode.__append set), then set the file + pointer to the end of the file and then do the write; if not, just + write at the current file pointer. */ +typedef __ssize_t __io_write_fn (void *__cookie, const char *__buf, + size_t __n); + +/* Move COOKIE's file position to *POS bytes from the + beginning of the file (if W is SEEK_SET), + the current position (if W is SEEK_CUR), + or the end of the file (if W is SEEK_END). + Set *POS to the new file position. + Returns zero if successful, nonzero if not. */ +typedef int __io_seek_fn (void *__cookie, _IO_off64_t *__pos, int __w); + +/* Close COOKIE. */ +typedef int __io_close_fn (void *__cookie); + + +#ifdef __USE_GNU +/* User-visible names for the above. */ +typedef __io_read_fn cookie_read_function_t; +typedef __io_write_fn cookie_write_function_t; +typedef __io_seek_fn cookie_seek_function_t; +typedef __io_close_fn cookie_close_function_t; + +/* The structure with the cookie function pointers. */ +typedef struct +{ + __io_read_fn *read; /* Read bytes. */ + __io_write_fn *write; /* Write bytes. */ + __io_seek_fn *seek; /* Seek/tell file position. */ + __io_close_fn *close; /* Close file. */ +} _IO_cookie_io_functions_t; +typedef _IO_cookie_io_functions_t cookie_io_functions_t; + +struct _IO_cookie_file; + +/* Initialize one of those. */ +extern void _IO_cookie_init (struct _IO_cookie_file *__cfile, int __read_write, + void *__cookie, _IO_cookie_io_functions_t __fns); +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +extern int __underflow (_IO_FILE *); +extern int __uflow (_IO_FILE *); +extern int __overflow (_IO_FILE *, int); +#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T +extern _IO_wint_t __wunderflow (_IO_FILE *); +extern _IO_wint_t __wuflow (_IO_FILE *); +extern _IO_wint_t __woverflow (_IO_FILE *, _IO_wint_t); +#endif + +#if __GNUC__ >= 3 +# define _IO_BE(expr, res) __builtin_expect ((expr), res) +#else +# define _IO_BE(expr, res) (expr) +#endif + +#define _IO_getc_unlocked(_fp) \ + (_IO_BE ((_fp)->_IO_read_ptr >= (_fp)->_IO_read_end, 0) \ + ? __uflow (_fp) : *(unsigned char |