diff options
| author |   Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-05-31 12:51:43 -0300 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2022-06-05 23:56:53 +0200 |
| commit | 5d5ad81f5e8844f595ffcc5c14d24a8470db837f (patch) | |
| tree | 9a13e283ed353e8fbc9d08f8b76a87b72860f80c | |
| parent | catgets: Use 64 bit stat for __open_catalog (BZ# 29211) (diff) | |
| download | glibc-gentoo/glibc-2.35-8.tar.gz glibc-gentoo/glibc-2.35-8.tar.bz2 glibc-gentoo/glibc-2.35-8.zip | |
iconv: Use 64 bit stat for gconv_parseconfdir (BZ# 29213)gentoo/glibc-2.35-8
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.
(cherry picked from commit c789e6e40974e2b67bd33a17f29b20dce6ae8822)
(cherry picked from commit d7d1eebd4d5806be55ffacbf18917ad68d4ae7fd)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | iconv/gconv_parseconfdir.h | 9 |
2 files changed, 7 insertions, 3 deletions
@@ -45,6 +45,7 @@ The following bugs are resolved with this release: [29209] libc: isfdtype is not y2038 aware [29210] network: ruserpass is not y2038 aware [29211] libc: __open_catalog is not y2038 aware + [29213] libc: gconv_parseconfdir is not y2038 aware Version 2.35 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); |