From 4dc0c0c4e5f76c22b39976dd381e04699ab0f09d Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 14 Jun 2006 20:49:11 +0000 Subject: 2006-06-14 Jeff Johnston * 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 . --- newlib/libc/stdio/getchar_u.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'newlib/libc/stdio/getchar_u.c') diff --git a/newlib/libc/stdio/getchar_u.c b/newlib/libc/stdio/getchar_u.c index be566ea26..ce4014519 100644 --- a/newlib/libc/stdio/getchar_u.c +++ b/newlib/libc/stdio/getchar_u.c @@ -21,11 +21,16 @@ FUNCTION INDEX getchar_unlocked +INDEX + _getchar_unlocked_r POSIX_SYNOPSIS #include int getchar_unlocked(); + #include + int _getchar_unlocked_r(struct _reent *<[ptr]>); + DESCRIPTION <> is a non-thread-safe version of <> declared in <>. <> may only safely be used @@ -36,6 +41,10 @@ the ( FILE *) object, as is the case after a successful call to the flockfile() or ftrylockfile() functions. If threads are disabled, then <> is equivalent to <>. +The <<_getchar_unlocked_r>> function is simply the reentrant version of +<> which passes an addtional reentrancy structure pointer +argument: <[ptr]>. + RETURNS See <>. @@ -61,10 +70,10 @@ static char sccsid[] = "%W% (Berkeley) %G%"; #undef getchar_unlocked int -_DEFUN(_getchar_unlocked_r, (f), - struct _reent *f) +_DEFUN(_getchar_unlocked_r, (ptr), + struct _reent *ptr) { - return getc_unlocked (_stdin_r (f)); + return _getc_unlocked_r (ptr, _stdin_r (ptr)); } #ifndef _REENT_ONLY @@ -72,9 +81,9 @@ _DEFUN(_getchar_unlocked_r, (f), int _DEFUN_VOID(getchar_unlocked) { - /* CHECK_INIT is called (eventually) by __srefill. */ + /* CHECK_INIT is called (eventually) by __srefill_r. */ - return _getchar_unlocked_r (_REENT); + return _getc_unlocked_r (_REENT, _stdin_r (_REENT)); } #endif -- cgit v1.2.3