diff mbox series

[8/8] iconv: Use 64 bit stat for __open_catalog (BZ# 29213)

Message ID 20220531162443.2231918-9-adhemerval.zanella@linaro.org
State Committed
Commit c789e6e40974e2b67bd33a17f29b20dce6ae8822
Headers
Series More uses of 64 bit stat internally |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Adhemerval Zanella May 31, 2022, 4:24 p.m. UTC 
  The issue is only when used within libc.so (iconvconfig already builds
with _TIME_SIZE=64).

This is a a missing spot initially done by 52a5fe70a2c77935.

Checked on i686-linux-gnu.
---
 iconv/gconv_parseconfdir.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Comments

Adhemerval Zanella May 31, 2022, 8:18 p.m. UTC | #1 
On 31/05/2022 13:24, Adhemerval Zanella wrote:
> The issue is only when used within libc.so (iconvconfig already builds
> with _TIME_SIZE=64).
> 
> This is a a missing spot initially done by 52a5fe70a2c77935.
> 
> Checked on i686-linux-gnu.

And it should be gconv_parseconfdir on title.

> ---
>  iconv/gconv_parseconfdir.h | 9 ++++++---
>  1 file 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);
diff mbox series

Patch

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);