PDCLIB-16: Add _unlocked variations of all I/O routines; move work into these versions

[pdclib] / functions / stdio / fputs.c

diff --git a/functions/stdio/fputs.c b/functions/stdio/fputs.c
index 7a62d03de2ff5178b624c68b5fc0c381c407309a..0b1e3256f3d32153d88e7e18270b3ad942590fb5 100644 (file)
--- a/functions/stdio/fputs.c
+++ b/functions/stdio/fputs.c
@@ -11,7 +11,8 @@
 #ifndef REGTEST
 #include <_PDCLIB_glue.h>
 
-int fputs( const char * s, struct _PDCLIB_file_t * stream )
+int fputs_unlocked( const char * _PDCLIB_restrict s, 
+                    struct _PDCLIB_file_t * _PDCLIB_restrict stream )
 {
     if ( _PDCLIB_prepwrite( stream ) == EOF )
     {
@@ -24,9 +25,9 @@ int fputs( const char * s, struct _PDCLIB_file_t * stream )
            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 +46,24 @@ int fputs( const char * s, struct _PDCLIB_file_t * stream )
     return 0;
 }
 
+int fputs( const char * _PDCLIB_restrict s,
+           struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+{
+    flockfile( stream );
+    int r = fputs_unlocked( s, stream );
+    funlockfile( stream );
+    return r;
+}
+
 #endif
 #ifdef TEST
 #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 +71,6 @@ int main( void )
         TESTCASE( fgetc( fh ) == message[i] );
     }
     TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }