X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffputs.c;h=3565a1181e73d4978b895b9d5b9a668819109e87;hb=b5b6c4a890795ea76f9b92b817b0a83c6bb4862c;hp=748fa5aff414ed8436951c48afed57e52f9cb36b;hpb=52e702f02142dc34a476f01ca6bf8257cc9bc7e4;p=pdclib.old

diff --git a/functions/stdio/fputs.c b/functions/stdio/fputs.c
index 748fa5a..3565a11 100644
--- a/functions/stdio/fputs.c
+++ b/functions/stdio/fputs.c
@@ -9,52 +9,70 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int fputs( const char * _PDCLIB_restrict s, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+int _PDCLIB_fputs_unlocked( const char * _PDCLIB_restrict s, 
+                    FILE * _PDCLIB_restrict stream )
 {
-    /* FIXME: This is devoid of any error checking (file writeable? r/w
-       constraints honored?)
-    */
-    /* FIXME: Proper buffering handling. */
-    while ( stream->bufidx < stream->bufsize )
+    if ( _PDCLIB_prepwrite( stream ) == EOF )
     {
-        if ( ( stream->buffer[stream->bufidx++] = *(s++) ) == '\0' )
-        {
-            break;
-        }
+        return EOF;
     }
-    fflush( stream );
-    if ( *(s-1) != '\0' )
+    while ( *s != '\0' )
     {
-        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
+int fputs( const char * _PDCLIB_restrict s,
+           FILE * _PDCLIB_restrict stream )
+{
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_fputs_unlocked( s, stream );
+    _PDCLIB_funlockfile( stream );
+    return r;
+}
 
+#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 );
+    TESTCASE( ( fh = tmpfile() ) != 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 );
     return TEST_RESULTS;
 }
 
 #endif
+