diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2007-03-15 18:40:48 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2007-03-15 18:40:48 +0000 |
| commit | 14ba5e14d9226cb4dd1b2a72781ee02e9f2bf8a2 (patch) | |
| tree | 2bd8d4251eebbf9db5443c0bba034650fb5c15ad /newlib/libc/stdio/wsetup.c | |
| parent | e96d068ed3c85f138e368c399a728eb6e9a65751 (diff) | |
| download | newlib-14ba5e14d9226cb4dd1b2a72781ee02e9f2bf8a2.zip newlib-14ba5e14d9226cb4dd1b2a72781ee02e9f2bf8a2.tar.gz newlib-14ba5e14d9226cb4dd1b2a72781ee02e9f2bf8a2.tar.bz2 | |
2007-03-15 Eric Blake <ebb9@byu.net>
* libc/stdio/local.h (cantwrite, FREEUB, FREELB): Make reentrant.
(__smakebuf): Rename...
(__smakebuf_r): to this.
* libc/stdio/fvwrite.h (__swsetup_r): Rename, from __swsetup.
* libc/stdio/makebuf.c (__smakebuf): Detect failed asprint
allocation, then rename...
(__smakebuf_r): ...to this and fix reentrancy.
* libc/stdio/wsetup.c (__swsetup): Detect failed asprintf
allocation, then rename...
(__swsetup_r): ...to this and fix reentrancy.
* libc/stdio/fseek.c (_fseek_r): Fix reentrancy.
* libc/stdio/refill.c (__srefill_r): Likewise.
* libc/stdio/fclose.c (_fclose_r): Likewise.
* libc/stdio/fread.c (_fread_r): Likewise.
* libc/stdio/freopen.c (_freopen_r): Likewise.
* libc/stdio/wbuf.c (__swbuf_r): Likewise.
* libc/stdio64/fseeko64.c (_fseeko64_r): Likewise.
* libc/stdio/fvwrite.c (__sfvwrite_r): Set errno properly on
failed asprintf allocation, and fix reentrancy.
* libc/stdio/snprintf.c (snprintf, _snprintf_r): Report overflow,
as required by POSIX.
* libc/stdio/sniprintf.c (sniprintf, _sniprintf_r): Likewise.
* libc/stdio/vsnprintf.c (vsnprintf, _vsnprintf_r): Likewise.
* libc/stdio/vsniprintf.c (vsniprintf, _vsniprintf_r): Likewise.
Diffstat (limited to 'newlib/libc/stdio/wsetup.c')
| -rw-r--r-- | newlib/libc/stdio/wsetup.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/newlib/libc/stdio/wsetup.c b/newlib/libc/stdio/wsetup.c index ba98813..dcbda0a 100644 --- a/newlib/libc/stdio/wsetup.c +++ b/newlib/libc/stdio/wsetup.c @@ -1,7 +1,7 @@ /* No user fns here. Pesch 15apr92. */ /* - * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 1990, 2007 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -29,7 +29,8 @@ */ int -_DEFUN(__swsetup, (fp), +_DEFUN(__swsetup_r, (ptr, fp), + struct _reent *ptr _AND register FILE * fp) { /* Make sure stdio is set up. */ @@ -48,7 +49,7 @@ _DEFUN(__swsetup, (fp), { /* clobber any ungetc data */ if (HASUB (fp)) - FREEUB (fp); + FREEUB (ptr, fp); fp->_flags &= ~(__SRD | __SEOF); fp->_r = 0; fp->_p = fp->_bf._base; @@ -63,7 +64,7 @@ _DEFUN(__swsetup, (fp), */ if (fp->_bf._base == NULL && (!(fp->_flags & __SSTR) || (fp->_flags & __SMBF))) - __smakebuf (fp); + __smakebuf_r (ptr, fp); if (fp->_flags & __SLBF) { @@ -78,5 +79,5 @@ _DEFUN(__swsetup, (fp), else fp->_w = fp->_flags & __SNBF ? 0 : fp->_bf._size; - return 0; + return (!fp->_bf._base && (fp->_flags & __SMBF)) ? EOF : 0; } |