From 968738f9b133c8bda7d5ced178fd92f4445d791c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 18 Dec 2014 14:55:21 +0000 Subject: Implement BSD/GNU unlocked stdio extensions. * libc/include/stdio.h (clearerr_unlocked, feof_unlocked, ferror_unlocked, fflush_unlocked, fgetc_unlocked, fgets_unlocked, fileno_unlocked, fputc_unlocked, fputs_unlocked, fread_unlocked, fwrite_unlocked): Declare. * libc/include/wchar.h (fgetwc_unlocked, fgetws_unlocked, fputwc_unlocked, fputws_unlocked, getwc_unlocked, getwchar_unlocked, putwc_unlocked, putwchar_unlocked): Declare. * libc/stdio/Makefile.am (ELIX_4_SOURCES): Add clearerr_u.c, feof_u.c, ferror_u.c, fflush_u.c, fgetc_u.c, fgets_u.c, fgetwc_u.c, fgetws_u.c, fileno_u.c, fputc_u.c, fputs_u.c, fputwc_u.c, fputws_u.c, fread_u.c, fwrite_u.c, getwc_u.c, getwchar_u.c, putwc_u.c, putwchar_u.c. Add necessary dependencies. * libc/stdio/Makefile.in: Regenerate. * libc/stdio/clearerr.c: Document unlocked variant. * libc/stdio/clearerr_u.c: New file. * libc/stdio/feof.c: Document unlocked variant. * libc/stdio/feof_u.c: New file. * libc/stdio/ferror.c: Document unlocked variant. * libc/stdio/ferror_u.c: New file. * libc/stdio/fflush.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. * libc/stdio/fflush_u.c: New file. * libc/stdio/fgetc.c: Document unlocked variants. * libc/stdio/fgetc_u.c: New file. * libc/stdio/fgets.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. * libc/stdio/fgets_u.c: New file. * libc/stdio/fgetwc.c: Document unlocked variants. (__fgetwc): Make non-static. * libc/stdio/fgetwc_u.c: New file. * libc/stdio/fgetws.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. * libc/stdio/fgetws_u.c: New file. * libc/stdio/fileno.c: Document unlocked variant. * libc/stdio/fileno_u.c: New file. * libc/stdio/fputc.c: Document unlocked variants. * libc/stdio/fputc_u.c: New file. * libc/stdio/fputs.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. * libc/stdio/fputs_u.c: New file. * libc/stdio/fputwc.c: Document unlocked variants. (__fputwc): Make non-static. * libc/stdio/fputwc_u.c: New file. * libc/stdio/fputws.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. * libc/stdio/fputws_u.c: New file. * libc/stdio/fread.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. * libc/stdio/fread_u.c: New file. * libc/stdio/fwrite.c: Add __IMPL_UNLOCKED__ overrides. Document unlocked variants. * libc/stdio/fwrite_u.c: New file. * libc/stdio/getwc_u.c: New file. * libc/stdio/getwchar.c: Document unlocked variants. * libc/stdio/getwchar_u.c: New file. * libc/stdio/local.h: Define locking macros as empty ifdef __IMPL_UNLOCKED__. (__fgetwc, __fputwc): Declare. * libc/stdio/putwc_u.c: New file. * libc/stdio/putwchar.c: Document unlocked variants. * libc/stdio/putwchar_u.c: New file. --- newlib/libc/stdio/getwchar.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) (limited to 'newlib/libc/stdio/getwchar.c') diff --git a/newlib/libc/stdio/getwchar.c b/newlib/libc/stdio/getwchar.c index f559c7677..7ab230a4c 100644 --- a/newlib/libc/stdio/getwchar.c +++ b/newlib/libc/stdio/getwchar.c @@ -26,34 +26,65 @@ /* FUNCTION -<>---read a wide character from standard input +<>, <>---read a wide character from standard input INDEX getwchar +INDEX + getwchar_unlocked INDEX _getwchar_r +INDEX + _getwchar_unlocked_r ANSI_SYNOPSIS #include wint_t getwchar(void); + #define _GNU_SOURCE + #include + wint_t getwchar_unlocked(void); + + #include wint_t _getwchar_r(struct _reent *<[reent]>); + #include + wint_t _getwchar_unlocked_r(struct _reent *<[reent]>); + TRAD_SYNOPSIS #include wint_t getwchar(); + #define _GNU_SOURCE + #include + wint_t getwchar_unlocked(); + + #include wint_t _getwchar_r(<[reent]>) char * <[reent]>; + #include + wint_t _getwchar_unlocked_r(<[reent]>) + char * <[reent]>; + DESCRIPTION <> function or macro is the wide character equivalent of the <> function. You can use <> to get the next wide character from the standard input stream. As a side effect, <> advances the standard input's current position indicator. -The alternate function <<_getwchar_r>> is a reentrant version. The -extra argument <[reent]> is a pointer to a reentrancy structure. +<> is a non-thread-safe version of <>. +<> may only safely be used within a scope +protected by flockfile() (or ftrylockfile()) and funlockfile(). This +function may safely be used in a multi-threaded program if and only +if they are called while the invoking thread owns 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 alternate functions <<_getwchar_r>> and <<_getwchar_unlocked_r>> are +reentrant versions of the above. The extra argument <[reent]> is a pointer to +a reentrancy structure. RETURNS The next wide character cast to <>, unless there is no more @@ -64,7 +95,9 @@ You can distinguish the two situations that cause an <> result by using `<>' and `<>'. PORTABILITY -C99 +<> is required by C99. + +<> is a GNU extension. */ #include <_ansi.h> -- cgit v1.2.3