PDCLib includes with quotes, not <>.

[pdclib] / functions / stdio / puts.c

diff --git a/functions/stdio/puts.c b/functions/stdio/puts.c
index e28a2b8c0595fb064ecd099a6034ef8168834d08..f0c5a7bbfd9297bc6b4d3f2a0216c0036c08a969 100644 (file)
--- a/functions/stdio/puts.c
+++ b/functions/stdio/puts.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* puts( const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,11 +7,11 @@
 #include <stdio.h>
 
 #ifndef REGTEST
-#include <_PDCLIB_glue.h>
+#include "_PDCLIB_io.h"
 
 extern char * _PDCLIB_eol;
 
-int puts( const char * s )
+int _PDCLIB_puts_unlocked( const char * s )
 {
     if ( _PDCLIB_prepwrite( stdout ) == EOF )
     {
@@ -30,36 +28,45 @@ int puts( const char * s )
             }
         }
     }
-    /* FIXME: Think-o. '\n' is lineend, conversion to platform-specific
-       tales place only for text streams.
-    */
-    s = _PDCLIB_eol;
-    while ( *s != '\0' )
+    stdout->buffer[ stdout->bufidx++ ] = '\n';
+    if ( ( stdout->bufidx == stdout->bufsize ) ||
+         ( stdout->status & ( _IOLBF | _IONBF ) ) )
     {
-        stdout->buffer[ stdout->bufidx++ ] = *s++;
-        if ( stdout->bufidx == stdout->bufsize )
-        {
-            if ( _PDCLIB_flushbuffer( stdout ) == EOF )
-            {
-                return EOF;
-            }
-        }
+        return _PDCLIB_flushbuffer( stdout );
     }
-    if ( stdout->status & ( _IOLBF | _IONBF ) )
+    else
     {
-        return _PDCLIB_flushbuffer( stdout );
+        return 0;
     }
-    return 0;
+}
+
+int puts( const char * s )
+{
+    _PDCLIB_flockfile( stdout );
+    int r = _PDCLIB_puts_unlocked( s );
+    _PDCLIB_funlockfile( stdout );
+    return r;
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
-    TESTCASE( puts( "SUCCESS testing puts()" ) >= 0 );
+    FILE * fh;
+    char const * message = "SUCCESS testing puts()";
+    char buffer[23];
+    buffer[22] = 'x';
+    TESTCASE( ( fh = freopen( testfile, "wb+", stdout ) ) != NULL );
+    TESTCASE( puts( message ) >= 0 );
+    rewind( fh );
+    TESTCASE( fread( buffer, 1, 22, fh ) == 22 );
+    TESTCASE( memcmp( buffer, message, 22 ) == 0 );
+    TESTCASE( buffer[22] == 'x' );
+    TESTCASE( fclose( fh ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }