mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08:00
fa3cd24827
The cached offset is reliable to use in ftell when the stream handle is active. We can consider a stream as being active when there is unflushed data. However, even in this case, we can use the cached offset only when the stream is not being written to in a+ mode, because this case may have unflushed data and a stale offset; the previous read could have sent it off somewhere other than the end of the file. There were a couple of adjustments necessary to get this to work. Firstly, fdopen now ceases to use _IO_attach_fd because it sets the offset cache to the current file position. This is not correct because there could be changes to the file descriptor before the stream handle is activated, which would not get reflected. A similar offset caching action is done in _IO_fwide, claiming that wide streams have 'problems' with the file offsets. There don't seem to be any obvious problems with not having the offset cache available, other than that it will have to be queried in a subsequent read/write/seek. I have removed this as well. The testsuite passes successfully with these changes on x86_64.
177 lines
4.8 KiB
C
177 lines
4.8 KiB
C
/* Copyright (C) 1993-2014 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>
|
|
|
|
#ifdef _LIBC
|
|
# include <shlib-compat.h>
|
|
#endif
|
|
|
|
#ifndef _IO_fcntl
|
|
#ifdef _LIBC
|
|
#define _IO_fcntl __fcntl
|
|
#else
|
|
#define _IO_fcntl fcntl
|
|
#endif
|
|
#endif
|
|
|
|
_IO_FILE *
|
|
_IO_new_fdopen (fd, mode)
|
|
int fd;
|
|
const char *mode;
|
|
{
|
|
int read_write;
|
|
int posix_mode = 0;
|
|
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 fd_flags;
|
|
int i;
|
|
int use_mmap = 0;
|
|
|
|
switch (*mode)
|
|
{
|
|
case 'r':
|
|
read_write = _IO_NO_WRITES;
|
|
break;
|
|
case 'w':
|
|
read_write = _IO_NO_READS;
|
|
break;
|
|
case 'a':
|
|
posix_mode = O_APPEND;
|
|
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;
|
|
}
|
|
#ifdef F_GETFL
|
|
fd_flags = _IO_fcntl (fd, F_GETFL);
|
|
#ifndef O_ACCMODE
|
|
#define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR)
|
|
#endif
|
|
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 ((posix_mode & O_APPEND) && !(fd_flags & O_APPEND))
|
|
{
|
|
#ifdef F_SETFL
|
|
if (_IO_fcntl (fd, F_SETFL, fd_flags | O_APPEND) == -1)
|
|
#endif
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
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,
|
|
#ifdef _G_HAVE_MMAP
|
|
(use_mmap && (read_write & _IO_NO_WRITES))
|
|
? &_IO_wfile_jumps_maybe_mmap :
|
|
#endif
|
|
&_IO_wfile_jumps);
|
|
_IO_JUMPS (&new_f->fp) =
|
|
#ifdef _G_HAVE_MMAP
|
|
(use_mmap && (read_write & _IO_NO_WRITES)) ? &_IO_file_jumps_maybe_mmap :
|
|
#endif
|
|
&_IO_file_jumps;
|
|
_IO_file_init (&new_f->fp);
|
|
#if !_IO_UNIFIED_JUMPTABLES
|
|
new_f->fp.vtable = NULL;
|
|
#endif
|
|
/* We only need to record the fd because _IO_file_init 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);
|
|
|
|
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);
|