diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 14:28:23 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 14:28:23 +0000 |
| commit | dc3064332cec5ca6edc9a44f5f6111e506eb037b (patch) | |
| tree | 79686327822b075f3970aec7ef73372142760047 /libio/iogets.c | |
| parent | 86af500777f45066aa6a6817d4b695cf4b626c38 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/cvs/exc2signal-template' into cvs/exc2signal-template
Diffstat (limited to 'libio/iogets.c')
| -rw-r--r-- | libio/iogets.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libio/iogets.c b/libio/iogets.c index 4e2c99f843..c2223e6ecc 100644 --- a/libio/iogets.c +++ b/libio/iogets.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993-2016 Free Software Foundation, Inc. +/* Copyright (C) 1993-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ char * _IO_gets (char *buf) { - _IO_size_t count; + size_t count; int ch; char *retval; @@ -48,17 +48,17 @@ _IO_gets (char *buf) /* This is very tricky since a file descriptor may be in the non-blocking mode. The error flag doesn't mean much in this case. We return an error only when there is a new error. */ - int old_error = _IO_stdin->_IO_file_flags & _IO_ERR_SEEN; - _IO_stdin->_IO_file_flags &= ~_IO_ERR_SEEN; + int old_error = _IO_stdin->_flags & _IO_ERR_SEEN; + _IO_stdin->_flags &= ~_IO_ERR_SEEN; buf[0] = (char) ch; count = _IO_getline (_IO_stdin, buf + 1, INT_MAX, '\n', 0) + 1; - if (_IO_stdin->_IO_file_flags & _IO_ERR_SEEN) + if (_IO_stdin->_flags & _IO_ERR_SEEN) { retval = NULL; goto unlock_return; } else - _IO_stdin->_IO_file_flags |= old_error; + _IO_stdin->_flags |= old_error; } buf[count] = 0; retval = buf; @@ -67,10 +67,6 @@ unlock_return: return retval; } -#ifdef weak_alias weak_alias (_IO_gets, gets) -#endif -#ifdef _LIBC link_warning (gets, "the `gets' function is dangerous and should not be used.") -#endif |