From 023c3071a036d84bbd7973edef152c5a48679cb7 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 22 Jan 2016 15:04:51 -0800 Subject: [PATCH] Add _seek64 to FILE. Move fdopen/fopen/freopen and change them to initialize _seek64 instead of the legacy _seek. The in-memory streams can stick with _seek for now, since you're not going to fit a > 4GiB in-memory stream on a 32-bit device anyway. Bug: http://b/24807045 Change-Id: I09dcb426817b571415ce24d4d15f364cdda395b3 --- libc/Android.mk | 5 - libc/stdio/local.h | 32 ++- libc/stdio/stdio.cpp | 257 ++++++++++++++++-- libc/upstream-openbsd/lib/libc/stdio/fdopen.c | 91 ------- .../upstream-openbsd/lib/libc/stdio/fgetpos.c | 43 --- libc/upstream-openbsd/lib/libc/stdio/fopen.c | 86 ------ .../upstream-openbsd/lib/libc/stdio/freopen.c | 171 ------------ .../upstream-openbsd/lib/libc/stdio/fsetpos.c | 43 --- 8 files changed, 252 insertions(+), 476 deletions(-) delete mode 100644 libc/upstream-openbsd/lib/libc/stdio/fdopen.c delete mode 100644 libc/upstream-openbsd/lib/libc/stdio/fgetpos.c delete mode 100644 libc/upstream-openbsd/lib/libc/stdio/fopen.c delete mode 100644 libc/upstream-openbsd/lib/libc/stdio/freopen.c delete mode 100644 libc/upstream-openbsd/lib/libc/stdio/fsetpos.c diff --git a/libc/Android.mk b/libc/Android.mk index 85a58e753..9ba26d723 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -443,28 +443,23 @@ libc_upstream_openbsd_ndk_src_files := \ upstream-openbsd/lib/libc/stdio/asprintf.c \ upstream-openbsd/lib/libc/stdio/clrerr.c \ upstream-openbsd/lib/libc/stdio/dprintf.c \ - upstream-openbsd/lib/libc/stdio/fdopen.c \ upstream-openbsd/lib/libc/stdio/feof.c \ upstream-openbsd/lib/libc/stdio/ferror.c \ upstream-openbsd/lib/libc/stdio/fflush.c \ upstream-openbsd/lib/libc/stdio/fgetc.c \ upstream-openbsd/lib/libc/stdio/fgetln.c \ - upstream-openbsd/lib/libc/stdio/fgetpos.c \ upstream-openbsd/lib/libc/stdio/fgets.c \ upstream-openbsd/lib/libc/stdio/fgetwc.c \ upstream-openbsd/lib/libc/stdio/fgetws.c \ upstream-openbsd/lib/libc/stdio/flags.c \ upstream-openbsd/lib/libc/stdio/fmemopen.c \ - upstream-openbsd/lib/libc/stdio/fopen.c \ upstream-openbsd/lib/libc/stdio/fprintf.c \ upstream-openbsd/lib/libc/stdio/fpurge.c \ upstream-openbsd/lib/libc/stdio/fputc.c \ upstream-openbsd/lib/libc/stdio/fputs.c \ upstream-openbsd/lib/libc/stdio/fputwc.c \ upstream-openbsd/lib/libc/stdio/fputws.c \ - upstream-openbsd/lib/libc/stdio/freopen.c \ upstream-openbsd/lib/libc/stdio/fscanf.c \ - upstream-openbsd/lib/libc/stdio/fsetpos.c \ upstream-openbsd/lib/libc/stdio/funopen.c \ upstream-openbsd/lib/libc/stdio/fvwrite.c \ upstream-openbsd/lib/libc/stdio/fwalk.c \ diff --git a/libc/stdio/local.h b/libc/stdio/local.h index a4c026494..0360ba7f0 100644 --- a/libc/stdio/local.h +++ b/libc/stdio/local.h @@ -70,12 +70,16 @@ struct __sFILE { struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */ int _lbfsize; /* 0 or -_bf._size, for inline putc */ - /* operations */ - void *_cookie; /* cookie passed to io functions */ - int (*_close)(void *); - int (*_read)(void *, char *, int); - fpos_t (*_seek)(void *, fpos_t, int); - int (*_write)(void *, const char *, int); + // Function pointers used by `funopen`. + // Note that `_seek` is ignored if `_seek64` (in __sfileext) is set. + // TODO: implement `funopen64`. + // TODO: NetBSD has `funopen2` which corrects the `int`s to `size_t`s. + // TODO: glibc has `fopencookie` which passes the function pointers in a struct. + void* _cookie; /* cookie passed to io functions */ + int (*_close)(void*); + int (*_read)(void*, char*, int); + fpos_t (*_seek)(void*, fpos_t, int); + int (*_write)(void*, const char*, int); /* extension data, to avoid further ABI breakage */ struct __sbuf _ext; @@ -103,21 +107,22 @@ struct __sFILE { // below, and accessed via `_EXT`. }; -/* - * file extension - */ struct __sfileext { - /* ungetc buffer */ + // ungetc buffer. struct __sbuf _ub; - /* wide char io status */ + // Wide char io status. struct wchar_io_data _wcio; - /* file lock */ + // File lock. pthread_mutex_t _lock; - /* __fsetlocking support */ + // __fsetlocking support. bool _caller_handles_locking; + + // Equivalent to `_seek` but for _FILE_OFFSET_BITS=64. + // Callers should use this but fall back to `__sFILE::_seek`. + off64_t (*_seek64)(void*, off64_t, int); }; // TODO: remove remaining references to these obsolete flags. @@ -179,6 +184,7 @@ __LIBC32_LEGACY_PUBLIC__ int _fwalk(int (*)(FILE *)); #pragma GCC visibility push(hidden) +off64_t __sseek64(void*, off64_t, int); int __sflush_locked(FILE *); int __swhatbuf(FILE *, size_t *, int *); wint_t __fgetwc_unlock(FILE *); diff --git a/libc/stdio/stdio.cpp b/libc/stdio/stdio.cpp index 7e9c439e1..7749e0e45 100644 --- a/libc/stdio/stdio.cpp +++ b/libc/stdio/stdio.cpp @@ -39,10 +39,12 @@ #include #include #include +#include #include #include "local.h" #include "glue.h" +#include "private/ErrnoRestorer.h" #include "private/thread_private.h" #define ALIGNBYTES (sizeof(uintptr_t) - 1) @@ -50,9 +52,9 @@ #define NDYNAMIC 10 /* add ten more whenever necessary */ -#define std(flags, file) \ - {0,0,0,flags,file,{0,0},0,__sF+file,__sclose,__sread,__sseek,__swrite, \ - {(unsigned char *)(__sFext+file), 0},NULL,0,{0},{0},{0,0},0,0} +#define std(flags, file) \ + {0,0,0,flags,file,{0,0},0,__sF+file,__sclose,__sread,nullptr,__swrite, \ + {(unsigned char *)(__sFext+file), 0},nullptr,0,{0},{0},{0,0},0,0} _THREAD_PRIVATE_MUTEX(__sfp_mutex); @@ -66,9 +68,9 @@ _THREAD_PRIVATE_MUTEX(__sfp_mutex); #define WCHAR_IO_DATA_INIT {MBSTATE_T_INIT,MBSTATE_T_INIT,{0},0,0} static struct __sfileext __sFext[3] = { - { SBUF_INIT, WCHAR_IO_DATA_INIT, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, false }, - { SBUF_INIT, WCHAR_IO_DATA_INIT, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, false }, - { SBUF_INIT, WCHAR_IO_DATA_INIT, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, false }, + { SBUF_INIT, WCHAR_IO_DATA_INIT, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, false, __sseek64 }, + { SBUF_INIT, WCHAR_IO_DATA_INIT, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, false, __sseek64 }, + { SBUF_INIT, WCHAR_IO_DATA_INIT, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, false, __sseek64 }, }; // __sF is exported for backwards compatibility. Until M, we didn't have symbols @@ -153,11 +155,17 @@ found: fp->_bf._size = 0; fp->_lbfsize = 0; /* not line buffered */ fp->_file = -1; /* no file */ -/* fp->_cookie = ; */ /* caller sets cookie, _read/_write etc */ + fp->_lb._base = NULL; /* no line buffer */ fp->_lb._size = 0; _FILEEXT_INIT(fp); - return (fp); + + // Caller sets cookie, _read/_write etc. + // We explicitly clear _seek and _seek64 to prevent subtle bugs. + fp->_seek = nullptr; + _EXT(fp)->_seek64 = nullptr; + + return fp; } extern "C" __LIBC_HIDDEN__ void __libc_stdio_cleanup(void) { @@ -165,6 +173,192 @@ extern "C" __LIBC_HIDDEN__ void __libc_stdio_cleanup(void) { _fwalk(__sflush); } +static FILE* __fopen(int fd, int flags) { +#if !defined(__LP64__) + if (fd > SHRT_MAX) { + errno = EMFILE; + return nullptr; + } +#endif + + FILE* fp = __sfp(); + if (fp != nullptr) { + fp->_file = fd; + fp->_flags = flags; + fp->_cookie = fp; + fp->_read = __sread; + fp->_write = __swrite; + fp->_close = __sclose; + _EXT(fp)->_seek64 = __sseek64; + } + return fp; +} + +FILE* fopen(const char* file, const char* mode) { + int oflags; + int flags = __sflags(mode, &oflags); + if (flags == 0) return nullptr; + + int fd = open(file, oflags, DEFFILEMODE); + if (fd == -1) { + return nullptr; + } + + FILE* fp = __fopen(fd, flags); + if (fp == nullptr) { + ErrnoRestorer errno_restorer; + close(fd); + return nullptr; + } + + // When opening in append mode, even though we use O_APPEND, + // we need to seek to the end so that ftell() gets the right + // answer. If the user then alters the seek pointer, or + // the file extends, this will fail, but there is not much + // we can do about this. (We could set __SAPP and check in + // fseek and ftell.) + // TODO: check in __sseek instead. + if (oflags & O_APPEND) __sseek64(fp, 0, SEEK_END); + + return fp; +} + +FILE* fdopen(int fd, const char* mode) { + int oflags; + int flags = __sflags(mode, &oflags); + if (flags == 0) return nullptr; + + // Make sure the mode the user wants is a subset of the actual mode. + int fdflags = fcntl(fd, F_GETFL, 0); + if (fdflags < 0) return nullptr; + int tmp = fdflags & O_ACCMODE; + if (tmp != O_RDWR && (tmp != (oflags & O_ACCMODE))) { + errno = EINVAL; + return nullptr; + } + + // If opened for appending, but underlying descriptor does not have + // O_APPEND bit set, assert __SAPP so that __swrite() will lseek to + // end before each write. + // TODO: use fcntl(2) to set O_APPEND instead. + if ((oflags & O_APPEND) && !(fdflags & O_APPEND)) flags |= __SAPP; + + // If close-on-exec was requested, then turn it on if not already. + if ((oflags & O_CLOEXEC) && !((tmp = fcntl(fd, F_GETFD)) & FD_CLOEXEC)) { + fcntl(fd, F_SETFD, tmp | FD_CLOEXEC); + } + + return __fopen(fd, flags); +} + +// Re-direct an existing, open (probably) file to some other file. +// ANSI is written such that the original file gets closed if at +// all possible, no matter what. +// TODO: rewrite this mess completely. +FILE* freopen(const char* file, const char* mode, FILE* fp) { + int oflags; + int flags = __sflags(mode, &oflags); + if (flags == 0) { + fclose(fp); + return nullptr; + } + + ScopedFileLock sfl(fp); + + // There are actually programs that depend on being able to "freopen" + // descriptors that weren't originally open. Keep this from breaking. + // Remember whether the stream was open to begin with, and which file + // descriptor (if any) was associated with it. If it was attached to + // a descriptor, defer closing it; freopen("/dev/stdin", "r", stdin) + // should work. This is unnecessary if it was not a Unix file. + int isopen, wantfd; + if (fp->_flags == 0) { + fp->_flags = __SEOF; // Hold on to it. + isopen = 0; + wantfd = -1; + } else { + // Flush the stream; ANSI doesn't require this. + if (fp->_flags & __SWR) __sflush(fp); + + // If close is NULL, closing is a no-op, hence pointless. + isopen = fp->_close != NULL; + if ((wantfd = fp->_file) < 0 && isopen) { + (*fp->_close)(fp->_cookie); + isopen = 0; + } + } + + // Get a new descriptor to refer to the new file. + int fd = open(file, oflags, DEFFILEMODE); + if (fd < 0 && isopen) { + // If out of fd's close the old one and try again. + if (errno == ENFILE || errno == EMFILE) { + (*fp->_close)(fp->_cookie); + isopen = 0; + fd = open(file, oflags, DEFFILEMODE); + } + } + + int sverrno = errno; + + // Finish closing fp. Even if the open succeeded above, we cannot + // keep fp->_base: it may be the wrong size. This loses the effect + // of any setbuffer calls, but stdio has always done this before. + if (isopen && fd != wantfd) (*fp->_close)(fp->_cookie); + if (fp->_flags & __SMBF) free(fp->_bf._base); + fp->_w = 0; + fp->_r = 0; + fp->_p = NULL; + fp->_bf._base = NULL; + fp->_bf._size = 0; + fp->_lbfsize = 0; + if (HASUB(fp)) FREEUB(fp); + _UB(fp)._size = 0; + WCIO_FREE(fp); + if (HASLB(fp)) FREELB(fp); + fp->_lb._size = 0; + + if (fd < 0) { // Did not get it after all. + fp->_flags = 0; // Release. + errno = sverrno; // Restore errno in case _close clobbered it. + return nullptr; + } + + // If reopening something that was open before on a real file, try + // to maintain the descriptor. Various C library routines (perror) + // assume stderr is always fd STDERR_FILENO, even if being freopen'd. + if (wantfd >= 0 && fd != wantfd) { + if (dup3(fd, wantfd, oflags & O_CLOEXEC) >= 0) { + close(fd); + fd = wantfd; + } + } + + // _file is only a short. + if (fd > SHRT_MAX) { + fp->_flags = 0; // Release. + errno = EMFILE; + return nullptr; + } + + fp->_flags = flags; + fp->_file = fd; + fp->_cookie = fp; + fp->_read = __sread; + fp->_write = __swrite; + fp->_close = __sclose; + _EXT(fp)->_seek64 = __sseek64; + + // When opening in append mode, even though we use O_APPEND, + // we need to seek to the end so that ftell() gets the right + // answer. If the user then alters the seek pointer, or + // the file extends, this will fail, but there is not much + // we can do about this. (We could set __SAPP and check in + // fseek and ftell.) + if (oflags & O_APPEND) __sseek64(fp, 0, SEEK_END); + return fp; +} + int fclose(FILE* fp) { if (fp->_flags == 0) { // Already freed! @@ -206,39 +400,44 @@ int __swrite(void* cookie, const char* buf, int n) { if (fp->_flags & __SAPP) { // The FILE* is in append mode, but the underlying fd doesn't have O_APPEND set. // We need to seek manually. - // TODO: can we use fcntl(2) to set O_APPEND in fdopen(3) instead? + // TODO: use fcntl(2) to set O_APPEND in fdopen(3) instead? TEMP_FAILURE_RETRY(lseek64(fp->_file, 0, SEEK_END)); } return TEMP_FAILURE_RETRY(write(fp->_file, buf, n)); } -// TODO: _FILE_OFFSET_BITS=64. fpos_t __sseek(void* cookie, fpos_t offset, int whence) { FILE* fp = reinterpret_cast(cookie); return TEMP_FAILURE_RETRY(lseek(fp->_file, offset, whence)); } +off64_t __sseek64(void* cookie, off64_t offset, int whence) { + FILE* fp = reinterpret_cast(cookie); + return TEMP_FAILURE_RETRY(lseek64(fp->_file, offset, whence)); +} + int __sclose(void* cookie) { FILE* fp = reinterpret_cast(cookie); return close(fp->_file); } -static bool __file_is_seekable(FILE* fp) { - if (fp->_seek == nullptr) { - errno = ESPIPE; // Historic practice. - return false; +static off64_t __seek_unlocked(FILE* fp, off64_t offset, int whence) { + // Use `_seek64` if set, but fall back to `_seek`. + if (_EXT(fp)->_seek64 != nullptr) { + return (*_EXT(fp)->_seek64)(fp->_cookie, offset, whence); + } else if (fp->_seek != nullptr) { + return (*fp->_seek)(fp->_cookie, offset, whence); + } else { + errno = ESPIPE; + return -1; } - return true; } // TODO: _FILE_OFFSET_BITS=64. static off_t __ftello_unlocked(FILE* fp) { - if (!__file_is_seekable(fp)) return -1; - - // Find offset of underlying I/O object, then - // adjust for buffered bytes. + // Find offset of underlying I/O object, then adjust for buffered bytes. __sflush(fp); // May adjust seek offset on append stream. - fpos_t result = (*fp->_seek)(fp->_cookie, 0, SEEK_CUR); + fpos_t result = __seek_unlocked(fp, 0, SEEK_CUR); if (result == -1) { return -1; } @@ -258,12 +457,11 @@ static off_t __ftello_unlocked(FILE* fp) { return result; } +// TODO: _FILE_OFFSET_BITS=64. int fseeko(FILE* fp, off_t offset, int whence) { ScopedFileLock sfl(fp); - if (!__file_is_seekable(fp)) return -1; - - // Change any SEEK_CUR to SEEK_SET, and check `whence' argument. + // Change any SEEK_CUR to SEEK_SET, and check `whence` argument. // After this, whence is either SEEK_SET or SEEK_END. if (whence == SEEK_CUR) { fpos_t current_offset = __ftello_unlocked(fp); @@ -280,7 +478,7 @@ int fseeko(FILE* fp, off_t offset, int whence) { if (fp->_bf._base == NULL) __smakebuf(fp); // Flush unwritten data and attempt the seek. - if (__sflush(fp) || (*fp->_seek)(fp->_cookie, offset, whence) == -1) { + if (__sflush(fp) || __seek_unlocked(fp, offset, whence) == -1) { return EOF; } @@ -313,3 +511,14 @@ long ftell(FILE* fp) { } return offset; } + +// TODO: _FILE_OFFSET_BITS=64 +int fgetpos(FILE* fp, fpos_t* pos) { + *pos = ftello(fp); + return (*pos == -1); +} + +// TODO: _FILE_OFFSET_BITS=64 +int fsetpos(FILE* fp, const fpos_t* pos) { + return fseeko(fp, *pos, SEEK_SET); +} diff --git a/libc/upstream-openbsd/lib/libc/stdio/fdopen.c b/libc/upstream-openbsd/lib/libc/stdio/fdopen.c deleted file mode 100644 index 1c0c8132f..000000000 --- a/libc/upstream-openbsd/lib/libc/stdio/fdopen.c +++ /dev/null @@ -1,91 +0,0 @@ -/* $OpenBSD: fdopen.c,v 1.7 2014/08/31 02:21:18 guenther Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include "local.h" - -FILE * -fdopen(int fd, const char *mode) -{ - FILE *fp; - int flags, oflags, fdflags, tmp; - - /* _file is only a short */ - if (fd > SHRT_MAX) { - errno = EMFILE; - return (NULL); - } - - if ((flags = __sflags(mode, &oflags)) == 0) - return (NULL); - - /* Make sure the mode the user wants is a subset of the actual mode. */ - if ((fdflags = fcntl(fd, F_GETFL, 0)) < 0) - return (NULL); - tmp = fdflags & O_ACCMODE; - if (tmp != O_RDWR && (tmp != (oflags & O_ACCMODE))) { - errno = EINVAL; - return (NULL); - } - - if ((fp = __sfp()) == NULL) - return (NULL); - fp->_flags = flags; - - /* - * If opened for appending, but underlying descriptor does not have - * O_APPEND bit set, assert __SAPP so that __swrite() will lseek to - * end before each write. - */ - if ((oflags & O_APPEND) && !(fdflags & O_APPEND)) - fp->_flags |= __SAPP; - - /* - * If close-on-exec was requested, then turn it on if not already - */ - if ((oflags & O_CLOEXEC) && !((tmp = fcntl(fd, F_GETFD)) & FD_CLOEXEC)) - fcntl(fd, F_SETFD, tmp | FD_CLOEXEC); - - fp->_file = fd; - fp->_cookie = fp; - fp->_read = __sread; - fp->_write = __swrite; - fp->_seek = __sseek; - fp->_close = __sclose; - return (fp); -} diff --git a/libc/upstream-openbsd/lib/libc/stdio/fgetpos.c b/libc/upstream-openbsd/lib/libc/stdio/fgetpos.c deleted file mode 100644 index e6188e5a6..000000000 --- a/libc/upstream-openbsd/lib/libc/stdio/fgetpos.c +++ /dev/null @@ -1,43 +0,0 @@ -/* $OpenBSD: fgetpos.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -/* - * fgetpos: like ftello. - */ -int -fgetpos(FILE *fp, fpos_t *pos) -{ - return((*pos = ftello(fp)) == (fpos_t)-1); -} diff --git a/libc/upstream-openbsd/lib/libc/stdio/fopen.c b/libc/upstream-openbsd/lib/libc/stdio/fopen.c deleted file mode 100644 index 14650523e..000000000 --- a/libc/upstream-openbsd/lib/libc/stdio/fopen.c +++ /dev/null @@ -1,86 +0,0 @@ -/* $OpenBSD: fopen.c,v 1.7 2008/05/03 18:46:41 chl Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include "local.h" - -FILE * -fopen(const char *file, const char *mode) -{ - FILE *fp; - int f; - int flags, oflags; - - if ((flags = __sflags(mode, &oflags)) == 0) - return (NULL); - if ((fp = __sfp()) == NULL) - return (NULL); - if ((f = open(file, oflags, DEFFILEMODE)) < 0) { - fp->_flags = 0; /* release */ - return (NULL); - } - - /* _file is only a short */ - if (f > SHRT_MAX) { - fp->_flags = 0; /* release */ - close(f); - errno = EMFILE; - return (NULL); - } - - fp->_file = f; - fp->_flags = flags; - fp->_cookie = fp; - fp->_read = __sread; - fp->_write = __swrite; - fp->_seek = __sseek; - fp->_close = __sclose; - - /* - * When opening in append mode, even though we use O_APPEND, - * we need to seek to the end so that ftell() gets the right - * answer. If the user then alters the seek pointer, or - * the file extends, this will fail, but there is not much - * we can do about this. (We could set __SAPP and check in - * fseek and ftell.) - */ - if (oflags & O_APPEND) - (void) __sseek((void *)fp, (fpos_t)0, SEEK_END); - return (fp); -} diff --git a/libc/upstream-openbsd/lib/libc/stdio/freopen.c b/libc/upstream-openbsd/lib/libc/stdio/freopen.c deleted file mode 100644 index 82717b1e2..000000000 --- a/libc/upstream-openbsd/lib/libc/stdio/freopen.c +++ /dev/null @@ -1,171 +0,0 @@ -/* $OpenBSD: freopen.c,v 1.14 2014/08/31 02:21:18 guenther Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "local.h" - -/* - * Re-direct an existing, open (probably) file to some other file. - * ANSI is written such that the original file gets closed if at - * all possible, no matter what. - */ -FILE * -freopen(const char *file, const char *mode, FILE *fp) -{ - int f; - int flags, isopen, oflags, sverrno, wantfd; - - if ((flags = __sflags(mode, &oflags)) == 0) { - (void) fclose(fp); - return (NULL); - } - - if (!__sdidinit) - __sinit(); - - FLOCKFILE(fp); - - /* - * There are actually programs that depend on being able to "freopen" - * descriptors that weren't originally open. Keep this from breaking. - * Remember whether the stream was open to begin with, and which file - * descriptor (if any) was associated with it. If it was attached to - * a descriptor, defer closing it; freopen("/dev/stdin", "r", stdin) - * should work. This is unnecessary if it was not a Unix file. - */ - if (fp->_flags == 0) { - fp->_flags = __SEOF; /* hold on to it */ - isopen = 0; - wantfd = -1; - } else { - /* flush the stream; ANSI doesn't require this. */ - if (fp->_flags & __SWR) - (void) __sflush(fp); - /* if close is NULL, closing is a no-op, hence pointless */ - isopen = fp->_close != NULL; - if ((wantfd = fp->_file) < 0 && isopen) { - (void) (*fp->_close)(fp->_cookie); - isopen = 0; - } - } - - /* Get a new descriptor to refer to the new file. */ - f = open(file, oflags, DEFFILEMODE); - if (f < 0 && isopen) { - /* If out of fd's close the old one and try again. */ - if (errno == ENFILE || errno == EMFILE) { - (void) (*fp->_close)(fp->_cookie); - isopen = 0; - f = open(file, oflags, DEFFILEMODE); - } - } - sverrno = errno; - - /* - * Finish closing fp. Even if the open succeeded above, we cannot - * keep fp->_base: it may be the wrong size. This loses the effect - * of any setbuffer calls, but stdio has always done this before. - */ - if (isopen && f != wantfd) - (void) (*fp->_close)(fp->_cookie); - if (fp->_flags & __SMBF) - free((char *)fp->_bf._base); - fp->_w = 0; - fp->_r = 0; - fp->_p = NULL; - fp->_bf._base = NULL; - fp->_bf._size = 0; - fp->_lbfsize = 0; - if (HASUB(fp)) - FREEUB(fp); - _UB(fp)._size = 0; - WCIO_FREE(fp); - if (HASLB(fp)) - FREELB(fp); - fp->_lb._size = 0; - - if (f < 0) { /* did not get it after all */ - fp->_flags = 0; /* set it free */ - FUNLOCKFILE(fp); - errno = sverrno; /* restore in case _close clobbered */ - return (NULL); - } - - /* - * If reopening something that was open before on a real file, try - * to maintain the descriptor. Various C library routines (perror) - * assume stderr is always fd STDERR_FILENO, even if being freopen'd. - */ - if (wantfd >= 0 && f != wantfd) { - if (dup3(f, wantfd, oflags & O_CLOEXEC) >= 0) { - (void) close(f); - f = wantfd; - } - } - - /* _file is only a short */ - if (f > SHRT_MAX) { - fp->_flags = 0; /* set it free */ - FUNLOCKFILE(fp); - errno = EMFILE; - return (NULL); - } - - fp->_flags = flags; - fp->_file = f; - fp->_cookie = fp; - fp->_read = __sread; - fp->_write = __swrite; - fp->_seek = __sseek; - fp->_close = __sclose; - - /* - * When opening in append mode, even though we use O_APPEND, - * we need to seek to the end so that ftell() gets the right - * answer. If the user then alters the seek pointer, or - * the file extends, this will fail, but there is not much - * we can do about this. (We could set __SAPP and check in - * fseek and ftell.) - */ - if (oflags & O_APPEND) - (void) __sseek((void *)fp, (fpos_t)0, SEEK_END); - FUNLOCKFILE(fp); - return (fp); -} diff --git a/libc/upstream-openbsd/lib/libc/stdio/fsetpos.c b/libc/upstream-openbsd/lib/libc/stdio/fsetpos.c deleted file mode 100644 index 9624fe565..000000000 --- a/libc/upstream-openbsd/lib/libc/stdio/fsetpos.c +++ /dev/null @@ -1,43 +0,0 @@ -/* $OpenBSD: fsetpos.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -/* - * fsetpos: like fseeko. - */ -int -fsetpos(FILE *iop, const fpos_t *pos) -{ - return (fseeko(iop, (off_t)*pos, SEEK_SET)); -}