X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fgets.c;h=798df766c08590d1d3953667714f3331a105becb;hb=3309ec3ad8a5db735eaa2de7f5dc6a331d8e7319;hp=ac93e972585616a0cb79215b14b005ce383494f9;hpb=33515db12d3cc5e53a8bdea58d2cde299cba2267;p=pdclib.old diff --git a/functions/stdio/gets.c b/functions/stdio/gets.c index ac93e97..798df76 100644 --- a/functions/stdio/gets.c +++ b/functions/stdio/gets.c @@ -9,29 +9,28 @@ #include #ifndef REGTEST - -#define _PDCLIB_GLUE_H _PDCLIB_GLUE_H -#include <_PDCLIB_glue.h> +#include <_PDCLIB_io.h> +#include 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' ) - { - ++dest; - if ( stdin->bufidx == stdin->bufend ) - { - if ( _PDCLIB_fillbuffer( stdin ) == EOF ) - { - break; - } - } + + dest += _PDCLIB_getchars( dest, SIZE_MAX, '\n', stdin ); + _PDCLIB_funlockfile( stdin ); + + if(*(dest - 1) == '\n') { + *(--dest) = '\0'; + } else { + *dest = '\0'; } - *dest = '\0'; + return ( dest == s ) ? NULL : s; }