Shaun Jackman pointed out that fgets_unlocked() and friends are gnu extensions

not in newlib, and also that all the _unlocked variants are kind of pointless
in this context.
This commit is contained in:
Rob Landley 2005-10-08 02:23:22 +00:00
parent a9d8913bc7
commit 25413bfe00

View File

@ -1,18 +1,6 @@
/* Copyright (C) 2003 Manuel Novoa III /* Copyright (C) 2003 Manuel Novoa III
* *
* This library is free software; you can redistribute it and/or * Licensed under GPL v2, or later. See file LICENSE in this tarball.
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* Nov 6, 2003 Initial version. /* Nov 6, 2003 Initial version.
@ -745,7 +733,7 @@ int putgrent(const struct group *__restrict p, FILE *__restrict f)
do { do {
if (!*m) { if (!*m) {
if (fputc_unlocked('\n', f) >= 0) { if (fputc('\n', f) >= 0) {
rv = 0; rv = 0;
} }
break; break;
@ -806,7 +794,7 @@ int putspent(const struct spwd *p, FILE *stream)
goto DO_UNLOCK; goto DO_UNLOCK;
} }
if (fputc_unlocked('\n', stream) > 0) { if (fputc('\n', stream) > 0) {
rv = 0; rv = 0;
} }
@ -1067,8 +1055,8 @@ int __pgsreader(int (*__parserfunc)(void *d, char *line), void *data,
} else { } else {
skip = 0; skip = 0;
do { do {
if (!fgets_unlocked(line_buff, buflen, f)) { if (!fgets(line_buff, buflen, f)) {
if (feof_unlocked(f)) { if (feof(f)) {
rv = ENOENT; rv = ENOENT;
} }
break; break;