mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-24 14:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle DT_UNKNOWN in gconv-modules.d

Browse Source 
On filesystems that do not support dt_type, a regular file shows up as
DT_UNKNOWN.  Fall back to using lstat64 to read file properties in
such cases.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Siddhesh Poyarekar 2021-06-10 14:56:37 +05:30
parent eeac390eec
commit f3629a4be8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
iconv/gconv_parseconfdir.h
View File

@ -32,6 +32,7 @@
# define readdir __readdir # define readdir __readdir
# define closedir __closedir # define closedir __closedir
# define mempcpy __mempcpy # define mempcpy __mempcpy
# define lstat64 __lstat64
#endif #endif
/* Name of the file containing the module information in the directories /* Name of the file containing the module information in the directories
@ -138,7 +139,7 @@ gconv_parseconfdir (const char *dir, size_t dir_len)
struct dirent *ent; struct dirent *ent;
while ((ent = readdir (confdir)) != NULL) while ((ent = readdir (confdir)) != NULL)
{ {
if (ent->d_type != DT_REG) if (ent->d_type != DT_REG && ent->d_type != DT_UNKNOWN)
continue; continue;
size_t len = strlen (ent->d_name); size_t len = strlen (ent->d_name);
@ -148,8 +149,14 @@ gconv_parseconfdir (const char *dir, size_t dir_len)
&& strcmp (ent->d_name + len - strlen (suffix), suffix) == 0) && strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
{ {
char *conf; char *conf;
struct stat64 st;
if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0) if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
continue; continue;
if (ent->d_type == DT_UNKNOWN
&& (lstat64 (conf, &st) == -1
|| !S_ISREG (st.st_mode)))
continue;
found |= read_conf_file (conf, dir, dir_len); found |= read_conf_file (conf, dir, dir_len);
free (conf); free (conf);
} }