diff options
| author | Matt Turner <mattst88@gmail.com> | 2020-12-21 09:09:43 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-12-21 09:09:43 -0300 |
| commit | d552058570ea2c00fb88b4621be3285cda03033f (patch) | |
| tree | 1a0e1808c551ddc443f17fc43f719cbd8a8f5231 /sysdeps/unix/sysv/linux/alpha/xstatconv.c | |
| parent | cad5ad81d2f7f58a7ad0d8afa8c1b7101a0301fb (diff) | |
| download | glibc-d552058570ea2c00fb88b4621be3285cda03033f.tar.gz glibc-d552058570ea2c00fb88b4621be3285cda03033f.tar.xz glibc-d552058570ea2c00fb88b4621be3285cda03033f.zip | |
alpha: Remove anonymous union in struct stat [BZ #27042]
This is clever, but it confuses downstream detection in at least zstd and GNOME's glib. zstd has preprocessor tests for the 'st_mtime' macro, which is not provided by the path using the anonymous union; glib checks for the presence of 'st_mtimensec' in struct stat but then tries to access that field in struct statx (which might be a bug on its own). Checked with a build for alpha-linux-gnu.
Diffstat (limited to 'sysdeps/unix/sysv/linux/alpha/xstatconv.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/xstatconv.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/xstatconv.c b/sysdeps/unix/sysv/linux/alpha/xstatconv.c index f716a10f34..43224a7f25 100644 --- a/sysdeps/unix/sysv/linux/alpha/xstatconv.c +++ b/sysdeps/unix/sysv/linux/alpha/xstatconv.c @@ -44,9 +44,9 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) buf->st_gid = kbuf->st_gid; buf->st_rdev = kbuf->st_rdev; buf->st_size = kbuf->st_size; - buf->st_atime = kbuf->st_atime; - buf->st_mtime = kbuf->st_mtime; - buf->st_ctime = kbuf->st_ctime; + buf->st_atime_sec = kbuf->st_atime_sec; + buf->st_mtime_sec = kbuf->st_mtime_sec; + buf->st_ctime_sec = kbuf->st_ctime_sec; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; buf->st_flags = kbuf->st_flags; @@ -66,9 +66,9 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) buf->st_gid = kbuf->st_gid; buf->st_rdev = kbuf->st_rdev; buf->st_size = kbuf->st_size; - buf->st_atime = kbuf->st_atime; - buf->st_mtime = kbuf->st_mtime; - buf->st_ctime = kbuf->st_ctime; + buf->st_atime_sec = kbuf->st_atime_sec; + buf->st_mtime_sec = kbuf->st_mtime_sec; + buf->st_ctime_sec = kbuf->st_ctime_sec; buf->st_blocks = kbuf->st_blocks; buf->st_blksize = kbuf->st_blksize; buf->st_flags = kbuf->st_flags; @@ -98,12 +98,12 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) buf->st_nlink = kbuf->st_nlink; buf->__pad0 = 0; - buf->st_atime = kbuf->st_atime; - buf->st_atimensec = 0; - buf->st_mtime = kbuf->st_mtime; - buf->st_mtimensec = 0; - buf->st_ctime = kbuf->st_ctime; - buf->st_ctimensec = 0; + buf->st_atim.tv_sec = kbuf->st_atime_sec; + buf->st_atim.tv_nsec = 0; + buf->st_mtim.tv_sec = kbuf->st_mtime_sec; + buf->st_mtim.tv_nsec = 0; + buf->st_ctim.tv_sec = kbuf->st_ctime_sec; + buf->st_ctim.tv_nsec = 0; buf->__glibc_reserved[0] = 0; buf->__glibc_reserved[1] = 0; |