X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fgets.c;h=83a261efd6744001414b25dcf2f234afb32bccb9;hb=0e35e82c5e9a0804864839e8fc0e985b1ae41f07;hp=3529b0be466074c2550a3d68f3179c9156949d48;hpb=6b7a11e6c3af8bad3193ea70cdd43217371469b1;p=pdclib.old

diff --git a/functions/stdio/gets.c b/functions/stdio/gets.c
index 3529b0b..83a261e 100644
--- a/functions/stdio/gets.c
+++ b/functions/stdio/gets.c
@@ -7,24 +7,62 @@
 */
 
 #include <stdio.h>
-#include <limits.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
+#include <stdint.h>
 
 char * gets( char * s )
 {
-    return fgets( s, INT_MAX, stdin ); /* TODO: Replace with an unchecking call. */
+    if ( _PDCLIB_prepread( stdin ) == EOF )
+    {
+        return NULL;
+    }
+    char * dest = s;
+    
+    dest += _PDCLIB_getchars( dest, SIZE_MAX, '\n', 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
+