mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
48a8f83281
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. Move both of these headers into the bits directory and provide stubs at top level which issue deprecation warnings. The contents of (bits/)libio.h and (bits/)_G_config.h are still exposed to external software via stdio.h; changing that requires more complex surgery than I have time to attempt right now. * 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.
80 lines
2.8 KiB
C
80 lines
2.8 KiB
C
/* Copyright (C) 1993-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/>.
|
|
|
|
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. */
|
|
|
|
/* We need to avoid the header declarations of these, because
|
|
the types don't match _IO_fsetpos and then the compiler will
|
|
complain about the mismatch when we do the alias below. */
|
|
#define _IO_new_fsetpos64 __renamed__IO_new_fsetpos64
|
|
#define _IO_fsetpos64 __renamed__IO_fsetpos64
|
|
#define fsetpos64 __renamed_fsetpos64
|
|
|
|
#include <libioP.h>
|
|
|
|
#undef _IO_new_fsetpos64
|
|
#undef _IO_fsetpos64
|
|
#undef fsetpos64
|
|
|
|
#include <errno.h>
|
|
#include <shlib-compat.h>
|
|
|
|
int
|
|
_IO_new_fsetpos (_IO_FILE *fp, const _IO_fpos_t *posp)
|
|
{
|
|
int result;
|
|
CHECK_FILE (fp, EOF);
|
|
_IO_acquire_lock (fp);
|
|
if (_IO_seekpos_unlocked (fp, posp->__pos, _IOS_INPUT|_IOS_OUTPUT)
|
|
== _IO_pos_BAD)
|
|
{
|
|
/* ANSI explicitly requires setting errno to a positive value on
|
|
failure. */
|
|
if (errno == 0)
|
|
__set_errno (EIO);
|
|
result = EOF;
|
|
}
|
|
else
|
|
{
|
|
result = 0;
|
|
if (fp->_mode > 0
|
|
&& (*fp->_codecvt->__codecvt_do_encoding) (fp->_codecvt) < 0)
|
|
/* This is a stateful encoding, restore the state. */
|
|
fp->_wide_data->_IO_state = posp->__state;
|
|
}
|
|
_IO_release_lock (fp);
|
|
return result;
|
|
}
|
|
|
|
strong_alias (_IO_new_fsetpos, __new_fsetpos)
|
|
versioned_symbol (libc, _IO_new_fsetpos, _IO_fsetpos, GLIBC_2_2);
|
|
versioned_symbol (libc, __new_fsetpos, fsetpos, GLIBC_2_2);
|
|
|
|
#ifdef __OFF_T_MATCHES_OFF64_T
|
|
strong_alias (_IO_new_fsetpos, _IO_new_fsetpos64)
|
|
strong_alias (_IO_new_fsetpos64, __new_fsetpos64)
|
|
versioned_symbol (libc, __new_fsetpos64, fsetpos64, GLIBC_2_2);
|
|
versioned_symbol (libc, _IO_new_fsetpos64, _IO_fsetpos64, GLIBC_2_2);
|
|
#endif
|