X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Fgets.c;h=2fb4cad9ea3622b9622751693416d960ce5111a4;hp=9dbc515f88cc8ae213c0be6c333160ba674d33b7;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=393020b6e48719d27699dea6b29e53025bbd5123

diff --git a/functions/stdio/gets.c b/functions/stdio/gets.c
index 9dbc515..2fb4cad 100644
--- a/functions/stdio/gets.c
+++ b/functions/stdio/gets.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* gets( char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,40 +7,63 @@
 #include <stdio.h>
 
 #ifndef REGTEST
-
-#define _PDCLIB_GLUE_H _PDCLIB_GLUE_H
-#include <_PDCLIB_glue.h>
+#include "_PDCLIB_io.h"
+#include <stdint.h>
 
 char * gets( char * s )
 {
+    _PDCLIB_flockfile( stdin );
     if ( _PDCLIB_prepread( stdin ) == EOF )
     {
+        _PDCLIB_funlockfile( stdin );
         return NULL;
     }
     char * dest = s;
-    while ( ( *dest = stdin->buffer[stdin->bufidx++] ) != '\n' )
-    {
-        if ( stdin->bufidx == stdin->bufend )
-        {
-            if ( _PDCLIB_fillbuffer( stdin ) == EOF )
-            {
-                return NULL;
-            }
-        }
-        ++dest;
+    
+    dest += _PDCLIB_getchars( dest, SIZE_MAX, '\n', stdin );
+    _PDCLIB_funlockfile( stdin );
+
+    if(*(dest - 1) == '\n') {
+        *(--dest) = '\0';
+    } else {
+        *dest = '\0';
     }
-    *dest = '\n';
-    return s;
+
+    return ( dest == s ) ? NULL : s;
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
+#include <string.h>
 
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+#ifndef REGTEST
+    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 );
+#endif
     return TEST_RESULTS;
 }