From 7c3002f02a2bc5a93d1e034164871d8be951d6a9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 24 Sep 2000 16:13:15 +0000 Subject: Update. 2000-09-24 Ulrich Drepper * elf/ldconfig.c (search_dir): Make more use of d_type information. 2000-09-23 Ulrich Drepper * stdio-common/printf-parse.h (parse_one_spec): Clear spec->info.i18n. Patch by Joseph S. Myers . --- elf/ldconfig.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'elf/ldconfig.c') diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 99fe8a93d2..50b6a261f9 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; -- cgit v1.2.3