diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-10 14:56:37 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-23 08:54:13 +0530 |
| commit | f3629a4be82a393ff56646c388da2fda0101f557 (patch) | |
| tree | 56ec81789eccffcb00f77bf7a9fccf3c98cdc242 /iconv | |
| parent | eeac390eecf7de24a110dc84e77e1190f42c5305 (diff) | |
| download | glibc-f3629a4be82a393ff56646c388da2fda0101f557.tar.gz glibc-f3629a4be82a393ff56646c388da2fda0101f557.tar.xz glibc-f3629a4be82a393ff56646c388da2fda0101f557.zip | |
Handle DT_UNKNOWN in gconv-modules.d
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>
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_parseconfdir.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h index 3d4d58d4be..e73ea0ff5c 100644 --- a/iconv/gconv_parseconfdir.h +++ b/iconv/gconv_parseconfdir.h @@ -32,6 +32,7 @@ # define readdir __readdir # define closedir __closedir # define mempcpy __mempcpy +# define lstat64 __lstat64 #endif /* 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; while ((ent = readdir (confdir)) != NULL) { - if (ent->d_type != DT_REG) + if (ent->d_type != DT_REG && ent->d_type != DT_UNKNOWN) continue; 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) { char *conf; + struct stat64 st; if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0) 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); free (conf); } |