about summary refs log tree commit diff
path: root/locale/programs/charmap.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-05 20:49:52 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-05 20:49:52 +0000
commiteb7c2001aaece98f2d80249cb526381a57d2be1b (patch)
tree451d9522681d39b70c4d83504abb735087a9e5c5 /locale/programs/charmap.c
parent7abbb474e75d07611bbc62d32b24135027cdf48e (diff)
downloadglibc-eb7c2001aaece98f2d80249cb526381a57d2be1b.tar.gz
glibc-eb7c2001aaece98f2d80249cb526381a57d2be1b.tar.xz
glibc-eb7c2001aaece98f2d80249cb526381a57d2be1b.zip
Update.
	* io/ftw.c (process_entry): Cache object dev/inode only for
	directories (PR libc/1514).

2000-01-05  Andreas Schwab  <schwab@suse.de>

	* locale/programs/charmap.c (charmap_read): Fix typo.

2000-01-05  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/charset.c: Removed.
Diffstat (limited to 'locale/programs/charmap.c')
-rw-r--r--locale/programs/charmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 9bf0b6a1b6..66adcb89db 100644
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -94,7 +94,7 @@ charmap_read (const char *filename)
       struct dirent *dirent;
 
       dir = opendir (CHARMAP_PATH);
-      if (dir == NULL)
+      if (dir != NULL)
 	{
 	  while ((dirent = readdir (dir)) != NULL)
 	    if (strcmp (dirent->d_name, ".") != 0