aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--nss/nss_files/files-alias.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ca38ec3..5af9c0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-08-20 Ulrich Drepper <drepper@gmail.com>
+ * nss/nss_files/files-alias.c (get_next_alias): Use feof_unlocked.
+
* elf/dl-open.c (add_to_global): Report additions to the global scope
for LD_DEBUG=scopes.
(dl_open_worker): Also print scope of newly loaded dependencies.
diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c
index 57cc982..0a722b9 100644
--- a/nss/nss_files/files-alias.c
+++ b/nss/nss_files/files-alias.c
@@ -1,5 +1,5 @@
/* Mail alias file parser in nss_files module.
- Copyright (C) 1996,97,98,99,2002,2006,2007 Free Software Foundation, Inc.
+ Copyright (C) 1996-1999,2002,2006,2007,2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -166,7 +166,7 @@ get_next_alias (const char *match, struct aliasent *result,
char *line;
/* Check whether the buffer is large enough for even trying to
- read something. */
+ read something. */
if (room_left < 2)
goto no_more_room;
@@ -264,7 +264,7 @@ get_next_alias (const char *match, struct aliasent *result,
if (listfile != NULL
&& (old_line = strdup (line)) != NULL)
{
- while (! feof (listfile))
+ while (! feof_unlocked (listfile))
{
first_unused[room_left - 1] = '\xff';
line = fgets_unlocked (first_unused, room_left,