From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id F3B3838356A1; Wed, 1 Jun 2022 16:57:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F3B3838356A1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] iconv: Use 64 bit stat for gconv_parseconfdir (BZ# 29213) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: 52431199b5cef8f56c71c66f5859b097804aebe8 X-Git-Newrev: b3f935940ebcdf553b64e74fdf65dfd4858821ad Message-Id: <20220601165753.F3B3838356A1@sourceware.org> Date: Wed, 1 Jun 2022 16:57:53 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2022 16:57:54 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b3f935940ebcdf553b64e74fdf65dfd4858821ad commit b3f935940ebcdf553b64e74fdf65dfd4858821ad Author: Adhemerval Zanella Date: Tue May 31 12:51:43 2022 -0300 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: --- NEWS | 1 + iconv/gconv_parseconfdir.h | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 70e561659a..eed8a134dd 100644 --- 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 Version 2.34 diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h index a586268abc..79398a980c 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);