diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:01:57 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:01:57 +0000 |
| commit | cab56836b146bc129f1ad43f0393d95a9deca63a (patch) | |
| tree | 4f4e655319bbac78fca170da05275c127429b460 /libio/iogets.c | |
| parent | 04ac1241a4cd004872282c2c82ec37fa33925292 (diff) | |
| parent | 82dd75a7f436a19047325d62182590c9f9e23a78 (diff) | |
Merge branch 't/tls' into refs/top-bases/t/tls-threadvar
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 |