X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fgets.c;h=798df766c08590d1d3953667714f3331a105becb;hb=072f30583aa781ac40faeff08500f0dadf7cf1de;hp=9bf3a2694916d66a278a2a1e64135f1cd25a2427;hpb=b41576197133c1211d6ec353faf93f505f573b8a;p=pdclib diff --git a/functions/stdio/gets.c b/functions/stdio/gets.c index 9bf3a26..798df76 100644 --- a/functions/stdio/gets.c +++ b/functions/stdio/gets.c @@ -9,27 +9,28 @@ #include #ifndef REGTEST -#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; }