X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffputs.c;h=1df0ebfa465cab4e81be1983fad5bdc5fe38ca56;hb=55cf35957bf8dec0a489ba758c02c83303a5eb50;hp=94af1ad6a9154dd88b36a4bbbdf7bb75f90c8975;hpb=566bfcc6924abd9fccbd97fa8207711e899dd0bc;p=pdclib

diff --git a/functions/stdio/fputs.c b/functions/stdio/fputs.c
index 94af1ad..1df0ebf 100644
--- a/functions/stdio/fputs.c
+++ b/functions/stdio/fputs.c
@@ -9,57 +9,62 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_glue.h>
 
 int fputs( const char * _PDCLIB_restrict s, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
 {
-    /* FIXME: This is devoid of any error checking (file writeable? r/w
-       constraints honored?)
-    */
-    /* FIXME: Proper buffering handling. */
-    char written;
-    while ( stream->bufidx < stream->bufsize )
+    if ( _PDCLIB_prepwrite( stream ) == EOF )
     {
-        written = ( stream->buffer[stream->bufidx++] = *(s++) );
-        if ( ( written == '\0' ) ||
-             ( ( stream->status & _IOLBF ) && ( written == '\n' ) ) ||
-             ( stream->status & _IONBF ) )
-        {
-            break;
-        }
+        return EOF;
     }
-    fflush( stream );
-    if ( written != '\0' )
+    while ( *s != '\0' )
     {
-        /* FIXME: For _IONBF, this recurses once per character - unacceptable. */
-        return fputs( s, stream );
+        /* Unbuffered and line buffered streams get flushed when fputs() does
+           write the terminating end-of-line. All streams get flushed if the
+           buffer runs full.
+        */
+        stream->buffer[ stream->bufidx++ ] = *s;
+        if ( ( stream->bufidx == stream->bufsize ) ||
+             ( ( stream->status & _IOLBF ) && *s == '\n' )
+           )
+        {
+            if ( _PDCLIB_flushbuffer( stream ) == EOF )
+            {
+                return EOF;
+            }
+        }
+        ++s;
     }
-    else
+    if ( stream->status & _IONBF )
     {
-        return 1;
+        if ( _PDCLIB_flushbuffer( stream ) == EOF )
+        {
+            return EOF;
+        }
     }
+    return 0;
 }
 
 #endif
-
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
-#include <string.h>
-
 int main( void )
 {
+    char const * const message = "SUCCESS testing fputs()";
     FILE * fh;
-    char buffer[100];
-    char text[] = "SUCCESS testing fputs().";
-    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( fputs( text, fh ) != EOF );
-    TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( ( fh = fopen( "testfile", "r" ) ) != NULL );
-    TESTCASE( fread( buffer, 1, strlen( text ), fh ) == strlen( text ) );
-    TESTCASE( memcmp( buffer, text, strlen( text ) ) == 0 );
+    remove( testfile );
+    TESTCASE( ( fh = fopen( testfile, "w+" ) ) != NULL );
+    TESTCASE( fputs( message, fh ) >= 0 );
+    rewind( fh );
+    for ( size_t i = 0; i < 23; ++i )
+    {
+        TESTCASE( fgetc( fh ) == message[i] );
+    }
     TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( "testfile" ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+