Testdriver for gets(). Turns out fseek() was not tested yet.

diff --git a/functions/stdio/fseek.c b/functions/stdio/fseek.c
index 9a945477445c4642291748ba17cd86cd97fe4855..1c5332d0b5832f8e49535a6bb69e8214891dab2f 100644 (file)
--- a/functions/stdio/fseek.c
+++ b/functions/stdio/fseek.c
@@ -26,7 +26,7 @@ int fseek( struct _PDCLIB_file_t * stream, long offset, int whence )
     {
         stream->status &= ~ ( _PDCLIB_FREAD | _PDCLIB_FWRITE );
     }
-    return ( _PDCLIB_seek( stream, offset, whence ) == offset ) ? 0 : EOF;
+    return ( _PDCLIB_seek( stream, offset, whence ) != EOF ) ? 0 : EOF;
 }
 
 #endif
@@ -36,7 +36,7 @@ int fseek( struct _PDCLIB_file_t * stream, long offset, int whence )
 
 int main( void )
 {
-    /* Testing covered by ftell.c */
+    TESTCASE( NO_TESTDRIVER );
     return TEST_RESULTS;
 }
 

diff --git a/functions/stdio/gets.c b/functions/stdio/gets.c
index 9dbc515f88cc8ae213c0be6c333160ba674d33b7..6cefc486f5c14ddf58ed8636b1a7116b442886c9 100644 (file)
--- a/functions/stdio/gets.c
+++ b/functions/stdio/gets.c
@@ -22,27 +22,48 @@ char * gets( char * s )
     char * dest = s;
     while ( ( *dest = stdin->buffer[stdin->bufidx++] ) != '\n' )
     {
+        ++dest;
         if ( stdin->bufidx == stdin->bufend )
         {
             if ( _PDCLIB_fillbuffer( stdin ) == EOF )
             {
-                return NULL;
+                break;
             }
         }
-        ++dest;
     }
-    *dest = '\n';
-    return s;
+    *dest = '\0';
+    return ( dest == s ) ? NULL : s;
 }
 
 #endif
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
+#include <string.h>
 
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    FILE * fh;
+    char buffer[10];
+    char const * gets_test = "foo\nbar\0baz\nweenie";
+    TESTCASE( ( fh = fopen( testfile, "wb" ) ) != NULL );
+    TESTCASE( fwrite( gets_test, 1, 18, fh ) == 18 );
+    TESTCASE( fclose( fh ) == 0 );
+    TESTCASE( ( fh = freopen( testfile, "rb", stdin ) ) != NULL );
+    TESTCASE( gets( buffer ) == buffer );
+    TESTCASE( strcmp( buffer, "foo" ) == 0 );
+    TESTCASE( gets( buffer ) == buffer );
+    TESTCASE( memcmp( buffer, "bar\0baz\0", 8 ) == 0 );
+    TESTCASE( gets( buffer ) == buffer );
+    TESTCASE( strcmp( buffer, "weenie" ) == 0 );
+    TESTCASE( feof( fh ) );
+    TESTCASE( fseek( fh, -1, SEEK_END ) == 0 );
+    TESTCASE( gets( buffer ) == buffer );
+    TESTCASE( strcmp( buffer, "e" ) == 0 );
+    TESTCASE( feof( fh ) );
+    TESTCASE( fseek( fh, 0, SEEK_END ) == 0 );
+    TESTCASE( gets( buffer ) == NULL );
+    // remove( testfile );
     return TEST_RESULTS;
 }