2024-01-02 02:12:26 +08:00
|
|
|
/* Copyright (C) 1993-2024 Free Software Foundation, Inc.
|
2001-07-06 12:58:11 +08:00
|
|
|
This file is part of the GNU C Library.
|
1997-10-13 09:27:24 +08:00
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
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.
|
1997-10-13 09:27:24 +08:00
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
1997-10-13 09:27:24 +08:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 12:58:11 +08:00
|
|
|
Lesser General Public License for more details.
|
1997-10-13 09:27:24 +08:00
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-10 07:18:22 +08:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 13:40:42 +08:00
|
|
|
<https://www.gnu.org/licenses/>.
|
1997-10-13 09:27:24 +08:00
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
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. */
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
/* This is a compatibility file. If we don't build the libc with
|
|
|
|
versioning don't compile this file. */
|
2000-03-27 13:18:47 +08:00
|
|
|
#include <shlib-compat.h>
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
|
1997-10-13 09:27:24 +08:00
|
|
|
|
1997-12-15 06:24:57 +08:00
|
|
|
#define _IO_USE_OLD_IO_FILE
|
1997-10-13 09:27:24 +08:00
|
|
|
#include "libioP.h"
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
1999-03-27 02:23:22 +08:00
|
|
|
#include <stdlib.h>
|
2015-08-06 23:51:31 +08:00
|
|
|
#include <unistd.h>
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
/* An fstream can be in at most one of put mode, get mode, or putback mode.
|
|
|
|
Putback mode is a variant of get mode.
|
|
|
|
|
|
|
|
In a filebuf, there is only one current position, instead of two
|
|
|
|
separate get and put pointers. In get mode, the current position
|
|
|
|
is that of gptr(); in put mode that of pptr().
|
|
|
|
|
|
|
|
The position in the buffer that corresponds to the position
|
|
|
|
in external file system is normally _IO_read_end, except in putback
|
|
|
|
mode, when it is _IO_save_end.
|
|
|
|
If the field _fb._offset is >= 0, it gives the offset in
|
|
|
|
the file as a whole corresponding to eGptr(). (?)
|
|
|
|
|
|
|
|
PUT MODE:
|
|
|
|
If a filebuf is in put mode, then all of _IO_read_ptr, _IO_read_end,
|
|
|
|
and _IO_read_base are equal to each other. These are usually equal
|
|
|
|
to _IO_buf_base, though not necessarily if we have switched from
|
|
|
|
get mode to put mode. (The reason is to maintain the invariant
|
|
|
|
that _IO_read_end corresponds to the external file position.)
|
2012-09-06 00:34:10 +08:00
|
|
|
_IO_write_base is non-NULL and usually equal to _IO_buf_base.
|
1997-10-13 09:27:24 +08:00
|
|
|
We also have _IO_write_end == _IO_buf_end, but only in fully buffered mode.
|
|
|
|
The un-flushed character are those between _IO_write_base and _IO_write_ptr.
|
|
|
|
|
|
|
|
GET MODE:
|
|
|
|
If a filebuf is in get or putback mode, eback() != egptr().
|
|
|
|
In get mode, the unread characters are between gptr() and egptr().
|
|
|
|
The OS file position corresponds to that of egptr().
|
|
|
|
|
|
|
|
PUTBACK MODE:
|
|
|
|
Putback mode is used to remember "excess" characters that have
|
|
|
|
been sputbackc'd in a separate putback buffer.
|
|
|
|
In putback mode, the get buffer points to the special putback buffer.
|
|
|
|
The unread characters are the characters between gptr() and egptr()
|
|
|
|
in the putback buffer, as well as the area between save_gptr()
|
|
|
|
and save_egptr(), which point into the original reserve buffer.
|
|
|
|
(The pointers save_gptr() and save_egptr() are the values
|
|
|
|
of gptr() and egptr() at the time putback mode was entered.)
|
|
|
|
The OS position corresponds to that of save_egptr().
|
|
|
|
|
|
|
|
LINE BUFFERED OUTPUT:
|
|
|
|
During line buffered output, _IO_write_base==base() && epptr()==base().
|
|
|
|
However, ptr() may be anywhere between base() and ebuf().
|
|
|
|
This forces a call to filebuf::overflow(int C) on every put.
|
|
|
|
If there is more space in the buffer, and C is not a '\n',
|
|
|
|
then C is inserted, and pptr() incremented.
|
|
|
|
|
|
|
|
UNBUFFERED STREAMS:
|
|
|
|
If a filebuf is unbuffered(), the _shortbuf[1] is used as the buffer.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define CLOSED_FILEBUF_FLAGS \
|
|
|
|
(_IO_IS_FILEBUF+_IO_NO_READS+_IO_NO_WRITES+_IO_TIED_PUT_GET)
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
libio: Implement vtable verification [BZ #20191]
This commit puts all libio vtables in a dedicated, read-only ELF
section, so that they are consecutive in memory. Before any indirect
jump, the vtable pointer is checked against the section boundaries,
and the process is terminated if the vtable pointer does not fall into
the special ELF section.
To enable backwards compatibility, a special flag variable
(_IO_accept_foreign_vtables), protected by the pointer guard, avoids
process termination if libio stream object constructor functions have
been called earlier. Such constructor functions are called by the GCC
2.95 libstdc++ library, and this mechanism ensures compatibility with
old binaries. Existing callers inside glibc of these functions are
adjusted to call the original functions, not the wrappers which enable
vtable compatiblity.
The compatibility mechanism is used to enable passing FILE * objects
across a static dlopen boundary, too.
2016-06-24 02:01:40 +08:00
|
|
|
_IO_old_file_init_internal (struct _IO_FILE_plus *fp)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
|
|
|
/* POSIX.1 allows another file handle to be used to change the position
|
|
|
|
of our file descriptor. Hence we actually don't know the actual
|
|
|
|
position before we do the first fseek (and until a following fflush). */
|
2000-06-28 Greg McGary <greg@mcgary.org>
* libio/libio.h (struct _IO_cookie_file): Move struct type defintion out.
(_IO_FILE): Declare chain as (struct _IO_FILE_plus *).
* libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in.
(_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *).
(_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to
THIS, since _IO_JUMPS no longer does it implicitly.
(_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
(_IO_str_init_static, _IO_str_init_readonly): Declare 1st
arg as (_IO_strfile *).
* libio/strops.c (_IO_str_init_static, _IO_str_init_readonly):
Declare 1st arg as (_IO_strfile *).
* libio/fileops.c (_IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
* libio/oldfileops.c (_IO_old_file_init): Likewise.
* libio/genops.c (_IO_link_in, _IO_un_link): Likewise.
(_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write):
Declare iteration pointer as (struct _IO_FILE_plus *).
(_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *).
* libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *).
* libio/oldstdfiles.c (_IO_list_all): Likewise.
(_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *).
* libio/stdio.c (stdin, stdout, stderr): Set user-visible handles
to (struct _IO_FILE_plus *).
* libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer
whose high bound includes vtable to all functions that will use
vtable. For streambufs, pass pointer whose bounds include struct
_IO_strfile.
* libio/wgenops.c (_IO_wdefault_finish): Likewise.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* libio/iofopen.c (_IO_new_fopen): Likewise.
* libio/oldiofopen.c (_IO_old_fopen): Likewise.
* libio/iofopen64.c (_IO_fopen64): Likewise.
* libio/iopopen.c (_IO_new_popen): Likewise.
* libio/oldiopopen.c (_IO_old_popen): Likewise.
* libio/memstream.c (open_memstream): Likewise.
* libio/iovsscanf.c (_IO_vsscanf): Likewise.
* libio/iovsprintf.c (_IO_vsprintf): Likewise.
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
* libio/iofopncook.c (_IO_cookie_init): Likewise.
* libio/obprintf.c (_IO_obstack_vprintf): Likewise.
* libio/vasprintf.c (_IO_vasprintf): Likewise.
* libio/vsnprintf.c (_IO_vsnprintf): Likewise.
* libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* stdlib/strfmon.c (__strfmon_l): Likewise.
* stdio-common/vfprintf.c (buffered_vfprintf): Likewise.
(vfprintf): Qualify computed-goto targets as unbounded.
2000-06-28 Greg McGary <greg@mcgary.org>
* libio/libio.h (struct _IO_cookie_file): Move struct type defintion out.
(_IO_FILE): Declare chain as (struct _IO_FILE_plus *).
* libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in.
(_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *).
(_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to
THIS, since _IO_JUMPS no longer does it implicitly.
(_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
(_IO_str_init_static, _IO_str_init_readonly): Declare 1st
arg as (_IO_strfile *).
* libio/strops.c (_IO_str_init_static, _IO_str_init_readonly):
Declare 1st arg as (_IO_strfile *).
* libio/fileops.c (_IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
* libio/oldfileops.c (_IO_old_file_init): Likewise.
* libio/genops.c (_IO_link_in, _IO_un_link): Likewise.
(_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write):
Declare iteration pointer as (struct _IO_FILE_plus *).
(_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *).
* libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *).
* libio/oldstdfiles.c (_IO_list_all): Likewise.
(_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *).
* libio/stdio.c (stdin, stdout, stderr): Set user-visible handles
to (struct _IO_FILE_plus *).
* libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer
whose high bound includes vtable to all functions that will use
vtable. For streambufs, pass pointer whose bounds include struct
_IO_strfile.
* libio/wgenops.c (_IO_wdefault_finish): Likewise.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* libio/iofopen.c (_IO_new_fopen): Likewise.
* libio/oldiofopen.c (_IO_old_fopen): Likewise.
* libio/iofopen64.c (_IO_fopen64): Likewise.
* libio/iopopen.c (_IO_new_popen): Likewise.
* libio/oldiopopen.c (_IO_old_popen): Likewise.
* libio/memstream.c (open_memstream): Likewise.
* libio/iovsscanf.c (_IO_vsscanf): Likewise.
* libio/iovsprintf.c (_IO_vsprintf): Likewise.
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
* libio/iofopncook.c (_IO_cookie_init): Likewise.
* libio/obprintf.c (_IO_obstack_vprintf): Likewise.
* libio/vasprintf.c (_IO_vasprintf): Likewise.
* libio/vsnprintf.c (_IO_vsnprintf): Likewise.
* libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* stdlib/strfmon.c (__strfmon_l): Likewise.
* stdio-common/vfprintf.c (buffered_vfprintf): Likewise.
(vfprintf): Qualify computed-goto targets as unbounded.
2000-06-29 15:16:42 +08:00
|
|
|
fp->file._old_offset = _IO_pos_BAD;
|
2018-02-08 08:41:01 +08:00
|
|
|
fp->file._flags |= CLOSED_FILEBUF_FLAGS;
|
1997-10-13 09:27:24 +08:00
|
|
|
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_link_in (fp);
|
2000-06-28 Greg McGary <greg@mcgary.org>
* libio/libio.h (struct _IO_cookie_file): Move struct type defintion out.
(_IO_FILE): Declare chain as (struct _IO_FILE_plus *).
* libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in.
(_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *).
(_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to
THIS, since _IO_JUMPS no longer does it implicitly.
(_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
(_IO_str_init_static, _IO_str_init_readonly): Declare 1st
arg as (_IO_strfile *).
* libio/strops.c (_IO_str_init_static, _IO_str_init_readonly):
Declare 1st arg as (_IO_strfile *).
* libio/fileops.c (_IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
* libio/oldfileops.c (_IO_old_file_init): Likewise.
* libio/genops.c (_IO_link_in, _IO_un_link): Likewise.
(_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write):
Declare iteration pointer as (struct _IO_FILE_plus *).
(_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *).
* libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *).
* libio/oldstdfiles.c (_IO_list_all): Likewise.
(_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *).
* libio/stdio.c (stdin, stdout, stderr): Set user-visible handles
to (struct _IO_FILE_plus *).
* libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer
whose high bound includes vtable to all functions that will use
vtable. For streambufs, pass pointer whose bounds include struct
_IO_strfile.
* libio/wgenops.c (_IO_wdefault_finish): Likewise.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* libio/iofopen.c (_IO_new_fopen): Likewise.
* libio/oldiofopen.c (_IO_old_fopen): Likewise.
* libio/iofopen64.c (_IO_fopen64): Likewise.
* libio/iopopen.c (_IO_new_popen): Likewise.
* libio/oldiopopen.c (_IO_old_popen): Likewise.
* libio/memstream.c (open_memstream): Likewise.
* libio/iovsscanf.c (_IO_vsscanf): Likewise.
* libio/iovsprintf.c (_IO_vsprintf): Likewise.
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
* libio/iofopncook.c (_IO_cookie_init): Likewise.
* libio/obprintf.c (_IO_obstack_vprintf): Likewise.
* libio/vasprintf.c (_IO_vasprintf): Likewise.
* libio/vsnprintf.c (_IO_vsnprintf): Likewise.
* libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* stdlib/strfmon.c (__strfmon_l): Likewise.
* stdio-common/vfprintf.c (buffered_vfprintf): Likewise.
(vfprintf): Qualify computed-goto targets as unbounded.
2000-06-28 Greg McGary <greg@mcgary.org>
* libio/libio.h (struct _IO_cookie_file): Move struct type defintion out.
(_IO_FILE): Declare chain as (struct _IO_FILE_plus *).
* libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in.
(_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *).
(_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to
THIS, since _IO_JUMPS no longer does it implicitly.
(_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
(_IO_str_init_static, _IO_str_init_readonly): Declare 1st
arg as (_IO_strfile *).
* libio/strops.c (_IO_str_init_static, _IO_str_init_readonly):
Declare 1st arg as (_IO_strfile *).
* libio/fileops.c (_IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
* libio/oldfileops.c (_IO_old_file_init): Likewise.
* libio/genops.c (_IO_link_in, _IO_un_link): Likewise.
(_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write):
Declare iteration pointer as (struct _IO_FILE_plus *).
(_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *).
* libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *).
* libio/oldstdfiles.c (_IO_list_all): Likewise.
(_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *).
* libio/stdio.c (stdin, stdout, stderr): Set user-visible handles
to (struct _IO_FILE_plus *).
* libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer
whose high bound includes vtable to all functions that will use
vtable. For streambufs, pass pointer whose bounds include struct
_IO_strfile.
* libio/wgenops.c (_IO_wdefault_finish): Likewise.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* libio/iofopen.c (_IO_new_fopen): Likewise.
* libio/oldiofopen.c (_IO_old_fopen): Likewise.
* libio/iofopen64.c (_IO_fopen64): Likewise.
* libio/iopopen.c (_IO_new_popen): Likewise.
* libio/oldiopopen.c (_IO_old_popen): Likewise.
* libio/memstream.c (open_memstream): Likewise.
* libio/iovsscanf.c (_IO_vsscanf): Likewise.
* libio/iovsprintf.c (_IO_vsprintf): Likewise.
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
* libio/iofopncook.c (_IO_cookie_init): Likewise.
* libio/obprintf.c (_IO_obstack_vprintf): Likewise.
* libio/vasprintf.c (_IO_vasprintf): Likewise.
* libio/vsnprintf.c (_IO_vsnprintf): Likewise.
* libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* stdlib/strfmon.c (__strfmon_l): Likewise.
* stdio-common/vfprintf.c (buffered_vfprintf): Likewise.
(vfprintf): Qualify computed-goto targets as unbounded.
2000-06-29 15:16:42 +08:00
|
|
|
fp->file._vtable_offset = ((int) sizeof (struct _IO_FILE)
|
|
|
|
- (int) sizeof (struct _IO_FILE_complete));
|
|
|
|
fp->file._fileno = -1;
|
2003-08-26 06:02:03 +08:00
|
|
|
|
libio: Eliminate _IO_stdin, _IO_stdout, _IO_stderr
These variables are only used to determine if a stdio stream is
a pre-allocated stream, but it is possible to do so by comparing
a FILE * to all pre-allocated stream objects. As a result, it is
not necessary to keep those pointers in separate variables.
Behavior with symbol interposition is unchanged because _IO_stdin_,
_IO_stdout_, _IO_stderr_ are exported, and refer to objects outside of
libc if symbol interposition or copy relocations are involved. (The
removed variables _IO_stdin, _IO_stdout, _IO_stderr were not exported,
of course.)
2019-02-18 18:49:54 +08:00
|
|
|
if (&_IO_stdin_used != NULL || !_IO_legacy_file ((FILE *) fp))
|
2003-08-26 06:02:03 +08:00
|
|
|
/* The object is dynamically allocated and large enough. Initialize
|
|
|
|
the _mode element as well. */
|
2003-08-26 16:08:21 +08:00
|
|
|
((struct _IO_FILE_complete *) fp)->_mode = -1;
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
|
libio: Implement vtable verification [BZ #20191]
This commit puts all libio vtables in a dedicated, read-only ELF
section, so that they are consecutive in memory. Before any indirect
jump, the vtable pointer is checked against the section boundaries,
and the process is terminated if the vtable pointer does not fall into
the special ELF section.
To enable backwards compatibility, a special flag variable
(_IO_accept_foreign_vtables), protected by the pointer guard, avoids
process termination if libio stream object constructor functions have
been called earlier. Such constructor functions are called by the GCC
2.95 libstdc++ library, and this mechanism ensures compatibility with
old binaries. Existing callers inside glibc of these functions are
adjusted to call the original functions, not the wrappers which enable
vtable compatiblity.
The compatibility mechanism is used to enable passing FILE * objects
across a static dlopen boundary, too.
2016-06-24 02:01:40 +08:00
|
|
|
void
|
|
|
|
attribute_compat_text_section
|
|
|
|
_IO_old_file_init (struct _IO_FILE_plus *fp)
|
|
|
|
{
|
|
|
|
IO_set_accept_foreign_vtables (&_IO_vtable_check);
|
|
|
|
_IO_old_file_init_internal (fp);
|
|
|
|
}
|
|
|
|
|
1997-10-13 09:27:24 +08:00
|
|
|
int
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_close_it (FILE *fp)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
|
|
|
int write_status, close_status;
|
|
|
|
if (!_IO_file_is_open (fp))
|
|
|
|
return EOF;
|
|
|
|
|
Update.
1997-11-18 02:31 Ulrich Drepper <drepper@cygnus.com>
* iconv/Makefile: New file.
* iconv/gconv.c: New file.
* iconv/gconv.h: New file.
* iconv/gconv_builtin.c: New file.
* iconv/gconv_builtin.h: New file.
* iconv/gconv_close.c: New file.
* iconv/gconv_conf.c: New file.
* iconv/gconv_db.c: New file.
* iconv/gconv_dl.c: New file.
* iconv/gconv_open.c: New file.
* iconv/gconv_simple.c: New file.
* iconv/iconv.c: New file.
* iconv/iconv.h: New file.
* iconv/iconv_close.c: New file.
* iconv/iconv_open.c: New file.
* include/gconv.h: New file.
* Makeconfig: Define gconvdir.
* Makefile (subdirs): Add iconv.
* string/bits/string2.h: Add optimization for strtok_r.
* sysdeps/generic/_G_config.h: Define __need_NULL to get definition
for NULL.
Reported by H.J. Lu <hjl@gnu.ai.mit.edu>.
* configure.in: Correct test for bash2.
* locale/Makefile (CFLAGS-charmap.c): Add -Wno-char-subscripts.
(CFLAGS-locfile.c): Likewise.
Suggested by Zack Weinberg <zack@rabi.phys.columbia.edu>.
* misc/hsearch_r.c (hsearch_r): Avoid undefinitely search for
non-existing entry if the table is full.
* posix/regex.h: Pretty print.
* stdio-common/printf_fp.c: Don't define NDEBUG if already defined.
* sysdeps/posix/ctermid.c: Simplify a bit.
* sysdeps/unix/sysv/linux/net/if.h: Pretty print.
1997-11-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/quota.h: Add include for
<sys/types.h> instead of <asm/types.h>.
1997-11-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (asin_test): Add epsilon for asin (0.5).
1997-11-16 17:09 H.J. Lu <hjl@gnu.ai.mit.edu>
* libc.map (_IO_stdin_, _IO_stdout_, _IO_stderr_, _IO_fopen,
fopen, freopen, _IO_fclose, fclose): Added to GLIBC_2.0.
(_IO_stdin_, _IO_stdout_, _IO_stderr_): Removed from GLIBC_2.1.
(_IO_2_1_stdin_, _IO_2_1_stdout_, _IO_2_1_stderr_, _IO_fclose,
fclose): Added to GLIBC_2.1.
* libio/Makefile (routines, shared-only-routines): Add
oldiofclose. Remove oldfreopen.
* libio/freopen.c (freopen): When PIC is defined, call
_IO_old_freopen () for old stdio.
* libio/iofclose.c (_IO_new_fclose): Renamed from _IO_fclose.
(_IO_fclose, fclose): Use _IO_new_fclose as default version
for GLIBC_2.1.
* libio/iolibio.h (_IO_old_freopen): Use _IO_old_file_close_it
instead of _IO_file_close_it.
* libio/libio.h (_IO_stdin_, _IO_stdout_, _IO_stderr_): Changed
to _IO_2_1_stdxxx_.
(_IO_stdin, _IO_stdout, _IO_stderr): Declare as extern if _LIBC
* libio/libioP.h (_IO_old_do_flush): New.
* libio/oldfileops.c (_IO_old_file_close_it,
_IO_old_file_finish, _IO_old_file_overflow, _IO_old_file_sync):
Call _IO_old_do_flush () instead of _IO_do_flush ().
(_IO_old_file_xsputn): Call _IO_old_do_write () instead of
_IO_do_write ().
* libio/oldiofopen.c (_IO_old_fopen): Call _IO_old_file_init ()
instead of _IO_file_init ().
Bind old symbols to version GLIBC_2.0.
* libio/oldstdfiles.c (DEF_STDFILE): Don't use symbol_version.
(_IO_old_stdin_, _IO_old_stdout_, _IO_old_stderr_): Changed to
_IO_stdxxx_.
(_IO_check_libio): New function in .init.
* libio/oldiofclose.c: New file.
* libio/stdfiles.c (_IO_new_stdin_, _IO_new_stdout_,
_IO_new_stderr_): Changed to _IO_2_1_stdxxx_.
(DEF_STDFILE): Don't use default_symbol_version.
* libio/stdio.c (stdin, stdout, stderr): Set to
_IO_2_1_stdxxx_._
(_IO_stdin, _IO_stdout, _IO_stderr): New, strong alias of
stdxxx.
* csu/Makefile (distribute): Add init.c.
(extra-objs): Add init.o for ELF.
(start-installed-name): Add $(objpfx)init.o.
* csu/init.c: New file.
1997-11-12 08:02 H.J. Lu <hjl@gnu.ai.mit.edu>
* elf/dl-lookup.c (do_lookup): Don't use the hidden base
definition as the default.
1997-08-27 Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>
* erand48_r.c (__erand48_r): Implement for 32 bit short int.
1997-11-15 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* elf/genrtldtbl.awk: Replace gensub for compatibility with gawk2
(PR 351).
1997-11-16 21:01 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/arm/sysdep.h: Use __APCS_32__ to decide whether or not
to preserve condition codes on function call.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/generic/s_exp2l.c: Change exp2l to __ieee754_exp2l.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (asin_test): Add epsilon for float.
(tan_test): Add epsilon for float.
(log1p_test): Add epsilon for float.
(inverse_functions): Add epsilons.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [socket]: Add
net/if_packet.h.
* sysdeps/unix/sysv/linux/Dist: Add net/if_packet.h.
1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* md5-crypt/Makefile (extra-objs): Make recursively expanded
variable, since $(object-suffixes) is not defined yet.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* db2/Makefile (distribute): db185/db185_int.src ->
db185/db185_int.h.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* misc/tst-fdset.c: Don't require the value of FD_ISSET to be
exactly one.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/e_acoshl.c: Fix stub_warning: use the user level
* sysdeps/generic/e_acosl.c: Likewise.
* sysdeps/generic/e_asinl.c: Likewise.
* sysdeps/generic/e_atan2l.c: Likewise.
* sysdeps/generic/e_expl.c: Likewise.
* sysdeps/generic/e_fmodl.c: Likewise.
* sysdeps/generic/e_j0l.c: Likewise.
* sysdeps/generic/e_j1l.c: Likewise.
* sysdeps/generic/e_jnl.c: Likewise.
* sysdeps/generic/e_lgammal_r.c: Likewise.
* sysdeps/generic/e_log10l.c: Likewise.
* sysdeps/generic/e_logl.c: Likewise.
* sysdeps/generic/e_powl.c: Likewise.
* sysdeps/generic/e_sqrtl.c: Likewise.
* sysdeps/generic/e_exp2l.c: Likewise.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (+sysdep-names): Remove extra paren.
* Makefile (distribute): Add stub-tag.h.
* elf/Makefile (distribute): Add atomicity.h.
* stdlib/Makefile (headers): Add ucontext.h and sys/ucontext.h.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers)
[$(subdir)=socket]: Add net/if_packet.h.
* sysdeps/alpha/Dist: Remove setjmp_aux.c.
* sysdeps/unix/sysv/linux/Dist: Add s_pread64.c, s_pwrite64.c,
net/if_packet.h, scsi/sg.h.
1997-11-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (install): Quote $(CC) expansion.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Added caching of
working /proc cwd and no restrictions on path length. Following
some ideas from Andi Kleen <ak@muc.de> (PR 350).
1997-11-14 19:14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_compat/compat-grp.c: Remove buggy assert call.
1997-11-14 22:23 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fdim.S: New file.
* sysdeps/libm-i387/s_fdimf.S: New file.
* sysdeps/libm-i387/s_fdiml.S: New file.
* sysdeps/libm-i387/i686/s_fdim.S: New file.
* sysdeps/libm-i387/i686/s_fdimf.S: New file.
* sysdeps/libm-i387/i686/s_fdiml.S: New file.
1997-11-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (strstr): Avoid warning if HAYSTACK is a
pointer to unsigned char.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_llrintf.c (__llrintf): Fix function.
* sysdeps/libm-ieee754/s_lrintf.c (__lrintf): Fix function.
* sysdeps/libm-ieee754/s_lrint.c (__lrint): Fix function.
1997-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_ilogbf.c: Correct return values for
ilogb(0/NaN).
* sysdeps/libm-ieee754/s_ilogbl.c: Likewise.
* sysdeps/libm-ieee754/s_ilogb.c: Likewise.
1997-11-14 05:44 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fmin.S: New file.
* sysdeps/libm-i387/s_fminf.S: New file.
* sysdeps/libm-i387/s_fminl.S: New file.
* sysdeps/libm-i387/s_fmax.S: New file.
* sysdeps/libm-i387/s_fmaxf.S: New file.
* sysdeps/libm-i387/s_fmaxl.S: New file.
* sysdeps/libm-i387/i686/s_fmin.S: New file.
* sysdeps/libm-i387/i686/s_fminf.S: New file.
* sysdeps/libm-i387/i686/s_fminl.S: New file.
* sysdeps/libm-i387/i686/s_fmax.S: New file.
* sysdeps/libm-i387/i686/s_fmaxf.S: New file.
* sysdeps/libm-i387/i686/s_fmaxl.S: New file.
1997-11-14 03:06 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/accept.S: Add __libc_accept as alias.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
Reported by Christopher Wiles <wileyc@ai.cs.fujitsu.co.jp>.
See ChangeLog.7 for earlier changes.
1997-11-18 10:50:07 +08:00
|
|
|
write_status = _IO_old_do_flush (fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_unsave_markers (fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
|
2011-05-16 03:28:46 +08:00
|
|
|
close_status = ((fp->_flags2 & _IO_FLAGS2_NOCLOSE) == 0
|
|
|
|
? _IO_SYSCLOSE (fp) : 0);
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
/* Free buffer. */
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_setb (fp, NULL, NULL, 0);
|
1997-10-13 09:27:24 +08:00
|
|
|
_IO_setg (fp, NULL, NULL, NULL);
|
|
|
|
_IO_setp (fp, NULL, NULL);
|
|
|
|
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_un_link ((struct _IO_FILE_plus *) fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;
|
1999-07-08 19:59:45 +08:00
|
|
|
fp->_fileno = -1;
|
1997-10-13 09:27:24 +08:00
|
|
|
fp->_old_offset = _IO_pos_BAD;
|
|
|
|
|
|
|
|
return close_status ? close_status : write_status;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_finish (FILE *fp, int dummy)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
|
|
|
if (_IO_file_is_open (fp))
|
|
|
|
{
|
Update.
1997-11-18 02:31 Ulrich Drepper <drepper@cygnus.com>
* iconv/Makefile: New file.
* iconv/gconv.c: New file.
* iconv/gconv.h: New file.
* iconv/gconv_builtin.c: New file.
* iconv/gconv_builtin.h: New file.
* iconv/gconv_close.c: New file.
* iconv/gconv_conf.c: New file.
* iconv/gconv_db.c: New file.
* iconv/gconv_dl.c: New file.
* iconv/gconv_open.c: New file.
* iconv/gconv_simple.c: New file.
* iconv/iconv.c: New file.
* iconv/iconv.h: New file.
* iconv/iconv_close.c: New file.
* iconv/iconv_open.c: New file.
* include/gconv.h: New file.
* Makeconfig: Define gconvdir.
* Makefile (subdirs): Add iconv.
* string/bits/string2.h: Add optimization for strtok_r.
* sysdeps/generic/_G_config.h: Define __need_NULL to get definition
for NULL.
Reported by H.J. Lu <hjl@gnu.ai.mit.edu>.
* configure.in: Correct test for bash2.
* locale/Makefile (CFLAGS-charmap.c): Add -Wno-char-subscripts.
(CFLAGS-locfile.c): Likewise.
Suggested by Zack Weinberg <zack@rabi.phys.columbia.edu>.
* misc/hsearch_r.c (hsearch_r): Avoid undefinitely search for
non-existing entry if the table is full.
* posix/regex.h: Pretty print.
* stdio-common/printf_fp.c: Don't define NDEBUG if already defined.
* sysdeps/posix/ctermid.c: Simplify a bit.
* sysdeps/unix/sysv/linux/net/if.h: Pretty print.
1997-11-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/quota.h: Add include for
<sys/types.h> instead of <asm/types.h>.
1997-11-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (asin_test): Add epsilon for asin (0.5).
1997-11-16 17:09 H.J. Lu <hjl@gnu.ai.mit.edu>
* libc.map (_IO_stdin_, _IO_stdout_, _IO_stderr_, _IO_fopen,
fopen, freopen, _IO_fclose, fclose): Added to GLIBC_2.0.
(_IO_stdin_, _IO_stdout_, _IO_stderr_): Removed from GLIBC_2.1.
(_IO_2_1_stdin_, _IO_2_1_stdout_, _IO_2_1_stderr_, _IO_fclose,
fclose): Added to GLIBC_2.1.
* libio/Makefile (routines, shared-only-routines): Add
oldiofclose. Remove oldfreopen.
* libio/freopen.c (freopen): When PIC is defined, call
_IO_old_freopen () for old stdio.
* libio/iofclose.c (_IO_new_fclose): Renamed from _IO_fclose.
(_IO_fclose, fclose): Use _IO_new_fclose as default version
for GLIBC_2.1.
* libio/iolibio.h (_IO_old_freopen): Use _IO_old_file_close_it
instead of _IO_file_close_it.
* libio/libio.h (_IO_stdin_, _IO_stdout_, _IO_stderr_): Changed
to _IO_2_1_stdxxx_.
(_IO_stdin, _IO_stdout, _IO_stderr): Declare as extern if _LIBC
* libio/libioP.h (_IO_old_do_flush): New.
* libio/oldfileops.c (_IO_old_file_close_it,
_IO_old_file_finish, _IO_old_file_overflow, _IO_old_file_sync):
Call _IO_old_do_flush () instead of _IO_do_flush ().
(_IO_old_file_xsputn): Call _IO_old_do_write () instead of
_IO_do_write ().
* libio/oldiofopen.c (_IO_old_fopen): Call _IO_old_file_init ()
instead of _IO_file_init ().
Bind old symbols to version GLIBC_2.0.
* libio/oldstdfiles.c (DEF_STDFILE): Don't use symbol_version.
(_IO_old_stdin_, _IO_old_stdout_, _IO_old_stderr_): Changed to
_IO_stdxxx_.
(_IO_check_libio): New function in .init.
* libio/oldiofclose.c: New file.
* libio/stdfiles.c (_IO_new_stdin_, _IO_new_stdout_,
_IO_new_stderr_): Changed to _IO_2_1_stdxxx_.
(DEF_STDFILE): Don't use default_symbol_version.
* libio/stdio.c (stdin, stdout, stderr): Set to
_IO_2_1_stdxxx_._
(_IO_stdin, _IO_stdout, _IO_stderr): New, strong alias of
stdxxx.
* csu/Makefile (distribute): Add init.c.
(extra-objs): Add init.o for ELF.
(start-installed-name): Add $(objpfx)init.o.
* csu/init.c: New file.
1997-11-12 08:02 H.J. Lu <hjl@gnu.ai.mit.edu>
* elf/dl-lookup.c (do_lookup): Don't use the hidden base
definition as the default.
1997-08-27 Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>
* erand48_r.c (__erand48_r): Implement for 32 bit short int.
1997-11-15 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* elf/genrtldtbl.awk: Replace gensub for compatibility with gawk2
(PR 351).
1997-11-16 21:01 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/arm/sysdep.h: Use __APCS_32__ to decide whether or not
to preserve condition codes on function call.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/generic/s_exp2l.c: Change exp2l to __ieee754_exp2l.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (asin_test): Add epsilon for float.
(tan_test): Add epsilon for float.
(log1p_test): Add epsilon for float.
(inverse_functions): Add epsilons.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [socket]: Add
net/if_packet.h.
* sysdeps/unix/sysv/linux/Dist: Add net/if_packet.h.
1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* md5-crypt/Makefile (extra-objs): Make recursively expanded
variable, since $(object-suffixes) is not defined yet.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* db2/Makefile (distribute): db185/db185_int.src ->
db185/db185_int.h.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* misc/tst-fdset.c: Don't require the value of FD_ISSET to be
exactly one.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/e_acoshl.c: Fix stub_warning: use the user level
* sysdeps/generic/e_acosl.c: Likewise.
* sysdeps/generic/e_asinl.c: Likewise.
* sysdeps/generic/e_atan2l.c: Likewise.
* sysdeps/generic/e_expl.c: Likewise.
* sysdeps/generic/e_fmodl.c: Likewise.
* sysdeps/generic/e_j0l.c: Likewise.
* sysdeps/generic/e_j1l.c: Likewise.
* sysdeps/generic/e_jnl.c: Likewise.
* sysdeps/generic/e_lgammal_r.c: Likewise.
* sysdeps/generic/e_log10l.c: Likewise.
* sysdeps/generic/e_logl.c: Likewise.
* sysdeps/generic/e_powl.c: Likewise.
* sysdeps/generic/e_sqrtl.c: Likewise.
* sysdeps/generic/e_exp2l.c: Likewise.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (+sysdep-names): Remove extra paren.
* Makefile (distribute): Add stub-tag.h.
* elf/Makefile (distribute): Add atomicity.h.
* stdlib/Makefile (headers): Add ucontext.h and sys/ucontext.h.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers)
[$(subdir)=socket]: Add net/if_packet.h.
* sysdeps/alpha/Dist: Remove setjmp_aux.c.
* sysdeps/unix/sysv/linux/Dist: Add s_pread64.c, s_pwrite64.c,
net/if_packet.h, scsi/sg.h.
1997-11-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (install): Quote $(CC) expansion.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Added caching of
working /proc cwd and no restrictions on path length. Following
some ideas from Andi Kleen <ak@muc.de> (PR 350).
1997-11-14 19:14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_compat/compat-grp.c: Remove buggy assert call.
1997-11-14 22:23 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fdim.S: New file.
* sysdeps/libm-i387/s_fdimf.S: New file.
* sysdeps/libm-i387/s_fdiml.S: New file.
* sysdeps/libm-i387/i686/s_fdim.S: New file.
* sysdeps/libm-i387/i686/s_fdimf.S: New file.
* sysdeps/libm-i387/i686/s_fdiml.S: New file.
1997-11-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (strstr): Avoid warning if HAYSTACK is a
pointer to unsigned char.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_llrintf.c (__llrintf): Fix function.
* sysdeps/libm-ieee754/s_lrintf.c (__lrintf): Fix function.
* sysdeps/libm-ieee754/s_lrint.c (__lrint): Fix function.
1997-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_ilogbf.c: Correct return values for
ilogb(0/NaN).
* sysdeps/libm-ieee754/s_ilogbl.c: Likewise.
* sysdeps/libm-ieee754/s_ilogb.c: Likewise.
1997-11-14 05:44 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fmin.S: New file.
* sysdeps/libm-i387/s_fminf.S: New file.
* sysdeps/libm-i387/s_fminl.S: New file.
* sysdeps/libm-i387/s_fmax.S: New file.
* sysdeps/libm-i387/s_fmaxf.S: New file.
* sysdeps/libm-i387/s_fmaxl.S: New file.
* sysdeps/libm-i387/i686/s_fmin.S: New file.
* sysdeps/libm-i387/i686/s_fminf.S: New file.
* sysdeps/libm-i387/i686/s_fminl.S: New file.
* sysdeps/libm-i387/i686/s_fmax.S: New file.
* sysdeps/libm-i387/i686/s_fmaxf.S: New file.
* sysdeps/libm-i387/i686/s_fmaxl.S: New file.
1997-11-14 03:06 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/accept.S: Add __libc_accept as alias.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
Reported by Christopher Wiles <wileyc@ai.cs.fujitsu.co.jp>.
See ChangeLog.7 for earlier changes.
1997-11-18 10:50:07 +08:00
|
|
|
_IO_old_do_flush (fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
if (!(fp->_flags & _IO_DELETE_DONT_CLOSE))
|
|
|
|
_IO_SYSCLOSE (fp);
|
|
|
|
}
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_default_finish (fp, 0);
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
|
2018-02-08 07:42:04 +08:00
|
|
|
FILE *
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_fopen (FILE *fp, const char *filename, const char *mode)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
|
|
|
int oflags = 0, omode;
|
|
|
|
int read_write, fdesc;
|
|
|
|
int oprot = 0666;
|
|
|
|
if (_IO_file_is_open (fp))
|
|
|
|
return 0;
|
|
|
|
switch (*mode++)
|
|
|
|
{
|
|
|
|
case 'r':
|
|
|
|
omode = O_RDONLY;
|
|
|
|
read_write = _IO_NO_WRITES;
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
omode = O_WRONLY;
|
|
|
|
oflags = O_CREAT|O_TRUNC;
|
|
|
|
read_write = _IO_NO_READS;
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
omode = O_WRONLY;
|
|
|
|
oflags = O_CREAT|O_APPEND;
|
|
|
|
read_write = _IO_NO_READS|_IO_IS_APPENDING;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
__set_errno (EINVAL);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (mode[0] == '+' || (mode[0] == 'b' && mode[1] == '+'))
|
|
|
|
{
|
|
|
|
omode = O_RDWR;
|
|
|
|
read_write &= _IO_IS_APPENDING;
|
|
|
|
}
|
2017-08-31 20:07:23 +08:00
|
|
|
fdesc = __open (filename, omode|oflags, oprot);
|
1997-10-13 09:27:24 +08:00
|
|
|
if (fdesc < 0)
|
|
|
|
return NULL;
|
|
|
|
fp->_fileno = fdesc;
|
|
|
|
_IO_mask_flags (fp, read_write,_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
|
|
|
|
if (read_write & _IO_IS_APPENDING)
|
2018-02-08 07:42:04 +08:00
|
|
|
if (_IO_SEEKOFF (fp, (off_t)0, _IO_seek_end, _IOS_INPUT|_IOS_OUTPUT)
|
1997-10-13 09:27:24 +08:00
|
|
|
== _IO_pos_BAD && errno != ESPIPE)
|
|
|
|
return NULL;
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_link_in ((struct _IO_FILE_plus *) fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
return fp;
|
|
|
|
}
|
|
|
|
|
2018-02-08 07:42:04 +08:00
|
|
|
FILE *
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_attach (FILE *fp, int fd)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
|
|
|
if (_IO_file_is_open (fp))
|
|
|
|
return NULL;
|
|
|
|
fp->_fileno = fd;
|
|
|
|
fp->_flags &= ~(_IO_NO_READS+_IO_NO_WRITES);
|
|
|
|
fp->_flags |= _IO_DELETE_DONT_CLOSE;
|
|
|
|
/* Get the current position of the file. */
|
|
|
|
/* We have to do that since that may be junk. */
|
|
|
|
fp->_old_offset = _IO_pos_BAD;
|
2018-02-08 07:42:04 +08:00
|
|
|
if (_IO_SEEKOFF (fp, (off_t)0, _IO_seek_cur, _IOS_INPUT|_IOS_OUTPUT)
|
1997-10-13 09:27:24 +08:00
|
|
|
== _IO_pos_BAD && errno != ESPIPE)
|
|
|
|
return NULL;
|
|
|
|
return fp;
|
|
|
|
}
|
|
|
|
|
2018-02-08 07:42:04 +08:00
|
|
|
FILE *
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_setbuf (FILE *fp, char *p, ssize_t len)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
|
|
|
if (_IO_default_setbuf (fp, p, len) == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_write_end
|
|
|
|
= fp->_IO_buf_base;
|
|
|
|
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
|
|
|
|
|
|
|
|
return fp;
|
|
|
|
}
|
|
|
|
|
2018-02-08 07:42:04 +08:00
|
|
|
static int old_do_write (FILE *, const char *, size_t);
|
1998-11-05 06:59:09 +08:00
|
|
|
|
1997-10-13 09:27:24 +08:00
|
|
|
/* Write TO_DO bytes from DATA to FP.
|
|
|
|
Then mark FP as having empty buffers. */
|
|
|
|
|
|
|
|
int
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_do_write (FILE *fp, const char *data, size_t to_do)
|
1998-11-05 06:59:09 +08:00
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
return (to_do == 0 || (size_t) old_do_write (fp, data, to_do) == to_do)
|
1998-11-05 06:59:09 +08:00
|
|
|
? 0 : EOF;
|
|
|
|
}
|
|
|
|
|
2004-03-10 17:29:17 +08:00
|
|
|
static int
|
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
old_do_write (FILE *fp, const char *data, size_t to_do)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
size_t count;
|
1997-10-13 09:27:24 +08:00
|
|
|
if (fp->_flags & _IO_IS_APPENDING)
|
|
|
|
/* On a system without a proper O_APPEND implementation,
|
|
|
|
you would need to sys_seek(0, SEEK_END) here, but is
|
2011-04-23 09:34:32 +08:00
|
|
|
not needed nor desirable for Unix- or Posix-like systems.
|
1997-10-13 09:27:24 +08:00
|
|
|
Instead, just indicate that offset (before and after) is
|
|
|
|
unpredictable. */
|
|
|
|
fp->_old_offset = _IO_pos_BAD;
|
|
|
|
else if (fp->_IO_read_end != fp->_IO_write_base)
|
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
off_t new_pos
|
1997-10-13 09:27:24 +08:00
|
|
|
= _IO_SYSSEEK (fp, fp->_IO_write_base - fp->_IO_read_end, 1);
|
|
|
|
if (new_pos == _IO_pos_BAD)
|
1998-11-05 06:59:09 +08:00
|
|
|
return 0;
|
1997-10-13 09:27:24 +08:00
|
|
|
fp->_old_offset = new_pos;
|
|
|
|
}
|
|
|
|
count = _IO_SYSWRITE (fp, data, to_do);
|
1998-11-05 06:59:09 +08:00
|
|
|
if (fp->_cur_column && count)
|
2012-05-23 19:33:15 +08:00
|
|
|
fp->_cur_column = _IO_adjust_column (fp->_cur_column - 1, data, count) + 1;
|
1997-10-13 09:27:24 +08:00
|
|
|
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
|
|
|
|
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base;
|
2015-07-08 16:10:50 +08:00
|
|
|
fp->_IO_write_end = ((fp->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED))
|
1997-10-13 09:27:24 +08:00
|
|
|
? fp->_IO_buf_base : fp->_IO_buf_end);
|
1998-11-05 06:59:09 +08:00
|
|
|
return count;
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_underflow (FILE *fp)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
ssize_t count;
|
[BZ 1190] Make EOF sticky in stdio.
C99 specifies that the EOF condition on a file is "sticky": once EOF
has been encountered, all subsequent reads should continue to return
EOF until the file is closed or something clears the "end-of-file
indicator" (e.g. fseek, clearerr). This is arguably a change from
C89, where the wording was ambiguous; the BSDs always had sticky EOF,
but the System V lineage would attempt to read from the underlying fd
again. GNU libc has followed System V for as long as we've been
using libio, but nowadays C99 conformance and BSD compatibility are
more important than System V compatibility.
You might wonder if changing the _underflow impls is sufficient to
apply the C99 semantics to all of the many stdio functions that
perform input. It should be enough to cover all paths to _IO_SYSREAD,
and the only other functions that call _IO_SYSREAD are the _seekoff
impls, which is OK because seeking clears EOF, and the _xsgetn impls,
which, as far as I can tell, are unused within glibc.
The test programs in this patch use a pseudoterminal to set up the
necessary conditions. To facilitate this I added a new test-support
function that sets up a pair of pty file descriptors for you; it's
almost the same as BSD openpty, the only differences are that it
allocates the optionally-returned tty pathname with malloc, and that
it crashes if anything goes wrong.
[BZ #1190]
[BZ #19476]
* libio/fileops.c (_IO_new_file_underflow): Return EOF immediately
if the _IO_EOF_SEEN bit is already set; update commentary.
* libio/oldfileops.c (_IO_old_file_underflow): Likewise.
* libio/wfileops.c (_IO_wfile_underflow): Likewise.
* support/support_openpty.c, support/tty.h: New files.
* support/Makefile (libsupport-routines): Add support_openpty.
* libio/tst-fgetc-after-eof.c, wcsmbs/test-fgetwc-after-eof.c:
New test cases.
* libio/Makefile (tests): Add tst-fgetc-after-eof.
* wcsmbs/Makefile (tests): Add tst-fgetwc-after-eof.
2018-02-22 08:12:51 +08:00
|
|
|
|
|
|
|
/* C99 requires EOF to be "sticky". */
|
1997-10-13 09:27:24 +08:00
|
|
|
if (fp->_flags & _IO_EOF_SEEN)
|
[BZ 1190] Make EOF sticky in stdio.
C99 specifies that the EOF condition on a file is "sticky": once EOF
has been encountered, all subsequent reads should continue to return
EOF until the file is closed or something clears the "end-of-file
indicator" (e.g. fseek, clearerr). This is arguably a change from
C89, where the wording was ambiguous; the BSDs always had sticky EOF,
but the System V lineage would attempt to read from the underlying fd
again. GNU libc has followed System V for as long as we've been
using libio, but nowadays C99 conformance and BSD compatibility are
more important than System V compatibility.
You might wonder if changing the _underflow impls is sufficient to
apply the C99 semantics to all of the many stdio functions that
perform input. It should be enough to cover all paths to _IO_SYSREAD,
and the only other functions that call _IO_SYSREAD are the _seekoff
impls, which is OK because seeking clears EOF, and the _xsgetn impls,
which, as far as I can tell, are unused within glibc.
The test programs in this patch use a pseudoterminal to set up the
necessary conditions. To facilitate this I added a new test-support
function that sets up a pair of pty file descriptors for you; it's
almost the same as BSD openpty, the only differences are that it
allocates the optionally-returned tty pathname with malloc, and that
it crashes if anything goes wrong.
[BZ #1190]
[BZ #19476]
* libio/fileops.c (_IO_new_file_underflow): Return EOF immediately
if the _IO_EOF_SEEN bit is already set; update commentary.
* libio/oldfileops.c (_IO_old_file_underflow): Likewise.
* libio/wfileops.c (_IO_wfile_underflow): Likewise.
* support/support_openpty.c, support/tty.h: New files.
* support/Makefile (libsupport-routines): Add support_openpty.
* libio/tst-fgetc-after-eof.c, wcsmbs/test-fgetwc-after-eof.c:
New test cases.
* libio/Makefile (tests): Add tst-fgetc-after-eof.
* wcsmbs/Makefile (tests): Add tst-fgetwc-after-eof.
2018-02-22 08:12:51 +08:00
|
|
|
return EOF;
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
if (fp->_flags & _IO_NO_READS)
|
|
|
|
{
|
1999-07-21 21:24:21 +08:00
|
|
|
fp->_flags |= _IO_ERR_SEEN;
|
1997-10-13 09:27:24 +08:00
|
|
|
__set_errno (EBADF);
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
if (fp->_IO_read_ptr < fp->_IO_read_end)
|
|
|
|
return *(unsigned char *) fp->_IO_read_ptr;
|
|
|
|
|
|
|
|
if (fp->_IO_buf_base == NULL)
|
1999-03-27 02:23:22 +08:00
|
|
|
{
|
|
|
|
/* Maybe we already have a push back pointer. */
|
|
|
|
if (fp->_IO_save_base != NULL)
|
|
|
|
{
|
|
|
|
free (fp->_IO_save_base);
|
|
|
|
fp->_flags &= ~_IO_IN_BACKUP;
|
|
|
|
}
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_doallocbuf (fp);
|
1999-03-27 02:23:22 +08:00
|
|
|
}
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
/* Flush all line buffered files before reading. */
|
|
|
|
/* FIXME This can/should be moved to genops ?? */
|
|
|
|
if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED))
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_flush_all_linebuffered ();
|
1997-10-13 09:27:24 +08:00
|
|
|
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_switch_to_get_mode (fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
/* This is very tricky. We have to adjust those
|
|
|
|
pointers before we call _IO_SYSREAD () since
|
|
|
|
we may longjump () out while waiting for
|
|
|
|
input. Those pointers may be screwed up. H.J. */
|
|
|
|
fp->_IO_read_base = fp->_IO_read_ptr = fp->_IO_buf_base;
|
|
|
|
fp->_IO_read_end = fp->_IO_buf_base;
|
|
|
|
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_write_end
|
|
|
|
= fp->_IO_buf_base;
|
|
|
|
|
|
|
|
count = _IO_SYSREAD (fp, fp->_IO_buf_base,
|
|
|
|
fp->_IO_buf_end - fp->_IO_buf_base);
|
|
|
|
if (count <= 0)
|
|
|
|
{
|
|
|
|
if (count == 0)
|
|
|
|
fp->_flags |= _IO_EOF_SEEN;
|
|
|
|
else
|
|
|
|
fp->_flags |= _IO_ERR_SEEN, count = 0;
|
|
|
|
}
|
|
|
|
fp->_IO_read_end += count;
|
|
|
|
if (count == 0)
|
|
|
|
return EOF;
|
|
|
|
if (fp->_old_offset != _IO_pos_BAD)
|
|
|
|
_IO_pos_adjust (fp->_old_offset, count);
|
|
|
|
return *(unsigned char *) fp->_IO_read_ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_overflow (FILE *f, int ch)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
|
|
|
if (f->_flags & _IO_NO_WRITES) /* SET ERROR */
|
|
|
|
{
|
|
|
|
f->_flags |= _IO_ERR_SEEN;
|
|
|
|
__set_errno (EBADF);
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
/* If currently reading or no buffer allocated. */
|
|
|
|
if ((f->_flags & _IO_CURRENTLY_PUTTING) == 0)
|
|
|
|
{
|
|
|
|
/* Allocate a buffer if needed. */
|
|
|
|
if (f->_IO_write_base == 0)
|
|
|
|
{
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_doallocbuf (f);
|
1997-10-13 09:27:24 +08:00
|
|
|
_IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base);
|
|
|
|
}
|
|
|
|
/* Otherwise must be currently reading.
|
|
|
|
If _IO_read_ptr (and hence also _IO_read_end) is at the buffer end,
|
|
|
|
logically slide the buffer forwards one block (by setting the
|
|
|
|
read pointers to all point at the beginning of the block). This
|
|
|
|
makes room for subsequent output.
|
|
|
|
Otherwise, set the read pointers to _IO_read_end (leaving that
|
|
|
|
alone, so it can continue to correspond to the external position). */
|
|
|
|
if (f->_IO_read_ptr == f->_IO_buf_end)
|
|
|
|
f->_IO_read_end = f->_IO_read_ptr = f->_IO_buf_base;
|
|
|
|
f->_IO_write_ptr = f->_IO_read_ptr;
|
|
|
|
f->_IO_write_base = f->_IO_write_ptr;
|
|
|
|
f->_IO_write_end = f->_IO_buf_end;
|
|
|
|
f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end;
|
|
|
|
|
2015-07-08 16:10:50 +08:00
|
|
|
if (f->_flags & (_IO_LINE_BUF | _IO_UNBUFFERED))
|
1997-10-13 09:27:24 +08:00
|
|
|
f->_IO_write_end = f->_IO_write_ptr;
|
|
|
|
f->_flags |= _IO_CURRENTLY_PUTTING;
|
|
|
|
}
|
|
|
|
if (ch == EOF)
|
Update.
1997-11-18 02:31 Ulrich Drepper <drepper@cygnus.com>
* iconv/Makefile: New file.
* iconv/gconv.c: New file.
* iconv/gconv.h: New file.
* iconv/gconv_builtin.c: New file.
* iconv/gconv_builtin.h: New file.
* iconv/gconv_close.c: New file.
* iconv/gconv_conf.c: New file.
* iconv/gconv_db.c: New file.
* iconv/gconv_dl.c: New file.
* iconv/gconv_open.c: New file.
* iconv/gconv_simple.c: New file.
* iconv/iconv.c: New file.
* iconv/iconv.h: New file.
* iconv/iconv_close.c: New file.
* iconv/iconv_open.c: New file.
* include/gconv.h: New file.
* Makeconfig: Define gconvdir.
* Makefile (subdirs): Add iconv.
* string/bits/string2.h: Add optimization for strtok_r.
* sysdeps/generic/_G_config.h: Define __need_NULL to get definition
for NULL.
Reported by H.J. Lu <hjl@gnu.ai.mit.edu>.
* configure.in: Correct test for bash2.
* locale/Makefile (CFLAGS-charmap.c): Add -Wno-char-subscripts.
(CFLAGS-locfile.c): Likewise.
Suggested by Zack Weinberg <zack@rabi.phys.columbia.edu>.
* misc/hsearch_r.c (hsearch_r): Avoid undefinitely search for
non-existing entry if the table is full.
* posix/regex.h: Pretty print.
* stdio-common/printf_fp.c: Don't define NDEBUG if already defined.
* sysdeps/posix/ctermid.c: Simplify a bit.
* sysdeps/unix/sysv/linux/net/if.h: Pretty print.
1997-11-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/quota.h: Add include for
<sys/types.h> instead of <asm/types.h>.
1997-11-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (asin_test): Add epsilon for asin (0.5).
1997-11-16 17:09 H.J. Lu <hjl@gnu.ai.mit.edu>
* libc.map (_IO_stdin_, _IO_stdout_, _IO_stderr_, _IO_fopen,
fopen, freopen, _IO_fclose, fclose): Added to GLIBC_2.0.
(_IO_stdin_, _IO_stdout_, _IO_stderr_): Removed from GLIBC_2.1.
(_IO_2_1_stdin_, _IO_2_1_stdout_, _IO_2_1_stderr_, _IO_fclose,
fclose): Added to GLIBC_2.1.
* libio/Makefile (routines, shared-only-routines): Add
oldiofclose. Remove oldfreopen.
* libio/freopen.c (freopen): When PIC is defined, call
_IO_old_freopen () for old stdio.
* libio/iofclose.c (_IO_new_fclose): Renamed from _IO_fclose.
(_IO_fclose, fclose): Use _IO_new_fclose as default version
for GLIBC_2.1.
* libio/iolibio.h (_IO_old_freopen): Use _IO_old_file_close_it
instead of _IO_file_close_it.
* libio/libio.h (_IO_stdin_, _IO_stdout_, _IO_stderr_): Changed
to _IO_2_1_stdxxx_.
(_IO_stdin, _IO_stdout, _IO_stderr): Declare as extern if _LIBC
* libio/libioP.h (_IO_old_do_flush): New.
* libio/oldfileops.c (_IO_old_file_close_it,
_IO_old_file_finish, _IO_old_file_overflow, _IO_old_file_sync):
Call _IO_old_do_flush () instead of _IO_do_flush ().
(_IO_old_file_xsputn): Call _IO_old_do_write () instead of
_IO_do_write ().
* libio/oldiofopen.c (_IO_old_fopen): Call _IO_old_file_init ()
instead of _IO_file_init ().
Bind old symbols to version GLIBC_2.0.
* libio/oldstdfiles.c (DEF_STDFILE): Don't use symbol_version.
(_IO_old_stdin_, _IO_old_stdout_, _IO_old_stderr_): Changed to
_IO_stdxxx_.
(_IO_check_libio): New function in .init.
* libio/oldiofclose.c: New file.
* libio/stdfiles.c (_IO_new_stdin_, _IO_new_stdout_,
_IO_new_stderr_): Changed to _IO_2_1_stdxxx_.
(DEF_STDFILE): Don't use default_symbol_version.
* libio/stdio.c (stdin, stdout, stderr): Set to
_IO_2_1_stdxxx_._
(_IO_stdin, _IO_stdout, _IO_stderr): New, strong alias of
stdxxx.
* csu/Makefile (distribute): Add init.c.
(extra-objs): Add init.o for ELF.
(start-installed-name): Add $(objpfx)init.o.
* csu/init.c: New file.
1997-11-12 08:02 H.J. Lu <hjl@gnu.ai.mit.edu>
* elf/dl-lookup.c (do_lookup): Don't use the hidden base
definition as the default.
1997-08-27 Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>
* erand48_r.c (__erand48_r): Implement for 32 bit short int.
1997-11-15 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* elf/genrtldtbl.awk: Replace gensub for compatibility with gawk2
(PR 351).
1997-11-16 21:01 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/arm/sysdep.h: Use __APCS_32__ to decide whether or not
to preserve condition codes on function call.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/generic/s_exp2l.c: Change exp2l to __ieee754_exp2l.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (asin_test): Add epsilon for float.
(tan_test): Add epsilon for float.
(log1p_test): Add epsilon for float.
(inverse_functions): Add epsilons.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [socket]: Add
net/if_packet.h.
* sysdeps/unix/sysv/linux/Dist: Add net/if_packet.h.
1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* md5-crypt/Makefile (extra-objs): Make recursively expanded
variable, since $(object-suffixes) is not defined yet.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* db2/Makefile (distribute): db185/db185_int.src ->
db185/db185_int.h.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* misc/tst-fdset.c: Don't require the value of FD_ISSET to be
exactly one.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/e_acoshl.c: Fix stub_warning: use the user level
* sysdeps/generic/e_acosl.c: Likewise.
* sysdeps/generic/e_asinl.c: Likewise.
* sysdeps/generic/e_atan2l.c: Likewise.
* sysdeps/generic/e_expl.c: Likewise.
* sysdeps/generic/e_fmodl.c: Likewise.
* sysdeps/generic/e_j0l.c: Likewise.
* sysdeps/generic/e_j1l.c: Likewise.
* sysdeps/generic/e_jnl.c: Likewise.
* sysdeps/generic/e_lgammal_r.c: Likewise.
* sysdeps/generic/e_log10l.c: Likewise.
* sysdeps/generic/e_logl.c: Likewise.
* sysdeps/generic/e_powl.c: Likewise.
* sysdeps/generic/e_sqrtl.c: Likewise.
* sysdeps/generic/e_exp2l.c: Likewise.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (+sysdep-names): Remove extra paren.
* Makefile (distribute): Add stub-tag.h.
* elf/Makefile (distribute): Add atomicity.h.
* stdlib/Makefile (headers): Add ucontext.h and sys/ucontext.h.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers)
[$(subdir)=socket]: Add net/if_packet.h.
* sysdeps/alpha/Dist: Remove setjmp_aux.c.
* sysdeps/unix/sysv/linux/Dist: Add s_pread64.c, s_pwrite64.c,
net/if_packet.h, scsi/sg.h.
1997-11-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (install): Quote $(CC) expansion.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Added caching of
working /proc cwd and no restrictions on path length. Following
some ideas from Andi Kleen <ak@muc.de> (PR 350).
1997-11-14 19:14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_compat/compat-grp.c: Remove buggy assert call.
1997-11-14 22:23 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fdim.S: New file.
* sysdeps/libm-i387/s_fdimf.S: New file.
* sysdeps/libm-i387/s_fdiml.S: New file.
* sysdeps/libm-i387/i686/s_fdim.S: New file.
* sysdeps/libm-i387/i686/s_fdimf.S: New file.
* sysdeps/libm-i387/i686/s_fdiml.S: New file.
1997-11-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (strstr): Avoid warning if HAYSTACK is a
pointer to unsigned char.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_llrintf.c (__llrintf): Fix function.
* sysdeps/libm-ieee754/s_lrintf.c (__lrintf): Fix function.
* sysdeps/libm-ieee754/s_lrint.c (__lrint): Fix function.
1997-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_ilogbf.c: Correct return values for
ilogb(0/NaN).
* sysdeps/libm-ieee754/s_ilogbl.c: Likewise.
* sysdeps/libm-ieee754/s_ilogb.c: Likewise.
1997-11-14 05:44 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fmin.S: New file.
* sysdeps/libm-i387/s_fminf.S: New file.
* sysdeps/libm-i387/s_fminl.S: New file.
* sysdeps/libm-i387/s_fmax.S: New file.
* sysdeps/libm-i387/s_fmaxf.S: New file.
* sysdeps/libm-i387/s_fmaxl.S: New file.
* sysdeps/libm-i387/i686/s_fmin.S: New file.
* sysdeps/libm-i387/i686/s_fminf.S: New file.
* sysdeps/libm-i387/i686/s_fminl.S: New file.
* sysdeps/libm-i387/i686/s_fmax.S: New file.
* sysdeps/libm-i387/i686/s_fmaxf.S: New file.
* sysdeps/libm-i387/i686/s_fmaxl.S: New file.
1997-11-14 03:06 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/accept.S: Add __libc_accept as alias.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
Reported by Christopher Wiles <wileyc@ai.cs.fujitsu.co.jp>.
See ChangeLog.7 for earlier changes.
1997-11-18 10:50:07 +08:00
|
|
|
return _IO_old_do_flush (f);
|
1997-10-13 09:27:24 +08:00
|
|
|
if (f->_IO_write_ptr == f->_IO_buf_end ) /* Buffer is really full */
|
Update.
1997-11-18 02:31 Ulrich Drepper <drepper@cygnus.com>
* iconv/Makefile: New file.
* iconv/gconv.c: New file.
* iconv/gconv.h: New file.
* iconv/gconv_builtin.c: New file.
* iconv/gconv_builtin.h: New file.
* iconv/gconv_close.c: New file.
* iconv/gconv_conf.c: New file.
* iconv/gconv_db.c: New file.
* iconv/gconv_dl.c: New file.
* iconv/gconv_open.c: New file.
* iconv/gconv_simple.c: New file.
* iconv/iconv.c: New file.
* iconv/iconv.h: New file.
* iconv/iconv_close.c: New file.
* iconv/iconv_open.c: New file.
* include/gconv.h: New file.
* Makeconfig: Define gconvdir.
* Makefile (subdirs): Add iconv.
* string/bits/string2.h: Add optimization for strtok_r.
* sysdeps/generic/_G_config.h: Define __need_NULL to get definition
for NULL.
Reported by H.J. Lu <hjl@gnu.ai.mit.edu>.
* configure.in: Correct test for bash2.
* locale/Makefile (CFLAGS-charmap.c): Add -Wno-char-subscripts.
(CFLAGS-locfile.c): Likewise.
Suggested by Zack Weinberg <zack@rabi.phys.columbia.edu>.
* misc/hsearch_r.c (hsearch_r): Avoid undefinitely search for
non-existing entry if the table is full.
* posix/regex.h: Pretty print.
* stdio-common/printf_fp.c: Don't define NDEBUG if already defined.
* sysdeps/posix/ctermid.c: Simplify a bit.
* sysdeps/unix/sysv/linux/net/if.h: Pretty print.
1997-11-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/quota.h: Add include for
<sys/types.h> instead of <asm/types.h>.
1997-11-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (asin_test): Add epsilon for asin (0.5).
1997-11-16 17:09 H.J. Lu <hjl@gnu.ai.mit.edu>
* libc.map (_IO_stdin_, _IO_stdout_, _IO_stderr_, _IO_fopen,
fopen, freopen, _IO_fclose, fclose): Added to GLIBC_2.0.
(_IO_stdin_, _IO_stdout_, _IO_stderr_): Removed from GLIBC_2.1.
(_IO_2_1_stdin_, _IO_2_1_stdout_, _IO_2_1_stderr_, _IO_fclose,
fclose): Added to GLIBC_2.1.
* libio/Makefile (routines, shared-only-routines): Add
oldiofclose. Remove oldfreopen.
* libio/freopen.c (freopen): When PIC is defined, call
_IO_old_freopen () for old stdio.
* libio/iofclose.c (_IO_new_fclose): Renamed from _IO_fclose.
(_IO_fclose, fclose): Use _IO_new_fclose as default version
for GLIBC_2.1.
* libio/iolibio.h (_IO_old_freopen): Use _IO_old_file_close_it
instead of _IO_file_close_it.
* libio/libio.h (_IO_stdin_, _IO_stdout_, _IO_stderr_): Changed
to _IO_2_1_stdxxx_.
(_IO_stdin, _IO_stdout, _IO_stderr): Declare as extern if _LIBC
* libio/libioP.h (_IO_old_do_flush): New.
* libio/oldfileops.c (_IO_old_file_close_it,
_IO_old_file_finish, _IO_old_file_overflow, _IO_old_file_sync):
Call _IO_old_do_flush () instead of _IO_do_flush ().
(_IO_old_file_xsputn): Call _IO_old_do_write () instead of
_IO_do_write ().
* libio/oldiofopen.c (_IO_old_fopen): Call _IO_old_file_init ()
instead of _IO_file_init ().
Bind old symbols to version GLIBC_2.0.
* libio/oldstdfiles.c (DEF_STDFILE): Don't use symbol_version.
(_IO_old_stdin_, _IO_old_stdout_, _IO_old_stderr_): Changed to
_IO_stdxxx_.
(_IO_check_libio): New function in .init.
* libio/oldiofclose.c: New file.
* libio/stdfiles.c (_IO_new_stdin_, _IO_new_stdout_,
_IO_new_stderr_): Changed to _IO_2_1_stdxxx_.
(DEF_STDFILE): Don't use default_symbol_version.
* libio/stdio.c (stdin, stdout, stderr): Set to
_IO_2_1_stdxxx_._
(_IO_stdin, _IO_stdout, _IO_stderr): New, strong alias of
stdxxx.
* csu/Makefile (distribute): Add init.c.
(extra-objs): Add init.o for ELF.
(start-installed-name): Add $(objpfx)init.o.
* csu/init.c: New file.
1997-11-12 08:02 H.J. Lu <hjl@gnu.ai.mit.edu>
* elf/dl-lookup.c (do_lookup): Don't use the hidden base
definition as the default.
1997-08-27 Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>
* erand48_r.c (__erand48_r): Implement for 32 bit short int.
1997-11-15 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* elf/genrtldtbl.awk: Replace gensub for compatibility with gawk2
(PR 351).
1997-11-16 21:01 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/arm/sysdep.h: Use __APCS_32__ to decide whether or not
to preserve condition codes on function call.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/generic/s_exp2l.c: Change exp2l to __ieee754_exp2l.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (asin_test): Add epsilon for float.
(tan_test): Add epsilon for float.
(log1p_test): Add epsilon for float.
(inverse_functions): Add epsilons.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [socket]: Add
net/if_packet.h.
* sysdeps/unix/sysv/linux/Dist: Add net/if_packet.h.
1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* md5-crypt/Makefile (extra-objs): Make recursively expanded
variable, since $(object-suffixes) is not defined yet.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* db2/Makefile (distribute): db185/db185_int.src ->
db185/db185_int.h.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* misc/tst-fdset.c: Don't require the value of FD_ISSET to be
exactly one.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/e_acoshl.c: Fix stub_warning: use the user level
* sysdeps/generic/e_acosl.c: Likewise.
* sysdeps/generic/e_asinl.c: Likewise.
* sysdeps/generic/e_atan2l.c: Likewise.
* sysdeps/generic/e_expl.c: Likewise.
* sysdeps/generic/e_fmodl.c: Likewise.
* sysdeps/generic/e_j0l.c: Likewise.
* sysdeps/generic/e_j1l.c: Likewise.
* sysdeps/generic/e_jnl.c: Likewise.
* sysdeps/generic/e_lgammal_r.c: Likewise.
* sysdeps/generic/e_log10l.c: Likewise.
* sysdeps/generic/e_logl.c: Likewise.
* sysdeps/generic/e_powl.c: Likewise.
* sysdeps/generic/e_sqrtl.c: Likewise.
* sysdeps/generic/e_exp2l.c: Likewise.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (+sysdep-names): Remove extra paren.
* Makefile (distribute): Add stub-tag.h.
* elf/Makefile (distribute): Add atomicity.h.
* stdlib/Makefile (headers): Add ucontext.h and sys/ucontext.h.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers)
[$(subdir)=socket]: Add net/if_packet.h.
* sysdeps/alpha/Dist: Remove setjmp_aux.c.
* sysdeps/unix/sysv/linux/Dist: Add s_pread64.c, s_pwrite64.c,
net/if_packet.h, scsi/sg.h.
1997-11-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (install): Quote $(CC) expansion.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Added caching of
working /proc cwd and no restrictions on path length. Following
some ideas from Andi Kleen <ak@muc.de> (PR 350).
1997-11-14 19:14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_compat/compat-grp.c: Remove buggy assert call.
1997-11-14 22:23 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fdim.S: New file.
* sysdeps/libm-i387/s_fdimf.S: New file.
* sysdeps/libm-i387/s_fdiml.S: New file.
* sysdeps/libm-i387/i686/s_fdim.S: New file.
* sysdeps/libm-i387/i686/s_fdimf.S: New file.
* sysdeps/libm-i387/i686/s_fdiml.S: New file.
1997-11-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (strstr): Avoid warning if HAYSTACK is a
pointer to unsigned char.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_llrintf.c (__llrintf): Fix function.
* sysdeps/libm-ieee754/s_lrintf.c (__lrintf): Fix function.
* sysdeps/libm-ieee754/s_lrint.c (__lrint): Fix function.
1997-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_ilogbf.c: Correct return values for
ilogb(0/NaN).
* sysdeps/libm-ieee754/s_ilogbl.c: Likewise.
* sysdeps/libm-ieee754/s_ilogb.c: Likewise.
1997-11-14 05:44 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fmin.S: New file.
* sysdeps/libm-i387/s_fminf.S: New file.
* sysdeps/libm-i387/s_fminl.S: New file.
* sysdeps/libm-i387/s_fmax.S: New file.
* sysdeps/libm-i387/s_fmaxf.S: New file.
* sysdeps/libm-i387/s_fmaxl.S: New file.
* sysdeps/libm-i387/i686/s_fmin.S: New file.
* sysdeps/libm-i387/i686/s_fminf.S: New file.
* sysdeps/libm-i387/i686/s_fminl.S: New file.
* sysdeps/libm-i387/i686/s_fmax.S: New file.
* sysdeps/libm-i387/i686/s_fmaxf.S: New file.
* sysdeps/libm-i387/i686/s_fmaxl.S: New file.
1997-11-14 03:06 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/accept.S: Add __libc_accept as alias.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
Reported by Christopher Wiles <wileyc@ai.cs.fujitsu.co.jp>.
See ChangeLog.7 for earlier changes.
1997-11-18 10:50:07 +08:00
|
|
|
if (_IO_old_do_flush (f) == EOF)
|
1997-10-13 09:27:24 +08:00
|
|
|
return EOF;
|
|
|
|
*f->_IO_write_ptr++ = ch;
|
|
|
|
if ((f->_flags & _IO_UNBUFFERED)
|
|
|
|
|| ((f->_flags & _IO_LINE_BUF) && ch == '\n'))
|
Update.
1997-11-18 02:31 Ulrich Drepper <drepper@cygnus.com>
* iconv/Makefile: New file.
* iconv/gconv.c: New file.
* iconv/gconv.h: New file.
* iconv/gconv_builtin.c: New file.
* iconv/gconv_builtin.h: New file.
* iconv/gconv_close.c: New file.
* iconv/gconv_conf.c: New file.
* iconv/gconv_db.c: New file.
* iconv/gconv_dl.c: New file.
* iconv/gconv_open.c: New file.
* iconv/gconv_simple.c: New file.
* iconv/iconv.c: New file.
* iconv/iconv.h: New file.
* iconv/iconv_close.c: New file.
* iconv/iconv_open.c: New file.
* include/gconv.h: New file.
* Makeconfig: Define gconvdir.
* Makefile (subdirs): Add iconv.
* string/bits/string2.h: Add optimization for strtok_r.
* sysdeps/generic/_G_config.h: Define __need_NULL to get definition
for NULL.
Reported by H.J. Lu <hjl@gnu.ai.mit.edu>.
* configure.in: Correct test for bash2.
* locale/Makefile (CFLAGS-charmap.c): Add -Wno-char-subscripts.
(CFLAGS-locfile.c): Likewise.
Suggested by Zack Weinberg <zack@rabi.phys.columbia.edu>.
* misc/hsearch_r.c (hsearch_r): Avoid undefinitely search for
non-existing entry if the table is full.
* posix/regex.h: Pretty print.
* stdio-common/printf_fp.c: Don't define NDEBUG if already defined.
* sysdeps/posix/ctermid.c: Simplify a bit.
* sysdeps/unix/sysv/linux/net/if.h: Pretty print.
1997-11-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/quota.h: Add include for
<sys/types.h> instead of <asm/types.h>.
1997-11-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (asin_test): Add epsilon for asin (0.5).
1997-11-16 17:09 H.J. Lu <hjl@gnu.ai.mit.edu>
* libc.map (_IO_stdin_, _IO_stdout_, _IO_stderr_, _IO_fopen,
fopen, freopen, _IO_fclose, fclose): Added to GLIBC_2.0.
(_IO_stdin_, _IO_stdout_, _IO_stderr_): Removed from GLIBC_2.1.
(_IO_2_1_stdin_, _IO_2_1_stdout_, _IO_2_1_stderr_, _IO_fclose,
fclose): Added to GLIBC_2.1.
* libio/Makefile (routines, shared-only-routines): Add
oldiofclose. Remove oldfreopen.
* libio/freopen.c (freopen): When PIC is defined, call
_IO_old_freopen () for old stdio.
* libio/iofclose.c (_IO_new_fclose): Renamed from _IO_fclose.
(_IO_fclose, fclose): Use _IO_new_fclose as default version
for GLIBC_2.1.
* libio/iolibio.h (_IO_old_freopen): Use _IO_old_file_close_it
instead of _IO_file_close_it.
* libio/libio.h (_IO_stdin_, _IO_stdout_, _IO_stderr_): Changed
to _IO_2_1_stdxxx_.
(_IO_stdin, _IO_stdout, _IO_stderr): Declare as extern if _LIBC
* libio/libioP.h (_IO_old_do_flush): New.
* libio/oldfileops.c (_IO_old_file_close_it,
_IO_old_file_finish, _IO_old_file_overflow, _IO_old_file_sync):
Call _IO_old_do_flush () instead of _IO_do_flush ().
(_IO_old_file_xsputn): Call _IO_old_do_write () instead of
_IO_do_write ().
* libio/oldiofopen.c (_IO_old_fopen): Call _IO_old_file_init ()
instead of _IO_file_init ().
Bind old symbols to version GLIBC_2.0.
* libio/oldstdfiles.c (DEF_STDFILE): Don't use symbol_version.
(_IO_old_stdin_, _IO_old_stdout_, _IO_old_stderr_): Changed to
_IO_stdxxx_.
(_IO_check_libio): New function in .init.
* libio/oldiofclose.c: New file.
* libio/stdfiles.c (_IO_new_stdin_, _IO_new_stdout_,
_IO_new_stderr_): Changed to _IO_2_1_stdxxx_.
(DEF_STDFILE): Don't use default_symbol_version.
* libio/stdio.c (stdin, stdout, stderr): Set to
_IO_2_1_stdxxx_._
(_IO_stdin, _IO_stdout, _IO_stderr): New, strong alias of
stdxxx.
* csu/Makefile (distribute): Add init.c.
(extra-objs): Add init.o for ELF.
(start-installed-name): Add $(objpfx)init.o.
* csu/init.c: New file.
1997-11-12 08:02 H.J. Lu <hjl@gnu.ai.mit.edu>
* elf/dl-lookup.c (do_lookup): Don't use the hidden base
definition as the default.
1997-08-27 Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>
* erand48_r.c (__erand48_r): Implement for 32 bit short int.
1997-11-15 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* elf/genrtldtbl.awk: Replace gensub for compatibility with gawk2
(PR 351).
1997-11-16 21:01 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/arm/sysdep.h: Use __APCS_32__ to decide whether or not
to preserve condition codes on function call.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/generic/s_exp2l.c: Change exp2l to __ieee754_exp2l.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (asin_test): Add epsilon for float.
(tan_test): Add epsilon for float.
(log1p_test): Add epsilon for float.
(inverse_functions): Add epsilons.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [socket]: Add
net/if_packet.h.
* sysdeps/unix/sysv/linux/Dist: Add net/if_packet.h.
1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* md5-crypt/Makefile (extra-objs): Make recursively expanded
variable, since $(object-suffixes) is not defined yet.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* db2/Makefile (distribute): db185/db185_int.src ->
db185/db185_int.h.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* misc/tst-fdset.c: Don't require the value of FD_ISSET to be
exactly one.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/e_acoshl.c: Fix stub_warning: use the user level
* sysdeps/generic/e_acosl.c: Likewise.
* sysdeps/generic/e_asinl.c: Likewise.
* sysdeps/generic/e_atan2l.c: Likewise.
* sysdeps/generic/e_expl.c: Likewise.
* sysdeps/generic/e_fmodl.c: Likewise.
* sysdeps/generic/e_j0l.c: Likewise.
* sysdeps/generic/e_j1l.c: Likewise.
* sysdeps/generic/e_jnl.c: Likewise.
* sysdeps/generic/e_lgammal_r.c: Likewise.
* sysdeps/generic/e_log10l.c: Likewise.
* sysdeps/generic/e_logl.c: Likewise.
* sysdeps/generic/e_powl.c: Likewise.
* sysdeps/generic/e_sqrtl.c: Likewise.
* sysdeps/generic/e_exp2l.c: Likewise.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (+sysdep-names): Remove extra paren.
* Makefile (distribute): Add stub-tag.h.
* elf/Makefile (distribute): Add atomicity.h.
* stdlib/Makefile (headers): Add ucontext.h and sys/ucontext.h.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers)
[$(subdir)=socket]: Add net/if_packet.h.
* sysdeps/alpha/Dist: Remove setjmp_aux.c.
* sysdeps/unix/sysv/linux/Dist: Add s_pread64.c, s_pwrite64.c,
net/if_packet.h, scsi/sg.h.
1997-11-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (install): Quote $(CC) expansion.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Added caching of
working /proc cwd and no restrictions on path length. Following
some ideas from Andi Kleen <ak@muc.de> (PR 350).
1997-11-14 19:14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_compat/compat-grp.c: Remove buggy assert call.
1997-11-14 22:23 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fdim.S: New file.
* sysdeps/libm-i387/s_fdimf.S: New file.
* sysdeps/libm-i387/s_fdiml.S: New file.
* sysdeps/libm-i387/i686/s_fdim.S: New file.
* sysdeps/libm-i387/i686/s_fdimf.S: New file.
* sysdeps/libm-i387/i686/s_fdiml.S: New file.
1997-11-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (strstr): Avoid warning if HAYSTACK is a
pointer to unsigned char.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_llrintf.c (__llrintf): Fix function.
* sysdeps/libm-ieee754/s_lrintf.c (__lrintf): Fix function.
* sysdeps/libm-ieee754/s_lrint.c (__lrint): Fix function.
1997-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_ilogbf.c: Correct return values for
ilogb(0/NaN).
* sysdeps/libm-ieee754/s_ilogbl.c: Likewise.
* sysdeps/libm-ieee754/s_ilogb.c: Likewise.
1997-11-14 05:44 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fmin.S: New file.
* sysdeps/libm-i387/s_fminf.S: New file.
* sysdeps/libm-i387/s_fminl.S: New file.
* sysdeps/libm-i387/s_fmax.S: New file.
* sysdeps/libm-i387/s_fmaxf.S: New file.
* sysdeps/libm-i387/s_fmaxl.S: New file.
* sysdeps/libm-i387/i686/s_fmin.S: New file.
* sysdeps/libm-i387/i686/s_fminf.S: New file.
* sysdeps/libm-i387/i686/s_fminl.S: New file.
* sysdeps/libm-i387/i686/s_fmax.S: New file.
* sysdeps/libm-i387/i686/s_fmaxf.S: New file.
* sysdeps/libm-i387/i686/s_fmaxl.S: New file.
1997-11-14 03:06 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/accept.S: Add __libc_accept as alias.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
Reported by Christopher Wiles <wileyc@ai.cs.fujitsu.co.jp>.
See ChangeLog.7 for earlier changes.
1997-11-18 10:50:07 +08:00
|
|
|
if (_IO_old_do_flush (f) == EOF)
|
1997-10-13 09:27:24 +08:00
|
|
|
return EOF;
|
|
|
|
return (unsigned char) ch;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_sync (FILE *fp)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
ssize_t delta;
|
1997-10-13 09:27:24 +08:00
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
/* char* ptr = cur_ptr(); */
|
|
|
|
if (fp->_IO_write_ptr > fp->_IO_write_base)
|
Update.
1997-11-18 02:31 Ulrich Drepper <drepper@cygnus.com>
* iconv/Makefile: New file.
* iconv/gconv.c: New file.
* iconv/gconv.h: New file.
* iconv/gconv_builtin.c: New file.
* iconv/gconv_builtin.h: New file.
* iconv/gconv_close.c: New file.
* iconv/gconv_conf.c: New file.
* iconv/gconv_db.c: New file.
* iconv/gconv_dl.c: New file.
* iconv/gconv_open.c: New file.
* iconv/gconv_simple.c: New file.
* iconv/iconv.c: New file.
* iconv/iconv.h: New file.
* iconv/iconv_close.c: New file.
* iconv/iconv_open.c: New file.
* include/gconv.h: New file.
* Makeconfig: Define gconvdir.
* Makefile (subdirs): Add iconv.
* string/bits/string2.h: Add optimization for strtok_r.
* sysdeps/generic/_G_config.h: Define __need_NULL to get definition
for NULL.
Reported by H.J. Lu <hjl@gnu.ai.mit.edu>.
* configure.in: Correct test for bash2.
* locale/Makefile (CFLAGS-charmap.c): Add -Wno-char-subscripts.
(CFLAGS-locfile.c): Likewise.
Suggested by Zack Weinberg <zack@rabi.phys.columbia.edu>.
* misc/hsearch_r.c (hsearch_r): Avoid undefinitely search for
non-existing entry if the table is full.
* posix/regex.h: Pretty print.
* stdio-common/printf_fp.c: Don't define NDEBUG if already defined.
* sysdeps/posix/ctermid.c: Simplify a bit.
* sysdeps/unix/sysv/linux/net/if.h: Pretty print.
1997-11-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/sys/quota.h: Add include for
<sys/types.h> instead of <asm/types.h>.
1997-11-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/libm-test.c (asin_test): Add epsilon for asin (0.5).
1997-11-16 17:09 H.J. Lu <hjl@gnu.ai.mit.edu>
* libc.map (_IO_stdin_, _IO_stdout_, _IO_stderr_, _IO_fopen,
fopen, freopen, _IO_fclose, fclose): Added to GLIBC_2.0.
(_IO_stdin_, _IO_stdout_, _IO_stderr_): Removed from GLIBC_2.1.
(_IO_2_1_stdin_, _IO_2_1_stdout_, _IO_2_1_stderr_, _IO_fclose,
fclose): Added to GLIBC_2.1.
* libio/Makefile (routines, shared-only-routines): Add
oldiofclose. Remove oldfreopen.
* libio/freopen.c (freopen): When PIC is defined, call
_IO_old_freopen () for old stdio.
* libio/iofclose.c (_IO_new_fclose): Renamed from _IO_fclose.
(_IO_fclose, fclose): Use _IO_new_fclose as default version
for GLIBC_2.1.
* libio/iolibio.h (_IO_old_freopen): Use _IO_old_file_close_it
instead of _IO_file_close_it.
* libio/libio.h (_IO_stdin_, _IO_stdout_, _IO_stderr_): Changed
to _IO_2_1_stdxxx_.
(_IO_stdin, _IO_stdout, _IO_stderr): Declare as extern if _LIBC
* libio/libioP.h (_IO_old_do_flush): New.
* libio/oldfileops.c (_IO_old_file_close_it,
_IO_old_file_finish, _IO_old_file_overflow, _IO_old_file_sync):
Call _IO_old_do_flush () instead of _IO_do_flush ().
(_IO_old_file_xsputn): Call _IO_old_do_write () instead of
_IO_do_write ().
* libio/oldiofopen.c (_IO_old_fopen): Call _IO_old_file_init ()
instead of _IO_file_init ().
Bind old symbols to version GLIBC_2.0.
* libio/oldstdfiles.c (DEF_STDFILE): Don't use symbol_version.
(_IO_old_stdin_, _IO_old_stdout_, _IO_old_stderr_): Changed to
_IO_stdxxx_.
(_IO_check_libio): New function in .init.
* libio/oldiofclose.c: New file.
* libio/stdfiles.c (_IO_new_stdin_, _IO_new_stdout_,
_IO_new_stderr_): Changed to _IO_2_1_stdxxx_.
(DEF_STDFILE): Don't use default_symbol_version.
* libio/stdio.c (stdin, stdout, stderr): Set to
_IO_2_1_stdxxx_._
(_IO_stdin, _IO_stdout, _IO_stderr): New, strong alias of
stdxxx.
* csu/Makefile (distribute): Add init.c.
(extra-objs): Add init.o for ELF.
(start-installed-name): Add $(objpfx)init.o.
* csu/init.c: New file.
1997-11-12 08:02 H.J. Lu <hjl@gnu.ai.mit.edu>
* elf/dl-lookup.c (do_lookup): Don't use the hidden base
definition as the default.
1997-08-27 Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>
* erand48_r.c (__erand48_r): Implement for 32 bit short int.
1997-11-15 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* elf/genrtldtbl.awk: Replace gensub for compatibility with gawk2
(PR 351).
1997-11-16 21:01 Philip Blundell <Philip.Blundell@pobox.com>
* sysdeps/arm/sysdep.h: Use __APCS_32__ to decide whether or not
to preserve condition codes on function call.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/generic/s_exp2l.c: Change exp2l to __ieee754_exp2l.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* math/libm-test.c (asin_test): Add epsilon for float.
(tan_test): Add epsilon for float.
(log1p_test): Add epsilon for float.
(inverse_functions): Add epsilons.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [socket]: Add
net/if_packet.h.
* sysdeps/unix/sysv/linux/Dist: Add net/if_packet.h.
1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* md5-crypt/Makefile (extra-objs): Make recursively expanded
variable, since $(object-suffixes) is not defined yet.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* db2/Makefile (distribute): db185/db185_int.src ->
db185/db185_int.h.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* misc/tst-fdset.c: Don't require the value of FD_ISSET to be
exactly one.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/e_acoshl.c: Fix stub_warning: use the user level
* sysdeps/generic/e_acosl.c: Likewise.
* sysdeps/generic/e_asinl.c: Likewise.
* sysdeps/generic/e_atan2l.c: Likewise.
* sysdeps/generic/e_expl.c: Likewise.
* sysdeps/generic/e_fmodl.c: Likewise.
* sysdeps/generic/e_j0l.c: Likewise.
* sysdeps/generic/e_j1l.c: Likewise.
* sysdeps/generic/e_jnl.c: Likewise.
* sysdeps/generic/e_lgammal_r.c: Likewise.
* sysdeps/generic/e_log10l.c: Likewise.
* sysdeps/generic/e_logl.c: Likewise.
* sysdeps/generic/e_powl.c: Likewise.
* sysdeps/generic/e_sqrtl.c: Likewise.
* sysdeps/generic/e_exp2l.c: Likewise.
1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Make-dist (+sysdep-names): Remove extra paren.
* Makefile (distribute): Add stub-tag.h.
* elf/Makefile (distribute): Add atomicity.h.
* stdlib/Makefile (headers): Add ucontext.h and sys/ucontext.h.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers)
[$(subdir)=socket]: Add net/if_packet.h.
* sysdeps/alpha/Dist: Remove setjmp_aux.c.
* sysdeps/unix/sysv/linux/Dist: Add s_pread64.c, s_pwrite64.c,
net/if_packet.h, scsi/sg.h.
1997-11-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile (install): Quote $(CC) expansion.
1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Added caching of
working /proc cwd and no restrictions on path length. Following
some ideas from Andi Kleen <ak@muc.de> (PR 350).
1997-11-14 19:14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nss_compat/compat-grp.c: Remove buggy assert call.
1997-11-14 22:23 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fdim.S: New file.
* sysdeps/libm-i387/s_fdimf.S: New file.
* sysdeps/libm-i387/s_fdiml.S: New file.
* sysdeps/libm-i387/i686/s_fdim.S: New file.
* sysdeps/libm-i387/i686/s_fdimf.S: New file.
* sysdeps/libm-i387/i686/s_fdiml.S: New file.
1997-11-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (strstr): Avoid warning if HAYSTACK is a
pointer to unsigned char.
1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_llrintf.c (__llrintf): Fix function.
* sysdeps/libm-ieee754/s_lrintf.c (__lrintf): Fix function.
* sysdeps/libm-ieee754/s_lrint.c (__lrint): Fix function.
1997-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_ilogbf.c: Correct return values for
ilogb(0/NaN).
* sysdeps/libm-ieee754/s_ilogbl.c: Likewise.
* sysdeps/libm-ieee754/s_ilogb.c: Likewise.
1997-11-14 05:44 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-i387/s_fmin.S: New file.
* sysdeps/libm-i387/s_fminf.S: New file.
* sysdeps/libm-i387/s_fminl.S: New file.
* sysdeps/libm-i387/s_fmax.S: New file.
* sysdeps/libm-i387/s_fmaxf.S: New file.
* sysdeps/libm-i387/s_fmaxl.S: New file.
* sysdeps/libm-i387/i686/s_fmin.S: New file.
* sysdeps/libm-i387/i686/s_fminf.S: New file.
* sysdeps/libm-i387/i686/s_fminl.S: New file.
* sysdeps/libm-i387/i686/s_fmax.S: New file.
* sysdeps/libm-i387/i686/s_fmaxf.S: New file.
* sysdeps/libm-i387/i686/s_fmaxl.S: New file.
1997-11-14 03:06 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/accept.S: Add __libc_accept as alias.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
Reported by Christopher Wiles <wileyc@ai.cs.fujitsu.co.jp>.
See ChangeLog.7 for earlier changes.
1997-11-18 10:50:07 +08:00
|
|
|
if (_IO_old_do_flush(fp)) return EOF;
|
1997-10-13 09:27:24 +08:00
|
|
|
delta = fp->_IO_read_ptr - fp->_IO_read_end;
|
|
|
|
if (delta != 0)
|
|
|
|
{
|
|
|
|
#ifdef TODO
|
|
|
|
if (_IO_in_backup (fp))
|
|
|
|
delta -= eGptr () - Gbase ();
|
|
|
|
#endif
|
2018-02-08 07:42:04 +08:00
|
|
|
off_t new_pos = _IO_SYSSEEK (fp, delta, 1);
|
|
|
|
if (new_pos != (off_t) EOF)
|
1997-10-13 09:27:24 +08:00
|
|
|
fp->_IO_read_end = fp->_IO_read_ptr;
|
|
|
|
else if (errno == ESPIPE)
|
|
|
|
; /* Ignore error from unseekable devices. */
|
|
|
|
else
|
|
|
|
retval = EOF;
|
|
|
|
}
|
|
|
|
if (retval != EOF)
|
|
|
|
fp->_old_offset = _IO_pos_BAD;
|
|
|
|
/* FIXME: Cleanup - can this be shared? */
|
|
|
|
/* setg(base(), ptr, ptr); */
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2018-02-08 07:42:04 +08:00
|
|
|
off64_t
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_seekoff (FILE *fp, off64_t offset, int dir, int mode)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
off_t result;
|
|
|
|
off64_t delta, new_offset;
|
1997-10-13 09:27:24 +08:00
|
|
|
long count;
|
|
|
|
/* POSIX.1 8.2.3.7 says that after a call the fflush() the file
|
|
|
|
offset of the underlying file must be exact. */
|
|
|
|
int must_be_exact = (fp->_IO_read_base == fp->_IO_read_end
|
|
|
|
&& fp->_IO_write_base == fp->_IO_write_ptr);
|
|
|
|
|
|
|
|
if (mode == 0)
|
|
|
|
dir = _IO_seek_cur, offset = 0; /* Don't move any pointers. */
|
|
|
|
|
|
|
|
/* Flush unwritten characters.
|
|
|
|
(This may do an unneeded write if we seek within the buffer.
|
|
|
|
But to be able to switch to reading, we would need to set
|
2012-09-06 00:34:10 +08:00
|
|
|
egptr to pptr. That can't be done in the current design,
|
1997-10-13 09:27:24 +08:00
|
|
|
which assumes file_ptr() is eGptr. Anyway, since we probably
|
|
|
|
end up flushing when we close(), it doesn't make much difference.)
|
2012-09-06 00:34:10 +08:00
|
|
|
FIXME: simulate mem-mapped files. */
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
if (fp->_IO_write_ptr > fp->_IO_write_base || _IO_in_put_mode (fp))
|
2012-05-23 19:33:15 +08:00
|
|
|
if (_IO_switch_to_get_mode (fp))
|
1997-10-13 09:27:24 +08:00
|
|
|
return EOF;
|
|
|
|
|
|
|
|
if (fp->_IO_buf_base == NULL)
|
|
|
|
{
|
1999-03-27 02:23:22 +08:00
|
|
|
/* It could be that we already have a pushback buffer. */
|
|
|
|
if (fp->_IO_read_base != NULL)
|
|
|
|
{
|
|
|
|
free (fp->_IO_read_base);
|
|
|
|
fp->_flags &= ~_IO_IN_BACKUP;
|
|
|
|
}
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_doallocbuf (fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
|
|
|
|
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (dir)
|
|
|
|
{
|
|
|
|
case _IO_seek_cur:
|
|
|
|
/* Adjust for read-ahead (bytes is buffer). */
|
|
|
|
offset -= fp->_IO_read_end - fp->_IO_read_ptr;
|
|
|
|
if (fp->_old_offset == _IO_pos_BAD)
|
|
|
|
goto dumb;
|
|
|
|
/* Make offset absolute, assuming current pointer is file_ptr(). */
|
Update.
* Versions.def: Add GLIBC_2.2 for libc.
* iconv/gconv.h: Make header suitable for inclusion in public header
by protecting all names with __.
* iconv/gconv.c: Adapt for symbol name changes.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_close.c: Likewise.
* iconv/gconv_db.c: Likewise.
* iconv/gconv_dl.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconv/iconv_close.c: Likewise.
* iconv/iconv_open.c: Likewise.
* iconv/loop.c: Likewise.
* iconv/skeleton.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/ansi_x3.110.c: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/euc-cn.c: Likewise.
* iconvdata/euc-jp.c: Likewise.
* iconvdata/euc-kr.c: Likewise.
* iconvdata/euc-tw.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/iso-2022-jp.c: Likewise.
* iconvdata/iso-2022-kr.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso_6937-2.c: Likewise.
* iconvdata/iso_6937.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t.61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* stdlib/mblen.c: Likewise.
* stdlib/mbtowc.c: Likewise.
* stdlib/wctomb.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wchar.h: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsmbsload.h: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* include/limits.h (MB_LEN_MAX): Increase to 16.
* sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define
_G_iconv_t.
* sysdeps/unix/sysv/linux/_G_config.h: Likewise.
* include/wchar.h: Change mbstate_t to __mbstate_t.
* libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos,
oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u,
getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u,
iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u,
putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf,
vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops,
and iofwide.
(tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf.
* libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos,
_IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws,
fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked,
fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked,
getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar,
putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf,
vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to
GLIBC_2.2 for libc.
* libio/libio.h: Define codecvt struct. Define _IO_wide_data.
Extend _IO_file contain pointer to codecvt, widedata and mode.
(_IO_getwc_unlocked): New macro.
(_IO_putwc_unlocked): New macro.
(_IO_fwide): New macro.
* libio/libioP.h: Add new prototypes and adjust existing declarations.
* libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata
buffers based on mode.
(new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide
oriented.
(_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING
flag to be enough to signal unallocated buffer. For wide oriented
stream don't make it linebuffered. Don't use _IO_do_flush, use
_IO_new_do_write directly.
(_IO_new_file_seekoff): Change return value type to _IO_off64_t.
(_IO_file_seek): Likewise.
* libio/genops.c (_IO_least_marker): Make global.
(__underflow): Orient stream if not already done.
(__uflow): Likewise.
(_IO_default_seekpos): Change to type _IO_off64_t.
(_IO_default_seekoff): Likewise.
(_IO_default_seek): Likewise.
(_IO_no_init): New function. Similar to _IO_init but allows to orient
in initialization.
* libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD
to use _IO_off64_t.
* libio/ftello.c: Use _IO_off_t. For now abort when use with wide
char stream.
* libio/ftello64.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofopncook.c: Likewise.
* libio/ioseekoff.c: Likewise.
* libio/ioseekpos.c: Likewise.
* libio/oldfileops.c: Likewise.
* libio/iofgetpos.c: Store state of conversion if necessary.
* libio/iofgetpos64.c: Likewise.
* libio/iofsetpos.c: Restore conversion state if necessary.
* libio/iofsetpos64.c: Likewise.
* libio/iofdopen.c: Initialize so that stream can be wide oriented.
* libio/iofopen.c: Likewise.
* libio/iofopen64.c: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovdprintf.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/memstream.c: Likewise.
* libio/obprintf.c: Likewise.
* libio/iofputs.c: Orient stream if not already happened.
* libio/iofputs_u.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iofwrite_u.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Handle not yet oriented stream.
* libio/iosetvbuf.c: Likewise.
* libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call.
* libio/stdfiles.c: Likewise.
* libio/strops.c (_IO_str_overflow): Correctly free buffer after
failed allocation.
(_IO_str_seekoff): Use _IO_off64_t.
* libio/vasprintf.c: Pre-orient stream.
* libio/vsnprintf.c: Likewise.
* libio/fputwc.c: New file.
* libio/fputwc_u.c: New file.
* libio/fwprintf.c: New file.
* libio/fwscanf.c: New file.
* libio/getwc.c: New file.
* libio/getwc_u.c: New file.
* libio/getwchar.c: New file.
* libio/getwchar_u.c: New file.
* libio/iofgetws.c: New file.
* libio/iofgetws_u.c: New file.
* libio/iofputws.c: New file.
* libio/iofputws_u.c: New file.
* libio/iofwide.c: New file.
* libio/iogetwline.c: New file.
* libio/ioungetwc.c: New file.
* libio/iovswscanf.c: New file.
* libio/iowpadn.c: New file.
* libio/oldiofgetpos.c: New file.
* libio/oldiofgetpos64.c: New file.
* libio/oldiofsetpos.c: New file.
* libio/oldiofsetpos64.c: New file.
* libio/putwc.c: New file.
* libio/putwc_u.c: New file.
* libio/putwchar.c: New file.
* libio/putwchar_u.c: New file.
* libio/swprintf.c: New file.
* libio/swscanf.c: New file.
* libio/tst_swprintf.c: New file.
* libio/tst_swscanf.c: New file.
* libio/tst_wprintf.c: New file.
* libio/tst_wscanf.c: New file.
* libio/tst_wscanf.input: New file.
* libio/vswprintf.c: New file.
* libio/vwprintf.c: New file.
* libio/vwscanf.c: New file.
* libio/wfiledoalloc.c: New file.
* libio/wfileops.c: New file.
* libio/wgenops.c: New file.
* libio/wprintf.c: New file.
* libio/wscanf.c: New file.
* libio/wstrops.c: New file.
* stdio-common/Makefile (routines): Add _itowa, itowa-digits,
vfwprintf, and vfwscanf.
* stdio-common/_itoa.c (base_table): Rename to _IO_base_table and
make global.
* stdio-common/_itowa.c: New file.
* stdio-common/_itowa.h: New file.
* stdio-common/itoa-digits.c: Minimal optimization.
* stdio-common/itowa-digits.c: New file.
* stdio-common/printf-parse.h: Allow use in wide character context.
* stdio-common/printf-prs.c: Define ISASCII and MBRLEN.
* stdio-common/printf.h (printf_info): Add wide bit.
* stdio-common/printf_fp.c: Determine from wide bit whether stream
is wide oriented or not.
* stdio-common/printf_size.c: Likewise.
* sysdeps/generic/printf_fphex.c: Likewise.
* stdlib/strfmon.c: Call __printf_fp with wide bit cleared.
* stdio-common/vfprintf.c: Rewrite to allow use in wide character
context.
* stdio-common/vfscand.c: Likewise.
* stdio-common/vfwprintf.c: New file.
* stdio-common/vfwscanf.c: New file.
* time/Makefile (routines): Add wcsftime.
(tests): Add tst_wcsftime.
* time/Versions: Add wcsftime to GLIBC_2.2 for libc.
* time/strftime.c: Make usable as wcsftime.
* time/wcsftime.c: New file.
* time/tst_wcsftime.c: New file.
* wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul.
* wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc.
* wcsmbs/wcschrnul.c: New file.
* wcsmbs/wmemcpy.c: New file.
* wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias.
* wcsmbs/wmemmove.c: Likewise for wmemmove.
* manual/stdio.texi: Document is_char and wide element if printf_info.
* manual/time.texi: Document wcsftime.
* include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy,
__wmemmove, __wcschrnul, and __vfwscanf.
* locale/langinfo.h: Add new LC_TIME entries for wchar_t data.
* locale/C-time.c: Adapt for above change.
* locale/categories.def: Likewise.
* locale/localeinfo.h: Likewise.
* localedata/Makefile: Don't run tests for now.
1999-06-17 06:55:47 +08:00
|
|
|
offset += fp->_old_offset;
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
dir = _IO_seek_set;
|
|
|
|
break;
|
|
|
|
case _IO_seek_set:
|
|
|
|
break;
|
|
|
|
case _IO_seek_end:
|
|
|
|
{
|
2021-03-03 04:06:02 +08:00
|
|
|
struct __stat64_t64 st;
|
1997-10-13 09:27:24 +08:00
|
|
|
if (_IO_SYSSTAT (fp, &st) == 0 && S_ISREG (st.st_mode))
|
|
|
|
{
|
|
|
|
offset += st.st_size;
|
|
|
|
dir = _IO_seek_set;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
goto dumb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* At this point, dir==_IO_seek_set. */
|
|
|
|
|
1999-03-27 02:23:22 +08:00
|
|
|
/* If we are only interested in the current position we've found it now. */
|
|
|
|
if (mode == 0)
|
|
|
|
return offset;
|
|
|
|
|
1997-10-13 09:27:24 +08:00
|
|
|
/* If destination is within current buffer, optimize: */
|
|
|
|
if (fp->_old_offset != _IO_pos_BAD && fp->_IO_read_base != NULL
|
|
|
|
&& !_IO_in_backup (fp))
|
|
|
|
{
|
|
|
|
/* Offset relative to start of main get area. */
|
2018-02-08 07:42:04 +08:00
|
|
|
off_t rel_offset = (offset - fp->_old_offset
|
|
|
|
+ (fp->_IO_read_end - fp->_IO_read_base));
|
1997-10-13 09:27:24 +08:00
|
|
|
if (rel_offset >= 0)
|
|
|
|
{
|
|
|
|
if (rel_offset <= fp->_IO_read_end - fp->_IO_read_base)
|
|
|
|
{
|
|
|
|
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base + rel_offset,
|
|
|
|
fp->_IO_read_end);
|
|
|
|
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
|
1999-03-27 02:23:22 +08:00
|
|
|
{
|
|
|
|
_IO_mask_flags (fp, 0, _IO_EOF_SEEN);
|
|
|
|
goto resync;
|
|
|
|
}
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
#ifdef TODO
|
|
|
|
/* If we have streammarkers, seek forward by reading ahead. */
|
|
|
|
if (_IO_have_markers (fp))
|
|
|
|
{
|
|
|
|
int to_skip = rel_offset
|
|
|
|
- (fp->_IO_read_ptr - fp->_IO_read_base);
|
|
|
|
if (ignore (to_skip) != to_skip)
|
|
|
|
goto dumb;
|
1999-03-27 02:23:22 +08:00
|
|
|
_IO_mask_flags (fp, 0, _IO_EOF_SEEN);
|
Update.
1998-10-25 Ulrich Drepper <drepper@cygnus.com>
* include/features.h: Define __USE_POSIS199506 is _POSIX_C_SOURCE is
greater or equal than 199506L.
* sysdeps/generic/bits/types.h (__fd_set): Define element as fds_bits
only is __USE_XOPEN. Otherwise use __fds_bits.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* locale/programs/charmap.c (parse_charmap): Accept tok_string
for <code_set_name>.
1998-10-25 H.J. Lu <hjl@gnu.org>
* locale/programs/ld-ctype.c (ctype_finish): Also check
<space>.
1998-10-25 Ulrich Drepper <drepper@cygnus.com>
* signal/signal.h: Include bits/sigthread.h only if __USE_POSIX199506.
* sysdeps/unix/sysv/linux/bits/types.h: Include pthreadtypes.h only
if __USE_POSIX199506 or __USE_UNIX98.
1998-10-24 22:34 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu>
* string/bits/string2.h: Inline strdup+friends only if
__USE_MISC || __USE_GNU (prevents namespace pollution).
1998-10-24 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (LOCK_SH,
LOCK_EX, LOCK_NB, LOCK_UN): Protect with __USE_BSD.
* sysdeps/unix/sysv/linux/i386/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* libio/ioseekoff.c (_IO_seekoff): Check the valid dir value.
* libio/rewind.c (rewind): Clear the error.
1998-10-24 H.J. Lu <hjl@gnu.org>
* grp/grp.h (getgrent_r, getgrgid_r, getgrnam_r): Add "__" to
"buffer".
1998-10-24 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/alpha/bits/time.h (timeval): Protect
with __need_timeval.
* sysdeps/unix/sysv/linux/mips/bits/time.h (timeval): Likewise.
* sysdeps/unix/sysv/linux/bits/time.h (timeval): Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* signal/signal.h (timespec, siginfo_t, sigwaitinfo, sigtimedwait,
sigqueue): Protect with __USE_POSIX199309.
1998-10-24 H.J. Lu <hjl@gnu.org>
* time/time.h (timespec): Protect with __USE_POSIX199309 instead of
__USE_POSIX.
1998-10-24 H.J. Lu <hjl@gnu.org>
* libio/fileops.c (_IO_new_file_seekoff): Always resync with
the kernel file offset.
* libio/oldfileops.c (_IO_old_file_seekoff): Likewise.
1998-10-25 17:11:53 +08:00
|
|
|
goto resync;
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#ifdef TODO
|
|
|
|
if (rel_offset < 0 && rel_offset >= Bbase () - Bptr ())
|
|
|
|
{
|
|
|
|
if (!_IO_in_backup (fp))
|
|
|
|
_IO_switch_to_backup_area (fp);
|
|
|
|
gbump (fp->_IO_read_end + rel_offset - fp->_IO_read_ptr);
|
1999-03-27 02:23:22 +08:00
|
|
|
_IO_mask_flags (fp, 0, _IO_EOF_SEEN);
|
Update.
1998-10-25 Ulrich Drepper <drepper@cygnus.com>
* include/features.h: Define __USE_POSIS199506 is _POSIX_C_SOURCE is
greater or equal than 199506L.
* sysdeps/generic/bits/types.h (__fd_set): Define element as fds_bits
only is __USE_XOPEN. Otherwise use __fds_bits.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* locale/programs/charmap.c (parse_charmap): Accept tok_string
for <code_set_name>.
1998-10-25 H.J. Lu <hjl@gnu.org>
* locale/programs/ld-ctype.c (ctype_finish): Also check
<space>.
1998-10-25 Ulrich Drepper <drepper@cygnus.com>
* signal/signal.h: Include bits/sigthread.h only if __USE_POSIX199506.
* sysdeps/unix/sysv/linux/bits/types.h: Include pthreadtypes.h only
if __USE_POSIX199506 or __USE_UNIX98.
1998-10-24 22:34 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu>
* string/bits/string2.h: Inline strdup+friends only if
__USE_MISC || __USE_GNU (prevents namespace pollution).
1998-10-24 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (LOCK_SH,
LOCK_EX, LOCK_NB, LOCK_UN): Protect with __USE_BSD.
* sysdeps/unix/sysv/linux/i386/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* libio/ioseekoff.c (_IO_seekoff): Check the valid dir value.
* libio/rewind.c (rewind): Clear the error.
1998-10-24 H.J. Lu <hjl@gnu.org>
* grp/grp.h (getgrent_r, getgrgid_r, getgrnam_r): Add "__" to
"buffer".
1998-10-24 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/alpha/bits/time.h (timeval): Protect
with __need_timeval.
* sysdeps/unix/sysv/linux/mips/bits/time.h (timeval): Likewise.
* sysdeps/unix/sysv/linux/bits/time.h (timeval): Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* signal/signal.h (timespec, siginfo_t, sigwaitinfo, sigtimedwait,
sigqueue): Protect with __USE_POSIX199309.
1998-10-24 H.J. Lu <hjl@gnu.org>
* time/time.h (timespec): Protect with __USE_POSIX199309 instead of
__USE_POSIX.
1998-10-24 H.J. Lu <hjl@gnu.org>
* libio/fileops.c (_IO_new_file_seekoff): Always resync with
the kernel file offset.
* libio/oldfileops.c (_IO_old_file_seekoff): Likewise.
1998-10-25 17:11:53 +08:00
|
|
|
goto resync;
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef TODO
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_unsave_markers (fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (fp->_flags & _IO_NO_READS)
|
|
|
|
goto dumb;
|
|
|
|
|
|
|
|
/* Try to seek to a block boundary, to improve kernel page management. */
|
|
|
|
new_offset = offset & ~(fp->_IO_buf_end - fp->_IO_buf_base - 1);
|
|
|
|
delta = offset - new_offset;
|
|
|
|
if (delta > fp->_IO_buf_end - fp->_IO_buf_base)
|
|
|
|
{
|
|
|
|
new_offset = offset;
|
|
|
|
delta = 0;
|
|
|
|
}
|
|
|
|
result = _IO_SYSSEEK (fp, new_offset, 0);
|
|
|
|
if (result < 0)
|
|
|
|
return EOF;
|
|
|
|
if (delta == 0)
|
|
|
|
count = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count = _IO_SYSREAD (fp, fp->_IO_buf_base,
|
|
|
|
(must_be_exact
|
|
|
|
? delta : fp->_IO_buf_end - fp->_IO_buf_base));
|
|
|
|
if (count < delta)
|
|
|
|
{
|
|
|
|
/* We weren't allowed to read, but try to seek the remainder. */
|
|
|
|
offset = count == EOF ? delta : delta-count;
|
|
|
|
dir = _IO_seek_cur;
|
|
|
|
goto dumb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base + delta,
|
|
|
|
fp->_IO_buf_base + count);
|
|
|
|
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
|
|
|
|
fp->_old_offset = result + count;
|
|
|
|
_IO_mask_flags (fp, 0, _IO_EOF_SEEN);
|
|
|
|
return offset;
|
|
|
|
dumb:
|
|
|
|
|
2012-05-23 19:33:15 +08:00
|
|
|
_IO_unsave_markers (fp);
|
1997-10-13 09:27:24 +08:00
|
|
|
result = _IO_SYSSEEK (fp, offset, dir);
|
|
|
|
if (result != EOF)
|
1998-08-21 07:06:56 +08:00
|
|
|
{
|
|
|
|
_IO_mask_flags (fp, 0, _IO_EOF_SEEN);
|
|
|
|
fp->_old_offset = result;
|
|
|
|
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
|
|
|
|
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
|
|
|
|
}
|
1997-10-13 09:27:24 +08:00
|
|
|
return result;
|
Update.
1998-10-25 Ulrich Drepper <drepper@cygnus.com>
* include/features.h: Define __USE_POSIS199506 is _POSIX_C_SOURCE is
greater or equal than 199506L.
* sysdeps/generic/bits/types.h (__fd_set): Define element as fds_bits
only is __USE_XOPEN. Otherwise use __fds_bits.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* locale/programs/charmap.c (parse_charmap): Accept tok_string
for <code_set_name>.
1998-10-25 H.J. Lu <hjl@gnu.org>
* locale/programs/ld-ctype.c (ctype_finish): Also check
<space>.
1998-10-25 Ulrich Drepper <drepper@cygnus.com>
* signal/signal.h: Include bits/sigthread.h only if __USE_POSIX199506.
* sysdeps/unix/sysv/linux/bits/types.h: Include pthreadtypes.h only
if __USE_POSIX199506 or __USE_UNIX98.
1998-10-24 22:34 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu>
* string/bits/string2.h: Inline strdup+friends only if
__USE_MISC || __USE_GNU (prevents namespace pollution).
1998-10-24 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (LOCK_SH,
LOCK_EX, LOCK_NB, LOCK_UN): Protect with __USE_BSD.
* sysdeps/unix/sysv/linux/i386/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* libio/ioseekoff.c (_IO_seekoff): Check the valid dir value.
* libio/rewind.c (rewind): Clear the error.
1998-10-24 H.J. Lu <hjl@gnu.org>
* grp/grp.h (getgrent_r, getgrgid_r, getgrnam_r): Add "__" to
"buffer".
1998-10-24 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/alpha/bits/time.h (timeval): Protect
with __need_timeval.
* sysdeps/unix/sysv/linux/mips/bits/time.h (timeval): Likewise.
* sysdeps/unix/sysv/linux/bits/time.h (timeval): Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* signal/signal.h (timespec, siginfo_t, sigwaitinfo, sigtimedwait,
sigqueue): Protect with __USE_POSIX199309.
1998-10-24 H.J. Lu <hjl@gnu.org>
* time/time.h (timespec): Protect with __USE_POSIX199309 instead of
__USE_POSIX.
1998-10-24 H.J. Lu <hjl@gnu.org>
* libio/fileops.c (_IO_new_file_seekoff): Always resync with
the kernel file offset.
* libio/oldfileops.c (_IO_old_file_seekoff): Likewise.
1998-10-25 17:11:53 +08:00
|
|
|
|
|
|
|
resync:
|
|
|
|
/* We need to do it since it is possible that the file offset in
|
|
|
|
the kernel may be changed behind our back. It may happen when
|
|
|
|
we fopen a file and then do a fork. One process may access the
|
2011-04-23 09:34:32 +08:00
|
|
|
file and the kernel file offset will be changed. */
|
Update.
1998-10-25 Ulrich Drepper <drepper@cygnus.com>
* include/features.h: Define __USE_POSIS199506 is _POSIX_C_SOURCE is
greater or equal than 199506L.
* sysdeps/generic/bits/types.h (__fd_set): Define element as fds_bits
only is __USE_XOPEN. Otherwise use __fds_bits.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* locale/programs/charmap.c (parse_charmap): Accept tok_string
for <code_set_name>.
1998-10-25 H.J. Lu <hjl@gnu.org>
* locale/programs/ld-ctype.c (ctype_finish): Also check
<space>.
1998-10-25 Ulrich Drepper <drepper@cygnus.com>
* signal/signal.h: Include bits/sigthread.h only if __USE_POSIX199506.
* sysdeps/unix/sysv/linux/bits/types.h: Include pthreadtypes.h only
if __USE_POSIX199506 or __USE_UNIX98.
1998-10-24 22:34 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu>
* string/bits/string2.h: Inline strdup+friends only if
__USE_MISC || __USE_GNU (prevents namespace pollution).
1998-10-24 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (LOCK_SH,
LOCK_EX, LOCK_NB, LOCK_UN): Protect with __USE_BSD.
* sysdeps/unix/sysv/linux/i386/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
* sysdeps/unix/sysv/linux/bits/fcntl.h (LOCK_SH, LOCK_EX,
LOCK_NB, LOCK_UN): Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* libio/ioseekoff.c (_IO_seekoff): Check the valid dir value.
* libio/rewind.c (rewind): Clear the error.
1998-10-24 H.J. Lu <hjl@gnu.org>
* grp/grp.h (getgrent_r, getgrgid_r, getgrnam_r): Add "__" to
"buffer".
1998-10-24 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/alpha/bits/time.h (timeval): Protect
with __need_timeval.
* sysdeps/unix/sysv/linux/mips/bits/time.h (timeval): Likewise.
* sysdeps/unix/sysv/linux/bits/time.h (timeval): Likewise.
1998-10-24 H.J. Lu <hjl@gnu.org>
* signal/signal.h (timespec, siginfo_t, sigwaitinfo, sigtimedwait,
sigqueue): Protect with __USE_POSIX199309.
1998-10-24 H.J. Lu <hjl@gnu.org>
* time/time.h (timespec): Protect with __USE_POSIX199309 instead of
__USE_POSIX.
1998-10-24 H.J. Lu <hjl@gnu.org>
* libio/fileops.c (_IO_new_file_seekoff): Always resync with
the kernel file offset.
* libio/oldfileops.c (_IO_old_file_seekoff): Likewise.
1998-10-25 17:11:53 +08:00
|
|
|
if (fp->_old_offset >= 0)
|
|
|
|
_IO_SYSSEEK (fp, fp->_old_offset, 0);
|
|
|
|
|
|
|
|
return offset;
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
|
2018-02-08 07:42:04 +08:00
|
|
|
ssize_t
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_write (FILE *f, const void *data, ssize_t n)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
ssize_t to_do = n;
|
1997-10-13 09:27:24 +08:00
|
|
|
while (to_do > 0)
|
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
ssize_t count = __write (f->_fileno, data, to_do);
|
1997-10-13 09:27:24 +08:00
|
|
|
if (count == EOF)
|
|
|
|
{
|
|
|
|
f->_flags |= _IO_ERR_SEEN;
|
|
|
|
break;
|
2011-05-16 03:28:46 +08:00
|
|
|
}
|
1997-10-13 09:27:24 +08:00
|
|
|
to_do -= count;
|
|
|
|
data = (void *) ((char *) data + count);
|
|
|
|
}
|
|
|
|
n -= to_do;
|
|
|
|
if (f->_old_offset >= 0)
|
|
|
|
f->_old_offset += n;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2018-02-08 07:42:04 +08:00
|
|
|
size_t
|
2004-03-10 17:29:17 +08:00
|
|
|
attribute_compat_text_section
|
2018-02-08 07:42:04 +08:00
|
|
|
_IO_old_file_xsputn (FILE *f, const void *data, size_t n)
|
1997-10-13 09:27:24 +08:00
|
|
|
{
|
2013-06-08 06:24:35 +08:00
|
|
|
const char *s = (char *) data;
|
2018-02-08 07:42:04 +08:00
|
|
|
size_t to_do = n;
|
1997-10-13 09:27:24 +08:00
|
|
|
int must_flush = 0;
|
2018-02-08 07:42:04 +08:00
|
|
|
size_t count = 0;
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
if (n <= 0)
|
|
|
|
return 0;
|
|
|
|
/* This is an optimized implementation.
|
|
|
|
If the amount to be written straddles a block boundary
|
|
|
|
(or the filebuf is unbuffered), use sys_write directly. */
|
|
|
|
|
|
|
|
/* First figure out how much space is available in the buffer. */
|
|
|
|
if ((f->_flags & _IO_LINE_BUF) && (f->_flags & _IO_CURRENTLY_PUTTING))
|
|
|
|
{
|
|
|
|
count = f->_IO_buf_end - f->_IO_write_ptr;
|
|
|
|
if (count >= n)
|
|
|
|
{
|
2013-06-08 06:24:35 +08:00
|
|
|
const char *p;
|
1997-10-13 09:27:24 +08:00
|
|
|
for (p = s + n; p > s; )
|
|
|
|
{
|
|
|
|
if (*--p == '\n')
|
|
|
|
{
|
|
|
|
count = p - s + 1;
|
|
|
|
must_flush = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2005-09-28 03:40:49 +08:00
|
|
|
else if (f->_IO_write_end > f->_IO_write_ptr)
|
|
|
|
count = f->_IO_write_end - f->_IO_write_ptr; /* Space available. */
|
|
|
|
|
1997-10-13 09:27:24 +08:00
|
|
|
/* Then fill the buffer. */
|
|
|
|
if (count > 0)
|
|
|
|
{
|
|
|
|
if (count > to_do)
|
|
|
|
count = to_do;
|
|
|
|
if (count > 20)
|
|
|
|
{
|
1999-03-27 02:23:22 +08:00
|
|
|
f->_IO_write_ptr = __mempcpy (f->_IO_write_ptr, s, count);
|
1997-10-13 09:27:24 +08:00
|
|
|
s += count;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-06-08 06:24:35 +08:00
|
|
|
char *p = f->_IO_write_ptr;
|
|
|
|
int i = (int) count;
|
1997-10-13 09:27:24 +08:00
|
|
|
while (--i >= 0)
|
|
|
|
*p++ = *s++;
|
1999-03-27 02:23:22 +08:00
|
|
|
f->_IO_write_ptr = p;
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
to_do -= count;
|
|
|
|
}
|
|
|
|
if (to_do + must_flush > 0)
|
|
|
|
{
|
2018-02-08 07:42:04 +08:00
|
|
|
size_t block_size, do_write;
|
1997-10-13 09:27:24 +08:00
|
|
|
/* Next flush the (full) buffer. */
|
|
|
|
if (__overflow (f, EOF) == EOF)
|
2005-10-18 00:05:54 +08:00
|
|
|
return to_do == 0 ? EOF : n - to_do;
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
/* Try to maintain alignment: write a whole number of blocks.
|
|
|
|
dont_write is what gets left over. */
|
|
|
|
block_size = f->_IO_buf_end - f->_IO_buf_base;
|
1998-11-05 06:59:09 +08:00
|
|
|
do_write = to_do - (block_size >= 128 ? to_do % block_size : 0);
|
|
|
|
|
|
|
|
if (do_write)
|
2011-05-16 03:28:46 +08:00
|
|
|
{
|
1998-11-05 06:59:09 +08:00
|
|
|
count = old_do_write (f, s, do_write);
|
|
|
|
to_do -= count;
|
|
|
|
if (count < do_write)
|
|
|
|
return n - to_do;
|
2011-05-16 03:28:46 +08:00
|
|
|
}
|
1997-10-13 09:27:24 +08:00
|
|
|
|
|
|
|
/* Now write out the remainder. Normally, this will fit in the
|
|
|
|
buffer, but it's somewhat messier for line-buffered files,
|
|
|
|
so we let _IO_default_xsputn handle the general case. */
|
1998-11-05 06:59:09 +08:00
|
|
|
if (to_do)
|
2012-05-23 19:33:15 +08:00
|
|
|
to_do -= _IO_default_xsputn (f, s+do_write, to_do);
|
1997-10-13 09:27:24 +08:00
|
|
|
}
|
|
|
|
return n - to_do;
|
|
|
|
}
|
|
|
|
|
2000-03-27 13:18:47 +08:00
|
|
|
compat_symbol (libc, _IO_old_do_write, _IO_do_write, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_attach, _IO_file_attach, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_close_it, _IO_file_close_it, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_finish, _IO_file_finish, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_fopen, _IO_file_fopen, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_init, _IO_file_init, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_setbuf, _IO_file_setbuf, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_sync, _IO_file_sync, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_overflow, _IO_file_overflow, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_seekoff, _IO_file_seekoff, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_underflow, _IO_file_underflow, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_write, _IO_file_write, GLIBC_2_0);
|
|
|
|
compat_symbol (libc, _IO_old_file_xsputn, _IO_file_xsputn, GLIBC_2_0);
|
|
|
|
|
|
|
|
#endif
|