diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-05-31 12:51:43 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-06-01 13:23:16 -0300 |
| commit | c789e6e40974e2b67bd33a17f29b20dce6ae8822 (patch) | |
| tree | 4f6623dab712cd7510a4e1f0fed51873256cb47e /iconv | |
| parent | 634f566c3e20a8a620dbd869a0089e33c105a3ea (diff) | |
| download | glibc-c789e6e40974e2b67bd33a17f29b20dce6ae8822.tar.gz glibc-c789e6e40974e2b67bd33a17f29b20dce6ae8822.tar.xz glibc-c789e6e40974e2b67bd33a17f29b20dce6ae8822.zip | |
iconv: Use 64 bit stat for gconv_parseconfdir (BZ# 29213)
The issue is only when used within libc.so (iconvconfig already builds with _TIME_SIZE=64). This is a missing spot initially from 52a5fe70a2c77935. Checked on i686-linux-gnu.
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_parseconfdir.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h index c0de548833..debb96b322 100644 --- a/iconv/gconv_parseconfdir.h +++ b/iconv/gconv_parseconfdir.h @@ -32,8 +32,11 @@ # define readdir __readdir # define closedir __closedir # define mempcpy __mempcpy -# define lstat64 __lstat64 +# define struct_stat struct __stat64_t64 +# define lstat __lstat64_time64 # define feof_unlocked __feof_unlocked +#else +# define struct_stat struct stat #endif /* Name of the file containing the module information in the directories @@ -158,12 +161,12 @@ gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len) && strcmp (ent->d_name + len - strlen (suffix), suffix) == 0) { char *conf; - struct stat64 st; + struct_stat 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))) + || (lstat (conf, &st) != -1 && S_ISREG (st.st_mode))) found |= read_conf_file (conf, dir, dir_len); free (conf); |