X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fgets.c;h=798df766c08590d1d3953667714f3331a105becb;hb=HEAD;hp=27575223581ef8fa1f8ce1b9e52740ec21cc0f5f;hpb=42e018009a78cdddd97fd18d2b6bb02d8e0fe16e;p=pdclib.old

diff --git a/functions/stdio/gets.c b/functions/stdio/gets.c
index 2757522..798df76 100644
--- a/functions/stdio/gets.c
+++ b/functions/stdio/gets.c
@@ -7,24 +7,65 @@
 */
 
 #include <stdio.h>
-#include <stdint.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
+#include <stdint.h>
 
 char * gets( char * s )
 {
-    return fgets( s, SIZE_MAX, stdin );
+    _PDCLIB_flockfile( stdin );
+    if ( _PDCLIB_prepread( stdin ) == EOF )
+    {
+        _PDCLIB_funlockfile( stdin );
+        return NULL;
+    }
+    char * dest = s;
+    
+    dest += _PDCLIB_getchars( dest, SIZE_MAX, '\n', stdin );
+    _PDCLIB_funlockfile( stdin );
+
+    if(*(dest - 1) == '\n') {
+        *(--dest) = '\0';
+    } else {
+        *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 );
+    TESTCASE( fclose( fh ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+