aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--elf/ldconfig.c18
2 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e36925f..aec2ae5 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 99fe8a9..50b6a26 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;