From 082e680bd54e999f2bb4eb77141958938b1e9ee9 Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Wed, 11 Feb 2004 23:48:50 +0000 Subject: New stdio core. Should be more maintainable. Fixes a couple of bugs. Codepaths streamlined. Improved performance for nonthreaded apps when linked with a thread-enabled libc. Minor iconv bug and some locale/thread related startup issues fixed. These showed up in getting a gcj-compiled java helloworld app running. Removed some old extension functions... _stdio_fdout and _stdio_fsfopen. --- libc/stdio/getchar.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 libc/stdio/getchar.c (limited to 'libc/stdio/getchar.c') diff --git a/libc/stdio/getchar.c b/libc/stdio/getchar.c new file mode 100644 index 000000000..49414eb70 --- /dev/null +++ b/libc/stdio/getchar.c @@ -0,0 +1,44 @@ +/* Copyright (C) 2004 Manuel Novoa III + * + * GNU Library General Public License (LGPL) version 2 or later. + * + * Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details. + */ + +#include "_stdio.h" + +#undef getchar_unlocked +#undef getchar + +#ifdef __DO_UNLOCKED + +weak_alias(__getchar_unlocked,getchar_unlocked); +#ifndef __UCLIBC_HAS_THREADS__ +weak_alias(__getchar_unlocked,getchar); +#endif + +int __getchar_unlocked(void) +{ + register FILE *stream = stdin; + + return __GETC_UNLOCKED_MACRO(stream); +} + +#elif defined __UCLIBC_HAS_THREADS__ + +int getchar(void) +{ + register FILE *stream = stdin; + + if (stream->__user_locking != 0) { + return __GETC_UNLOCKED_MACRO(stream); + } else { + int retval; + __STDIO_ALWAYS_THREADLOCK(stream); + retval = __GETC_UNLOCKED_MACRO(stream); + __STDIO_ALWAYS_THREADUNLOCK(stream); + return retval; + } +} + +#endif -- cgit v1.2.3