Yet closer to functional output.

[pdclib] / functions / stdio / fputc.c

diff --git a/functions/stdio/fputc.c b/functions/stdio/fputc.c
index d17c936c365e35d1757ba91befdffd7835127e0a..e9036112297875ab33a8d4ef6dd26503cea30fc1 100644 (file)
--- a/functions/stdio/fputc.c
+++ b/functions/stdio/fputc.c
@@ -1,58 +1,57 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-int fputc( int c, FILE * stream ) { /* TODO */ };
+/* fputc( int, FILE * )
 
-/* PDPC code - unreviewed
-{
-    char buf[1];
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stdio.h>
+
+#ifndef REGTEST
 
-#ifndef __MVS__
-    stream->quickBin = 0;
-    if ((stream->upto < (stream->endbuf - 2))
-        && (stream->bufTech != _IONBF))
+/* 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.
+*/
+int fputc( int c, struct _PDCLIB_file_t * stream )
+{
+    /* FIXME: This is devoid of any error checking (file writeable? r/w
+    constraints honored?) (Text format translations?)
+    */
+    stream->buffer[stream->bufidx++] = (char)c;
+    if ( ( stream->bufidx == stream->bufsize )                   /* _IOFBF */
+           || ( ( stream->status & _IOLBF ) && ( (char)c == '\n' ) ) /* _IOLBF */
+           || ( stream->status & _IONBF )                        /* _IONBF */
+    )
     {
-        if (stream->textMode)
-        {
-            if (c == '\n')
-            {
-                if (stream->bufTech == _IOFBF)
-                {
-                    *stream->upto++ = '\r';
-                    *stream->upto++ = '\n';
-                }
-                else
-                {
-                    buf[0] = (char)c;
-                    if (fwrite(buf, 1, 1, stream) != 1)
-                    {
-                        return (EOF);
-                    }
-                }
-            }
-            else
-            {
-                *stream->upto++ = (char)c;
-            }
-        }
-        else
-        {
-            *stream->upto++ = (char)c;
-        }
+        /* buffer filled, unbuffered stream, or end-of-line. */
+        fflush( stream );
     }
     else
-#endif
     {
-        buf[0] = (char)c;
-        if (fwrite(buf, 1, 1, stream) != 1)
-        {
-            return (EOF);
-        }
+        stream->status |= _PDCLIB_WROTELAST;
     }
-    return (c);
+    return c;
 }
-*/
+
+#endif
+
+#ifdef TEST
+#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 );
+    return TEST_RESULTS;
+}
+
+#endif