X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fgets.c;h=3185396f7f2cdc0bd4e59574b6ed07a92702cd24;hb=0cf5cdb61dae0e9ce894115ef69b79d8b2507d54;hp=ac93e972585616a0cb79215b14b005ce383494f9;hpb=a7a8d2f1c85c2d7760d4d3479e90466cc3a81b04;p=pdclib diff --git a/functions/stdio/gets.c b/functions/stdio/gets.c index ac93e97..3185396 100644 --- a/functions/stdio/gets.c +++ b/functions/stdio/gets.c @@ -9,9 +9,8 @@ #include #ifndef REGTEST - -#define _PDCLIB_GLUE_H _PDCLIB_GLUE_H #include <_PDCLIB_glue.h> +#include char * gets( char * s ) { @@ -20,18 +19,15 @@ char * gets( char * s ) return NULL; } char * dest = s; - while ( ( *dest = stdin->buffer[stdin->bufidx++] ) != '\n' ) - { - ++dest; - if ( stdin->bufidx == stdin->bufend ) - { - if ( _PDCLIB_fillbuffer( stdin ) == EOF ) - { - break; - } - } + + dest += _PDCLIB_getchars( dest, SIZE_MAX, '\n', stdin ); + + if(*(dest - 1) == '\n') { + *(--dest) = '\0'; + } else { + *dest = '\0'; } - *dest = '\0'; + return ( dest == s ) ? NULL : s; }