mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
y2038: Use a common definition for stat
Instead of replicate the same definitions from struct_stat_time64.h on the multiple struct_stat.h, use a common header which is included when required (struct_stat_time64_helper.h). The 64-bit time support is added only for LFS support. The __USE_TIME_BITS64 is not defined internally yet, although the internal header is used when building the 64-bit stat implementations. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Lukasz Majewski
Adhemerval Zanella
parent
746ef78afe
commit
4e8521333b
10 changed files with 452 additions and 375 deletions
|
|
@ -100,7 +100,8 @@ sysdep_headers += sys/mount.h sys/acct.h \
|
|||
bits/types/struct_msqid_ds.h \
|
||||
bits/types/struct_shmid_ds.h \
|
||||
bits/ipc-perm.h \
|
||||
bits/struct_stat.h
|
||||
bits/struct_stat.h \
|
||||
bits/struct_stat_time64_helper.h
|
||||
|
||||
tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
|
||||
tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@
|
|||
|
||||
struct stat
|
||||
{
|
||||
#ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
#else
|
||||
__dev_t st_dev; /* Device. */
|
||||
unsigned short int __pad1;
|
||||
# ifndef __USE_FILE_OFFSET64
|
||||
|
|
@ -80,11 +83,15 @@ struct stat
|
|||
# else
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
# endif
|
||||
#endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
struct stat64
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
__dev_t st_dev; /* Device. */
|
||||
unsigned int __pad1;
|
||||
|
||||
|
|
@ -118,6 +125,7 @@ struct stat64
|
|||
unsigned long int st_ctimensec; /* Nsecs of last status change. */
|
||||
# endif
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
66
sysdeps/unix/sysv/linux/bits/struct_stat_time64_helper.h
Normal file
66
sysdeps/unix/sysv/linux/bits/struct_stat_time64_helper.h
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
/* Definition for helper to define struct stat with 64-bit time.
|
||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library. If not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Content of internal __stat64_t64 struct. */
|
||||
__dev_t st_dev; /* Device. */
|
||||
__ino64_t st_ino; /* file serial number. */
|
||||
__mode_t st_mode; /* File mode. */
|
||||
__nlink_t st_nlink; /* Link count. */
|
||||
__uid_t st_uid; /* User ID of the file's owner. */
|
||||
__gid_t st_gid; /* Group ID of the file's group. */
|
||||
__dev_t st_rdev; /* Device number, if device. */
|
||||
__off64_t st_size; /* Size of file, in bytes. */
|
||||
__blksize_t st_blksize; /* Optimal block size for I/O. */
|
||||
__blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||||
#ifdef __USE_XOPEN2K8
|
||||
# ifndef __struct_timespec
|
||||
# define __struct_timespec struct timespec
|
||||
# endif
|
||||
/* Nanosecond resolution timestamps are stored in a format
|
||||
equivalent to 'struct timespec'. This is the type used
|
||||
whenever possible but the Unix namespace rules do not allow the
|
||||
identifier 'timespec' to appear in the <sys/stat.h> header.
|
||||
Therefore we have to handle the use of this header in strictly
|
||||
standard-compliant sources special. */
|
||||
__struct_timespec st_atim;
|
||||
__struct_timespec st_mtim;
|
||||
__struct_timespec st_ctim;
|
||||
# define st_atime st_atim.tv_sec
|
||||
# define st_mtime st_mtim.tv_sec
|
||||
# define st_ctime st_ctim.tv_sec
|
||||
# undef __struct_timespec
|
||||
#else
|
||||
/* The definition should be equal to the 'struct __timespec64' internal
|
||||
layout. */
|
||||
# if __BYTE_ORDER == __BIG_ENDIAN
|
||||
# define __fieldts64(name) \
|
||||
__time64_t name; __int32_t :32; __int32_t name ## nsec
|
||||
# else
|
||||
# define __fieldts64(name) \
|
||||
__time64_t name; __int32_t name ## nsec; __int32_t :32
|
||||
# endif
|
||||
|
||||
__fieldts64 (st_atime);
|
||||
__fieldts64 (st_mtime);
|
||||
__fieldts64 (st_ctime);
|
||||
|
||||
unsigned long int __glibc_reserved4;
|
||||
unsigned long int __glibc_reserved5;
|
||||
|
||||
# undef __fieldts64
|
||||
#endif
|
||||
|
|
@ -25,6 +25,9 @@
|
|||
|
||||
struct stat
|
||||
{
|
||||
#ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
#else
|
||||
__dev_t st_dev; /* Device. */
|
||||
unsigned short int __pad1;
|
||||
# ifndef __USE_FILE_OFFSET64
|
||||
|
|
@ -77,11 +80,15 @@ struct stat
|
|||
# else
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
# endif
|
||||
#endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
struct stat64
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
__dev_t st_dev; /* Device. */
|
||||
unsigned short int __pad1;
|
||||
|
||||
|
|
@ -115,6 +122,7 @@ struct stat64
|
|||
unsigned long int st_ctimensec; /* Nsecs of last status change. */
|
||||
# endif
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@
|
|||
#ifndef __USE_FILE_OFFSET64
|
||||
struct stat
|
||||
{
|
||||
#ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
#else
|
||||
__dev_t st_dev; /* Device. */
|
||||
__ino_t st_ino; /* File serial number. */
|
||||
__mode_t st_mode; /* File mode. */
|
||||
|
|
@ -61,6 +64,7 @@ struct stat
|
|||
# endif
|
||||
unsigned int __glibc_reserved4;
|
||||
unsigned int __glibc_reserved5;
|
||||
#endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
#else /* __USE_FILE_OFFSET64 */
|
||||
/* MS: If __USE_FILE_OFFSET64 is setup then struct stat should match stat64
|
||||
|
|
@ -70,6 +74,9 @@ struct stat
|
|||
* create one ifdef to separate stats structures. */
|
||||
struct stat
|
||||
{
|
||||
#ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
#else
|
||||
unsigned long long st_dev; /* Device. */
|
||||
__ino64_t st_ino; /* 32bit file serial number. */
|
||||
__mode_t st_mode; /* File mode. */
|
||||
|
|
@ -105,12 +112,16 @@ struct stat
|
|||
# endif
|
||||
unsigned int __glibc_reserved4;
|
||||
unsigned int __glibc_reserved5;
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
#endif /* __USE_FILE_OFFSET64 */
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
struct stat64
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
unsigned long long st_dev; /* Device. */
|
||||
__ino64_t st_ino; /* 32bit file serial number. */
|
||||
__mode_t st_mode; /* File mode. */
|
||||
|
|
@ -146,6 +157,7 @@ struct stat64
|
|||
# endif
|
||||
unsigned int __glibc_reserved4;
|
||||
unsigned int __glibc_reserved5;
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@
|
|||
/* Structure describing file characteristics. */
|
||||
struct stat
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
unsigned long int st_dev;
|
||||
long int st_pad1[3];
|
||||
# ifndef __USE_FILE_OFFSET64
|
||||
|
|
@ -79,11 +82,15 @@ struct stat
|
|||
__blkcnt64_t st_blocks; /* Number of 512-byte blocks allocated. */
|
||||
# endif
|
||||
long int st_pad5[14];
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
|
||||
# ifdef __USE_LARGEFILE64
|
||||
struct stat64
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
unsigned long int st_dev;
|
||||
long int st_pad1[3];
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
|
|
@ -116,9 +123,12 @@ struct stat64
|
|||
long int st_pad3;
|
||||
__blkcnt64_t st_blocks; /* Number of 512-byte blocks allocated. */
|
||||
long int st_pad4[14];
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
#endif
|
||||
#else
|
||||
# endif /* __USE_LARGEFILE64 */
|
||||
|
||||
#else /* _MIPS_SIM != _ABIO32 */
|
||||
|
||||
struct stat
|
||||
{
|
||||
__dev_t st_dev;
|
||||
|
|
@ -209,6 +219,7 @@ struct stat64
|
|||
int st_pad4[14];
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/* Tell code we have these members. */
|
||||
|
|
|
|||
|
|
@ -26,9 +26,11 @@
|
|||
#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
|
||||
struct stat
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
__dev_t st_dev; /* Device. */
|
||||
# ifndef __USE_FILE_OFFSET64
|
||||
unsigned short int __pad1;
|
||||
|
|
@ -77,12 +79,15 @@ struct stat
|
|||
# endif
|
||||
unsigned long int __glibc_reserved4;
|
||||
unsigned long int __glibc_reserved5;
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
|
||||
|
||||
# ifdef __USE_LARGEFILE64
|
||||
struct stat64
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
__dev_t st_dev; /* Device. */
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
__mode_t st_mode; /* File mode. */
|
||||
|
|
@ -117,6 +122,7 @@ struct stat64
|
|||
# endif
|
||||
unsigned long int __glibc_reserved4;
|
||||
unsigned long int __glibc_reserved5;
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
# endif /* __USE_LARGEFILE64 */
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,9 @@ struct stat
|
|||
#else
|
||||
struct stat
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
__dev_t st_dev; /* Device. */
|
||||
unsigned int __pad1;
|
||||
# ifndef __USE_FILE_OFFSET64
|
||||
|
|
@ -116,6 +119,7 @@ struct stat
|
|||
unsigned long int __glibc_reserved5;
|
||||
# else
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
# endif
|
||||
# endif
|
||||
};
|
||||
# endif
|
||||
|
|
@ -162,6 +166,9 @@ struct stat64
|
|||
# else
|
||||
struct stat64
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
__dev_t st_dev; /* Device. */
|
||||
unsigned int __pad1;
|
||||
|
||||
|
|
@ -198,6 +205,7 @@ struct stat64
|
|||
unsigned long int st_ctimensec; /* Nsecs of last status change. */
|
||||
# endif
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
# endif
|
||||
};
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -22,64 +22,13 @@
|
|||
#if __TIMESIZE == 64
|
||||
# define __stat64_t64 stat64
|
||||
#else
|
||||
# ifdef __USE_LARGEFILE64
|
||||
# include <endian.h>
|
||||
|
||||
/* The definition should be equal to the 'struct __timespec64' internal
|
||||
layout. */
|
||||
# if BYTE_ORDER == BIG_ENDIAN
|
||||
# define __fieldts64(name) \
|
||||
__time64_t name; __int32_t :32; __int32_t name ## nsec
|
||||
# else
|
||||
# define __fieldts64(name) \
|
||||
__time64_t name; __int32_t name ## nsec; __int32_t :32
|
||||
# endif
|
||||
|
||||
/* Workaround for the definition from struct_stat.h */
|
||||
# undef st_atime
|
||||
# undef st_mtime
|
||||
# undef st_ctime
|
||||
# include <struct___timespec64.h>
|
||||
|
||||
struct __stat64_t64
|
||||
{
|
||||
__dev_t st_dev; /* Device. */
|
||||
__ino64_t st_ino; /* file serial number. */
|
||||
__mode_t st_mode; /* File mode. */
|
||||
__nlink_t st_nlink; /* Link count. */
|
||||
__uid_t st_uid; /* User ID of the file's owner. */
|
||||
__gid_t st_gid; /* Group ID of the file's group.*/
|
||||
__dev_t st_rdev; /* Device number, if device. */
|
||||
__off64_t st_size; /* Size of file, in bytes. */
|
||||
__blksize_t st_blksize; /* Optimal block size for I/O. */
|
||||
__blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||||
# ifdef __USE_XOPEN2K8
|
||||
/* Nanosecond resolution timestamps are stored in a format
|
||||
equivalent to 'struct timespec'. This is the type used
|
||||
whenever possible but the Unix namespace rules do not allow the
|
||||
identifier 'timespec' to appear in the <sys/stat.h> header.
|
||||
Therefore we have to handle the use of this header in strictly
|
||||
standard-compliant sources special. */
|
||||
struct __timespec64 st_atim; /* Time of last access. */
|
||||
struct __timespec64 st_mtim; /* Time of last modification. */
|
||||
struct __timespec64 st_ctim; /* Time of last status change. */
|
||||
# define st_atime st_atim.tv_sec /* Backward compatibility. */
|
||||
# define st_mtime st_mtim.tv_sec
|
||||
# define st_ctime st_ctim.tv_sec
|
||||
# else
|
||||
__fieldts64 (st_atime);
|
||||
__fieldts64 (st_mtime);
|
||||
__fieldts64 (st_ctime);
|
||||
# endif /* __USE_XOPEN2K8 */
|
||||
# define __struct_timespec struct __timespec64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
};
|
||||
|
||||
# define _STATBUF_ST_BLKSIZE
|
||||
# define _STATBUF_ST_RDEV
|
||||
# define _STATBUF_ST_NSEC
|
||||
|
||||
# undef __fieldts64
|
||||
|
||||
# endif /* __USE_LARGEFILE64 */
|
||||
|
||||
#endif /* __TIMESIZE == 64 */
|
||||
|
||||
#endif /* _BITS_STRUCT_STAT_TIME64_H */
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@
|
|||
|
||||
struct stat
|
||||
{
|
||||
#ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
#else
|
||||
__dev_t st_dev; /* Device. */
|
||||
# ifndef __x86_64__
|
||||
unsigned short int __pad1;
|
||||
|
|
@ -92,12 +95,16 @@ struct stat
|
|||
__ino64_t st_ino; /* File serial number. */
|
||||
# endif
|
||||
# endif
|
||||
#endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
/* Note stat64 has the same shape as stat for x86-64. */
|
||||
struct stat64
|
||||
{
|
||||
# ifdef __USE_TIME_BITS64
|
||||
# include <bits/struct_stat_time64_helper.h>
|
||||
# else
|
||||
__dev_t st_dev; /* Device. */
|
||||
# ifdef __x86_64__
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
|
|
@ -145,6 +152,7 @@ struct stat64
|
|||
# else
|
||||
__ino64_t st_ino; /* File serial number. */
|
||||
# endif
|
||||
# endif /* __USE_TIME_BITS64 */
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue