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.

(cherry picked from commit c789e6e40974e2b67bd33a17f29b20dce6ae8822)

diff --git a/NEWS b/NEWS
index 70e561659a694ffc76a0f6a78b49fd7c4fbf7499..eed8a134dd9b334adb5fc9660754fc264b581804 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -108,6 +108,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
 
 \f
 Version 2.34

diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
index a586268abc103abd4517d53a6ae5e0bb8b09a705..79398a980cde84e3318f5d4a77c6c1cc2e8d0447 100644 (file)
--- 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);