mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 19:09:58 +08:00
9fc9e1c916
* libc/include/sys/reent.h: Add _GLOBAL_REENT macro. * libc/stdio: Globally remove/replace all references to fp->_data. Replace with _REENT or _GLOBAL_REENT where appropriate. * libc/stdio/asprintf.c: Ditto. * libc/stdio/fclose.c: Ditto. * libc/stdio/fvwrite.c: Ditto. * libc/stdio/makebuf.c: Ditto. * libc/stdio/refill.c: Ditto. * libc/stdio/local.h: Ditto. * libc/stdio/setvbuf.c: Ditto. * libc/stdio/sscanf.c: Ditto. * libc/stdio/stdio.c: Ditto. * libc/stdio/ungetc.c: Ditto. * libc/stdio/vfscanf.c: Ditto. * libc/stdio/vsscanf.c: Ditto. * libc/stdio/fopen.c: Ditto. Also use _fseek_r in _fopen_r. * libc/stdio/vasprintf.c: Ditto. Also call _vfprintf_r directly. * libc/stdio/vsnprintf.c: Ditto. * libc/stdio/vsprintf.c: Ditto. * libc/stdio/fcloseall.c(fcloseall): Use _GLOBAL_REENT macro instead of _REENT to walk file list. * libc/stdio/fflush.c: Ditto. * libc/stdio/fgetpos.c: Add reentrant version and have regular version call reentrant version with _REENT argument. * libc/stdio/fsetpos.c: Ditto. * libc/stdio/fseek.c: Ditto. * libc/stdio/fseeko.c: Ditto. * libc/stdio/ftell.c: Ditto. * libc/stdio/ftello.c: Ditto. * libc/stdio/freopen.c: Ditto. * libc/stdio/findfp.c: Use _GLOBAL_REENT pointer when adding new files to chain. Also use _GLOBAL_REENT pointer for cleaning up. * libc/stdio/fiprintf.c: Reformatted to minimize duplicate code. * libc/stdio/siprintf.c: Ditto. * libc/stdio/iprintf.c: Ditto. * libc/stdio/fprintf.c: Ditto. * libc/stdio/printf.c: Ditto. * libc/stdio/snprintf.c: Call _vfprintf_r directly. * libc/stdio/sprintf.c: Ditto. * libc/stdio/vprintf.c: Ditto. Also add _REENT_ONLY check. * libc/stdio/rewind.c: Call _fseek_r directly. * libc/stdio/tmpfile.c: Call _fopen_r and _remove_r directly. * libc/stdio/vfprintf.c (_VFPRINTF_R): Change _r routines to use data pointer. (get_arg): Add extra struct _reent pointer argument. * libc/stdio64/fgetpos64.c: Add _r versions, remove any reference to fp->_data. * libc/stdio64/fopen64.c: Ditto. * libc/stdio64/freopen64.c: Ditto. * libc/stdio64/fsetpos64.c: Ditto. * libc/stdio64/ftello64.c: Ditto. * libc/stdio64/local64.h: Ditto. * libc/stdio64/stdio64.c: Ditto. * libc/stdio64/fseeko64.c: Ditto plus use _fstat_r instead of _fstat64_r for the meantime.
133 lines
2.7 KiB
C
133 lines
2.7 KiB
C
/* No user fns here. Pesch 15apr92. */
|
|
|
|
/*
|
|
* Copyright (c) 1990 The Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the University of California, Berkeley. The name of the
|
|
* University may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
#include <sys/unistd.h>
|
|
#include "local.h"
|
|
|
|
/*
|
|
* Small standard I/O/seek/close functions.
|
|
* These maintain the `known seek offset' for seek optimisation.
|
|
*/
|
|
|
|
_READ_WRITE_RETURN_TYPE
|
|
__sread (cookie, buf, n)
|
|
_PTR cookie;
|
|
char *buf;
|
|
int n;
|
|
{
|
|
register FILE *fp = (FILE *) cookie;
|
|
register int ret;
|
|
|
|
#ifdef __SCLE
|
|
int oldmode = 0;
|
|
if (fp->_flags & __SCLE)
|
|
oldmode = setmode(fp->_file, O_BINARY);
|
|
#endif
|
|
|
|
ret = _read_r (_REENT, fp->_file, buf, n);
|
|
|
|
#ifdef __SCLE
|
|
if (oldmode)
|
|
setmode(fp->_file, oldmode);
|
|
#endif
|
|
|
|
/* If the read succeeded, update the current offset. */
|
|
|
|
if (ret >= 0)
|
|
fp->_offset += ret;
|
|
else
|
|
fp->_flags &= ~__SOFF; /* paranoia */
|
|
return ret;
|
|
}
|
|
|
|
_READ_WRITE_RETURN_TYPE
|
|
__swrite (cookie, buf, n)
|
|
_PTR cookie;
|
|
char _CONST *buf;
|
|
int n;
|
|
{
|
|
register FILE *fp = (FILE *) cookie;
|
|
int w;
|
|
#ifdef __SCLE
|
|
int oldmode=0;
|
|
#endif
|
|
|
|
if (fp->_flags & __SAPP)
|
|
(void) _lseek_r (_REENT, fp->_file, (_off_t) 0, SEEK_END);
|
|
fp->_flags &= ~__SOFF; /* in case O_APPEND mode is set */
|
|
|
|
#ifdef __SCLE
|
|
if (fp->_flags & __SCLE)
|
|
oldmode = setmode(fp->_file, O_BINARY);
|
|
#endif
|
|
|
|
w = _write_r (_REENT, fp->_file, buf, n);
|
|
|
|
#ifdef __SCLE
|
|
if (oldmode)
|
|
setmode(fp->_file, oldmode);
|
|
#endif
|
|
|
|
return w;
|
|
}
|
|
|
|
_fpos_t
|
|
__sseek (cookie, offset, whence)
|
|
_PTR cookie;
|
|
_fpos_t offset;
|
|
int whence;
|
|
{
|
|
register FILE *fp = (FILE *) cookie;
|
|
register _off_t ret;
|
|
|
|
ret = _lseek_r (_REENT, fp->_file, (_off_t) offset, whence);
|
|
if (ret == -1L)
|
|
fp->_flags &= ~__SOFF;
|
|
else
|
|
{
|
|
fp->_flags |= __SOFF;
|
|
fp->_offset = ret;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
__sclose (cookie)
|
|
_PTR cookie;
|
|
{
|
|
FILE *fp = (FILE *) cookie;
|
|
|
|
return _close_r (_REENT, fp->_file);
|
|
}
|
|
|
|
#ifdef __SCLE
|
|
int
|
|
__stextmode (int fd)
|
|
{
|
|
#ifdef __CYGWIN__
|
|
return _cygwin_istext_for_stdio (fd);
|
|
#else
|
|
return 0;
|
|
#endif
|
|
}
|
|
#endif
|