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/fputc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 libc/stdio/fputc.c (limited to 'libc/stdio/fputc.c') diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c new file mode 100644 index 000000000..0cfb4f943 --- /dev/null +++ b/libc/stdio/fputc.c @@ -0,0 +1,96 @@ +/* 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 fputc +#undef fputc_unlocked +#undef putc +#undef putc_unlocked + +#ifdef __DO_UNLOCKED + +weak_alias(__fputc_unlocked,fputc_unlocked); +weak_alias(__fputc_unlocked,putc_unlocked); +#ifndef __UCLIBC_HAS_THREADS__ +weak_alias(__fputc_unlocked,fputc); +weak_alias(__fputc_unlocked,putc); +#endif + +int __fputc_unlocked(int c, register FILE *stream) +{ + __STDIO_STREAM_VALIDATE(stream); + + /* First the fast path. We're good to go if putc macro enabled. */ + if (__STDIO_STREAM_CAN_USE_BUFFER_ADD(stream)) { + __STDIO_STREAM_BUFFER_ADD(stream, ((unsigned char) c)); + return (unsigned char) c; + } + + /* Next quickest... writing and narrow oriented, but macro + * disabled and/or buffer is full. */ + if (__STDIO_STREAM_IS_NARROW_WRITING(stream) + || !__STDIO_STREAM_TRANS_TO_WRITE(stream, __FLAG_NARROW) + ) { + if (__STDIO_STREAM_IS_FAKE_VSNPRINTF(stream)) { + return (unsigned char) c; + } + + if (__STDIO_STREAM_BUFFER_SIZE(stream)) { /* Do we have a buffer? */ + /* The buffer is full and/or the stream is line buffered. */ + if (!__STDIO_STREAM_BUFFER_WAVAIL(stream) /* Buffer full? */ + && __STDIO_COMMIT_WRITE_BUFFER(stream) /* Commit failed! */ + ) { + goto BAD; + } +#ifdef __UCLIBC_MJN3_ONLY__ +#warning CONSIDER: Should we fail if the commit fails but we now have room? +#endif + + __STDIO_STREAM_BUFFER_ADD(stream, ((unsigned char) c)); + + if (__STDIO_STREAM_IS_LBF(stream)) { + if ((((unsigned char) c) == '\n') + && __STDIO_COMMIT_WRITE_BUFFER(stream)) { + /* Commit failed! */ + __STDIO_STREAM_BUFFER_UNADD(stream); /* Undo the write! */ + goto BAD; + } + } + } else { + /* NOTE: Do not try to save space by moving uc to the top of + * the file, as that dramaticly increases runtime. */ + unsigned char uc = (unsigned char) c; + if (! __stdio_WRITE(stream, &uc, 1)) { + goto BAD; + } + } + return (unsigned char) c; + } + + BAD: + return EOF; +} + +#elif defined __UCLIBC_HAS_THREADS__ + +weak_alias(fputc,putc); + +int fputc(int c, register FILE *stream) +{ + if (stream->__user_locking != 0) { + return __PUTC_UNLOCKED_MACRO(c, stream); + } else { + int retval; + __STDIO_ALWAYS_THREADLOCK(stream); + retval = __PUTC_UNLOCKED_MACRO(c, stream); + __STDIO_ALWAYS_THREADUNLOCK(stream); + return retval; + } +} + +#endif -- cgit v1.2.3