X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffputc.c;h=1252e6365af44533563f3d4f58bb2151a8c38507;hp=e9036112297875ab33a8d4ef6dd26503cea30fc1;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=f603f88b4456cf9b7ab1328bf657ede22a0c9940

diff --git a/functions/stdio/fputc.c b/functions/stdio/fputc.c
index e903611..1252e63 100644
--- a/functions/stdio/fputc.c
+++ b/functions/stdio/fputc.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fputc( int, FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,16 +7,18 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
 
 /* Write the value c (cast to unsigned char) to the given stream.
    Returns c if successful, EOF otherwise.
-   If a write error occurs, sets the error indicator of the stream is set.
+   If a write error occurs, the error indicator of the stream is set.
 */
-int fputc( int c, struct _PDCLIB_file_t * stream )
+int _PDCLIB_fputc_unlocked( int c, FILE * stream )
 {
-    /* FIXME: This is devoid of any error checking (file writeable? r/w
-    constraints honored?) (Text format translations?)
-    */
+    if ( _PDCLIB_prepwrite( stream ) == EOF )
+    {
+        return EOF;
+    }
     stream->buffer[stream->bufidx++] = (char)c;
     if ( ( stream->bufidx == stream->bufsize )                   /* _IOFBF */
            || ( ( stream->status & _IOLBF ) && ( (char)c == '\n' ) ) /* _IOLBF */
@@ -26,31 +26,27 @@ int fputc( int c, struct _PDCLIB_file_t * stream )
     )
     {
         /* buffer filled, unbuffered stream, or end-of-line. */
-        fflush( stream );
-    }
-    else
-    {
-        stream->status |= _PDCLIB_WROTELAST;
+        return ( _PDCLIB_flushbuffer( stream ) == 0 ) ? c : EOF;
     }
     return c;
 }
 
+int fputc( int c, FILE * stream )
+{
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_fputc_unlocked( c, stream );
+    _PDCLIB_funlockfile( stream );
+    return r;
+}
+
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
-    FILE * fh;
-    char buffer[100];
-    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( fputc( '!', fh ) == '!' );
-    TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( ( fh = fopen( "testfile", "r" ) ) != NULL );
-    TESTCASE( fread( buffer, 1, 1, fh ) == 1 );
-    TESTCASE( buffer[0] == '!' );
-    TESTCASE( fclose( fh ) == 0 );
+    /* Testing covered by ftell.c */
     return TEST_RESULTS;
 }