X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffputs.c;h=9bd0b5c5d6da50317412330b214d68217498f2b3;hp=3dfe2d3a0781b6dfb52371d453311035c7cbf0bb;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=526e9954c39f30819e421cb74e82aa59d5a41013

diff --git a/functions/stdio/fputs.c b/functions/stdio/fputs.c
index 3dfe2d3..9bd0b5c 100644
--- a/functions/stdio/fputs.c
+++ b/functions/stdio/fputs.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fputs( const char *, FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,9 +7,10 @@
 #include <stdio.h>
 
 #ifndef REGTEST
-#include <_PDCLIB_glue.h>
+#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 )
 {
     if ( _PDCLIB_prepwrite( stream ) == EOF )
     {
@@ -24,9 +23,9 @@ int fputs( const char * _PDCLIB_restrict s, struct _PDCLIB_file_t * _PDCLIB_rest
            buffer runs full.
         */
         stream->buffer[ stream->bufidx++ ] = *s;
-        /* TODO: Should IOLBF flush on \n, or the correct EOL sequence of the system? */
-        if ( ( stream->bufidx == stream->bufsize )
-          || ( ( stream->status & _IOLBF ) && *s == '\n' ) )
+        if ( ( stream->bufidx == stream->bufsize ) ||
+             ( ( stream->status & _IOLBF ) && *s == '\n' )
+           )
         {
             if ( _PDCLIB_flushbuffer( stream ) == EOF )
             {
@@ -45,17 +44,24 @@ int fputs( const char * _PDCLIB_restrict s, struct _PDCLIB_file_t * _PDCLIB_rest
     return 0;
 }
 
+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 "_PDCLIB_test.h"
 
 int main( void )
 {
-    char const * const testfile = "testfile";
     char const * const message = "SUCCESS testing fputs()";
     FILE * fh;
-    remove( testfile );
-    TESTCASE( ( fh = fopen( testfile, "w+" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( fputs( message, fh ) >= 0 );
     rewind( fh );
     for ( size_t i = 0; i < 23; ++i )
@@ -63,7 +69,6 @@ int main( void )
         TESTCASE( fgetc( fh ) == message[i] );
     }
     TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }