Merged branch stdio_rewrite back into trunk.

[pdclib] / functions / stdio / gets.c

diff --git a/functions/stdio/gets.c b/functions/stdio/gets.c
index ecba23fe51910db0be446597b51265a1ec2525dc..9dbc515f88cc8ae213c0be6c333160ba674d33b7 100644 (file)
--- a/functions/stdio/gets.c
+++ b/functions/stdio/gets.c
@@ -1,21 +1,50 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-char * gets( char * s ) { /* TODO */ };
+/* gets( char * )
 
-/* PDPC code - unreviewed
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stdio.h>
+
+#ifndef REGTEST
+
+#define _PDCLIB_GLUE_H _PDCLIB_GLUE_H
+#include <_PDCLIB_glue.h>
+
+char * gets( char * s )
 {
-    char *ret;
-
-    stdin->quickText = 0;
-    stdin->noNl = 1;
-    ret = fgets(s, INT_MAX, stdin);
-    stdin->noNl = 0;
-    stdin->quickText = 1;
-    return (ret);
+    if ( _PDCLIB_prepread( stdin ) == EOF )
+    {
+        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 = '\n';
+    return s;
 }
-*/
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    TESTCASE( NO_TESTDRIVER );
+    return TEST_RESULTS;
+}
+
+#endif
+