From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 24 Sep 2000 16:13:15 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/libc-2_1_95~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c3002f02a2bc5a93d1e034164871d8be951d6a9;p=thirdparty%2Fglibc.git

Update.

2000-09-24  Ulrich Drepper  <drepper@redhat.com>

	* elf/ldconfig.c (search_dir): Make more use of d_type
	information.

2000-09-23  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/printf-parse.h (parse_one_spec): Clear
	spec->info.i18n.  Patch by Joseph S. Myers <jsm28@cam.ac.uk>.
---

diff --git a/ChangeLog b/ChangeLog
index e36925fb90f..aec2ae5000c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-09-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/ldconfig.c (search_dir): Make more use of d_type
+	information.
+
+2000-09-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/printf-parse.h (parse_one_spec): Clear
+	spec->info.i18n.  Patch by Joseph S. Myers <jsm28@cam.ac.uk>.
+
 2000-09-18  Mark Kettenis  <kettenis@gnu.org>
 
 	* sysdeps/mach/hurd/bits/posix_opt.h (_POSIX_SYNCHRONIZED_IO):
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 99fe8a93d28..50b6a261f91 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -558,12 +558,18 @@ search_dir (const struct dir_entry *entry)
 		 entry->path, direntry->d_name);
 	  continue;
 	}
-      if (lstat (buf, &stat_buf))
-	{
-	  error (0, errno, _("Can't lstat %s"), buf);
-	  continue;
-	}
-      else if (S_ISDIR (stat_buf.st_mode) && is_hwcap (direntry->d_name))
+#ifdef _DIRENT_HAVE_D_TYPE
+      if (direntry->d_type != DT_UNKNOWN)
+	stat_buf.st_mode = DTTOIF (direntry->d_type);
+      else
+#endif
+	if (lstat (buf, &stat_buf))
+	  {
+	    error (0, errno, _("Can't lstat %s"), buf);
+	    continue;
+	  }
+
+      if (S_ISDIR (stat_buf.st_mode) && is_hwcap (direntry->d_name))
 	{
 	  /* Handle subdirectory also, make a recursive call.  */
 	  struct dir_entry new_entry;