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/fgetc.c | |
| parent | 1b9cba59c38702b6bcdec116591d3c7191ea7ad7 (diff) | |
| download | newlib-4dc0c0c4e5f76c22b39976dd381e04699ab0f09d.zip newlib-4dc0c0c4e5f76c22b39976dd381e04699ab0f09d.tar.gz newlib-4dc0c0c4e5f76c22b39976dd381e04699ab0f09d.tar.bz2 | |
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/fgetc.c')
| -rw-r--r-- | newlib/libc/stdio/fgetc.c | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c index 020b2da..1802acf 100644 --- a/newlib/libc/stdio/fgetc.c +++ b/newlib/libc/stdio/fgetc.c @@ -21,16 +21,26 @@ FUNCTION INDEX fgetc +INDEX + _fgetc_r ANSI_SYNOPSIS #include <stdio.h> int fgetc(FILE *<[fp]>); + #include <stdio.h> + int _fgetc_r(struct _reent *<[ptr]>, FILE *<[fp]>); + TRAD_SYNOPSIS #include <stdio.h> int fgetc(<[fp]>) FILE *<[fp]>; + #include <stdio.h> + int _fgetc_r(<[ptr]>, <[fp]>) + struct _reent *<[ptr]>; + FILE *<[fp]>; + DESCRIPTION Use <<fgetc>> to get the next single character from the file or stream identified by <[fp]>. As a side effect, <<fgetc>> advances the file's @@ -38,6 +48,10 @@ current position indicator. For a macro version of this function, see <<getc>>. +The function <<_fgetc_r>> is simply a reentrant version of +<<fgetc>> that is passed the additional reentrant structure +pointer argument: <[ptr]>. + RETURNS The next character (read as an <<unsigned char>>, and cast to <<int>>), unless there is no more data, or the host system reports a @@ -58,13 +72,35 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, #include "local.h" int +_DEFUN(_fgetc_r, (ptr, fp), + struct _reent * ptr _AND + FILE * fp) +{ + int result; + CHECK_INIT(ptr); + _flockfile (fp); + result = __sgetc_r (ptr, fp); + _funlockfile (fp); + return result; +} + +#ifndef _REENT_ONLY + +int _DEFUN(fgetc, (fp), FILE * fp) { +#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) int result; CHECK_INIT(_REENT); _flockfile (fp); - result = __sgetc (fp); + result = __sgetc_r (_REENT, fp); _funlockfile (fp); return result; +#else + return _fgetc_r (_REENT, fp); +#endif } + +#endif /* !_REENT_ONLY */ + |