mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 04:01:10 +00:00
63fb8f9aa9
Nearly everything in _G_config.h is either junk or more appropriately defined elsewhere: * _G_fpos_t, _G_fpos64_t, and _G_BUFSIZ are already completely unused. * All remaining uses of _G_va_list have been changed to __gnuc_va_list. * The definition of _G_HAVE_ST_BLKSIZE/_IO_HAVE_ST_BLKSIZE has been inlined into its sole use. * The complete definition of _G_iconv_t has been moved to libio.h and renamed _IO_iconv_t (all actual users used that name). * _G_IO_IO_FILE_VERSION is vestigial; some code cares whether _IO_stdin_used exists, but nothing looks at its value. I've preserved the value as a hardwired constant in csu/init.c. This means csu/init.c no longer needs to include anything. * Many of the headers included by _G_config.h were already being included directly by either either libio.h or stdio.h; the remaining ones were moved to libio.h. * _G_HAVE_MREMAP is still relevant, because mremap genuinely is a Linux extension; it's not in POSIX and as far as I can tell it's not available on the Hurd either. I also preserved _G_HAVE_MMAP, since it's conceivable someone would want to port glibc to a MMU-less, mmap-less environment in the future. Both are now always defined to 1/0 as is the current convention, instead of the older 1/undef convention. These are the only symbols still defined in _G_config.h. * The actual inclusion of _G_config.h moves from libio.h to libioP.h, as this is where a potential override of _G_HAVE_MMAP happens. * The #ifdef logic in libioP.h controlling _IO_JUMPS_OFFSET has been simplified. After this patch, the only surviving _G_ symbols are the struct tag names _G_fpos_t and _G_fpos64_t, which are preserved for the sake of C++ mangled names in applications, and _G_HAVE_MMAP and _G_HAVE_MREMAP, which do not seem worth renaming. Installed stripped libraries are unchanged by this patch. * bits/_G_config.h: Move back to sysdeps/generic/_G_config.h. Delete all contents except for definitions of _G_HAVE_MMAP and _G_HAVE_MREMAP. Add commentary explaining those two symbols. * sysdeps/unix/sysv/linux/bits/_G_config.h: Move back to sysdeps/unix/sysv/linux/_G_config.h. Make same content change as above. * libio/libio.h: Don't include bits/_G_config.h here. Include stddef.h with __need_wchar_t defined. Include bits/types/__mbstate_t.h, bits/types/wint_t.h, and gconv.h. Define _IO_iconv_t here, directly. Don't define _IO_HAVE_ST_BLKSIZE. * libio/libioP.h: Include _G_config.h here. Move include of shlib-compat.h up with rest of includes. Simplify conditionals controlling definition of _IO_JUMPS_OFFSET. * csu/init.c: Remove always-true #if around entire file. Don't include stdio.h. Set _IO_stdin_used to hardwired constant 0x20001, and update commentary. * include/stdio.h, sysdeps/ieee754/ldbl-opt/nldbl-compat.h: Replace all uses of _G_va_list with __gnuc_va_list. * libio/filedoalloc.c: Use #if defined _STATBUF_ST_BLKSIZE instead of #if _IO_HAVE_ST_BLKSIZE. * libio/fileops.c: Test _G_HAVE_MREMAP with #if, not #ifdef. * libio/iofdopen.c, libio/iofopen.c: Test _G_HAVE_MMAP with #if, not #ifdef.
171 lines
5.2 KiB
C
171 lines
5.2 KiB
C
/* Copyright (C) 1993-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
#include <stdlib.h>
|
|
#include "libioP.h"
|
|
#include <fcntl.h>
|
|
|
|
#include <shlib-compat.h>
|
|
|
|
_IO_FILE *
|
|
_IO_new_fdopen (int fd, const char *mode)
|
|
{
|
|
int read_write;
|
|
struct locked_FILE
|
|
{
|
|
struct _IO_FILE_plus fp;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
struct _IO_wide_data wd;
|
|
} *new_f;
|
|
int i;
|
|
int use_mmap = 0;
|
|
|
|
/* Decide whether we modify the offset of the file we attach to and seek to
|
|
the end of file. We only do this if the mode is 'a' and if the file
|
|
descriptor did not have O_APPEND in its flags already. */
|
|
bool do_seek = false;
|
|
|
|
switch (*mode)
|
|
{
|
|
case 'r':
|
|
read_write = _IO_NO_WRITES;
|
|
break;
|
|
case 'w':
|
|
read_write = _IO_NO_READS;
|
|
break;
|
|
case 'a':
|
|
read_write = _IO_NO_READS|_IO_IS_APPENDING;
|
|
break;
|
|
default:
|
|
MAYBE_SET_EINVAL;
|
|
return NULL;
|
|
}
|
|
for (i = 1; i < 5; ++i)
|
|
{
|
|
switch (*++mode)
|
|
{
|
|
case '\0':
|
|
break;
|
|
case '+':
|
|
read_write &= _IO_IS_APPENDING;
|
|
break;
|
|
case 'm':
|
|
use_mmap = 1;
|
|
continue;
|
|
case 'x':
|
|
case 'b':
|
|
default:
|
|
/* Ignore */
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
int fd_flags = __fcntl (fd, F_GETFL);
|
|
if (fd_flags == -1)
|
|
return NULL;
|
|
|
|
if (((fd_flags & O_ACCMODE) == O_RDONLY && !(read_write & _IO_NO_WRITES))
|
|
|| ((fd_flags & O_ACCMODE) == O_WRONLY && !(read_write & _IO_NO_READS)))
|
|
{
|
|
MAYBE_SET_EINVAL;
|
|
return NULL;
|
|
}
|
|
|
|
/* The May 93 draft of P1003.4/D14.1 (redesignated as 1003.1b)
|
|
[System Application Program Interface (API) Amendment 1:
|
|
Realtime Extensions], Rationale B.8.3.3
|
|
Open a Stream on a File Descriptor says:
|
|
|
|
Although not explicitly required by POSIX.1, a good
|
|
implementation of append ("a") mode would cause the
|
|
O_APPEND flag to be set.
|
|
|
|
(Historical implementations [such as Solaris2] do a one-time
|
|
seek in fdopen.)
|
|
|
|
However, we do not turn O_APPEND off if the mode is "w" (even
|
|
though that would seem consistent) because that would be more
|
|
likely to break historical programs.
|
|
*/
|
|
if ((read_write & _IO_IS_APPENDING) && !(fd_flags & O_APPEND))
|
|
{
|
|
do_seek = true;
|
|
if (__fcntl (fd, F_SETFL, fd_flags | O_APPEND) == -1)
|
|
return NULL;
|
|
}
|
|
|
|
new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE));
|
|
if (new_f == NULL)
|
|
return NULL;
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f->fp.file._lock = &new_f->lock;
|
|
#endif
|
|
_IO_no_init (&new_f->fp.file, 0, 0, &new_f->wd,
|
|
#if _G_HAVE_MMAP
|
|
(use_mmap && (read_write & _IO_NO_WRITES))
|
|
? &_IO_wfile_jumps_maybe_mmap :
|
|
#endif
|
|
&_IO_wfile_jumps);
|
|
_IO_JUMPS (&new_f->fp) =
|
|
#if _G_HAVE_MMAP
|
|
(use_mmap && (read_write & _IO_NO_WRITES)) ? &_IO_file_jumps_maybe_mmap :
|
|
#endif
|
|
&_IO_file_jumps;
|
|
_IO_new_file_init_internal (&new_f->fp);
|
|
#if !_IO_UNIFIED_JUMPTABLES
|
|
new_f->fp.vtable = NULL;
|
|
#endif
|
|
/* We only need to record the fd because _IO_file_init_internal will
|
|
have unset the offset. It is important to unset the cached
|
|
offset because the real offset in the file could change between
|
|
now and when the handle is activated and we would then mislead
|
|
ftell into believing that we have a valid offset. */
|
|
new_f->fp.file._fileno = fd;
|
|
new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE;
|
|
|
|
_IO_mask_flags (&new_f->fp.file, read_write,
|
|
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
|
|
|
|
/* For append mode, set the file offset to the end of the file if we added
|
|
O_APPEND to the file descriptor flags. Don't update the offset cache
|
|
though, since the file handle is not active. */
|
|
if (do_seek && ((read_write & (_IO_IS_APPENDING | _IO_NO_READS))
|
|
== (_IO_IS_APPENDING | _IO_NO_READS)))
|
|
{
|
|
_IO_off64_t new_pos = _IO_SYSSEEK (&new_f->fp.file, 0, _IO_seek_end);
|
|
if (new_pos == _IO_pos_BAD && errno != ESPIPE)
|
|
return NULL;
|
|
}
|
|
return &new_f->fp.file;
|
|
}
|
|
libc_hidden_ver (_IO_new_fdopen, _IO_fdopen)
|
|
|
|
strong_alias (_IO_new_fdopen, __new_fdopen)
|
|
versioned_symbol (libc, _IO_new_fdopen, _IO_fdopen, GLIBC_2_1);
|
|
versioned_symbol (libc, __new_fdopen, fdopen, GLIBC_2_1);
|