diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2006-06-14 20:49:11 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2006-06-14 20:49:11 +0000 |
| commit | 4dc0c0c4e5f76c22b39976dd381e04699ab0f09d (patch) | |
| tree | c3ac4ca00812cff8cbdaf27f698768a73f922ffb /newlib/libc/stdio/vfprintf.c | |
| parent | 1b9cba59c38702b6bcdec116591d3c7191ea7ad7 (diff) | |
| download | cygnal-4dc0c0c4e5f76c22b39976dd381e04699ab0f09d.tar.gz cygnal-4dc0c0c4e5f76c22b39976dd381e04699ab0f09d.tar.bz2 cygnal-4dc0c0c4e5f76c22b39976dd381e04699ab0f09d.zip | |
2006-06-14 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/stdio.h: Add new reentrant I/O prototypes for
read/write functions. Change getc/putc macros to have reentrant underlying
macros/functions. This includes __sgetc_raw_r, __sgetc_r, and __sputc_r.
* libc/stdio/fgetc.c: Fix and/or add reentrant version to call
new reentrant I/O functions/macros for reading/writing.
* libc/stdio/fgets.c: Ditto.
* libc/stdio/fputc.c: Ditto.
* libc/stdio/fputs.c: Ditto.
* libc/stdio/fread.c: Ditto.
* libc/stdio/fseek.c: Ditto.
* libc/stdio64/fseeko64.c: Ditto.
* libc/stdio/fwrite.c: Ditto.
* libc/stdio/getc.c: Ditto.
* libc/stdio/getc_u.c: Ditto.
* libc/stdio/getchar.c: Ditto.
* libc/stdio/getchar_u.c: Ditto.
* libc/stdio/putc.c: Ditto.
* libc/stdio/putc_u.c: Ditto.
* libc/stdio/putchar.c: Ditto.
* libc/stdio/puts.c: Ditto.
* libc/stdio/vfprintf.c: Ditto.
* libc/stdio/vfscanf.c: Ditto.
* libc/stdio/fvwrite.c: Change __sfvwrite into reentrant __sfvwrite_r.
Change all previous callers of __sfvwrite. Set errno to EBADF and
set error flag on if attempt is made to write to file that does not
allow writing.
* libc/stdio/fvwrite.h: Fix new reentrant prototypes.
* libc/stdio/local.h: Ditto.
* libc/stdio/refill.c: Turn __srefill into reentrant __srefill_r.
Set errno to EBADF and the error flag on if attempt is made to
read unreadable file. Change all previous callers of __srefill.
* libc/stdio/rget.c
* libc/stdio/wbuf.c: Turn __swbuf into reentrant __swbuf_r. Change
all previous callers of __swbuf.
* libc/sys/linux/machine/i386/huge_val.h: Ifdef out file contents since
huge value macros are already defined correctly for i386 by <math.h>.
Diffstat (limited to 'newlib/libc/stdio/vfprintf.c')
| -rw-r--r-- | newlib/libc/stdio/vfprintf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index a8c1f9bca..370ffe0e5 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -212,7 +212,8 @@ static char *rcsid = "$Id$"; * then reset it so that it can be reused. */ static int -_DEFUN(__sprint, (fp, uio), +_DEFUN(__sprint_r, (ptr, fp, uio), + struct _reent *ptr _AND FILE *fp _AND register struct __suio *uio) { @@ -222,7 +223,7 @@ _DEFUN(__sprint, (fp, uio), uio->uio_iovcnt = 0; return (0); } - err = __sfvwrite(fp, uio); + err = __sfvwrite_r(ptr, fp, uio); uio->uio_resid = 0; uio->uio_iovcnt = 0; return (err); @@ -469,7 +470,7 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap), uio.uio_resid += (len); \ iovp++; \ if (++uio.uio_iovcnt >= NIOV) { \ - if (__sprint(fp, &uio)) \ + if (__sprint_r(data, fp, &uio)) \ goto error; \ iovp = iov; \ } \ @@ -484,7 +485,7 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap), } \ } #define FLUSH() { \ - if (uio.uio_resid && __sprint(fp, &uio)) \ + if (uio.uio_resid && __sprint_r(data, fp, &uio)) \ goto error; \ uio.uio_iovcnt = 0; \ iovp = iov; \ |