mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-23 10:12:33 +03:00
646ce7e0be
kernel-features.h has a macro __ASSUME_ST_INO_64_BIT, with a comment
"However, SH is lame, and still does not have a 64-bit inode field.".
The macro is, in fact, defined to 0 by Alpha as well as SH. The Alpha
case is, however, trivially useless: none of the files that test
__ASSUME_ST_INO_64_BIT are built for Alpha (which gained kernel
support for stat64 syscalls, with a 64-bit st_ino field, in Linux
2.6.4; the define to 0 for Alpha in glibc predates that).
The SH kernel gained support for a 64-bit st_ino in struct stat64 in
commit 760bcb1deec13c50e20399c84cb6a8ea41cc2820 ("sh: Fix fstatat64()
syscall."), which is in Linux 2.6.22 and later. So the redefinition
of __ASSUME_ST_INO_64_BIT to 0 is of no use for SH either; three of
the files testing it do so immediately after a stat64-family syscall
has been used, which will always have set the 64-bit st_ino correctly
(in addition to the 32-bit __st_ino), while the relevant code
__xstat32_conv executes only after such a syscall in the function
calling __xstat32_conv.
Thus this patch removes __ASSUME_ST_INO_64_BIT and code testing it.
Removing the useless [!__ASSUME_ST_INO_64_BIT] code in __xstat32_conv
renders the [_HAVE_STAT64___ST_INO] and [!_HAVE_STAT64___ST_INO] cases
around it identical, so that conditional is also removed.
Tested compilation with build-many-glibcs.py for its Alpha and SH
configurations; also ran the glibc testsuite for x86_64 and x86.
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Remove macro definition.
* sysdeps/unix/sysv/linux/alpha/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Do not undefine and define.
* sysdeps/unix/sysv/linux/sh/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Likewise.
* sysdeps/unix/sysv/linux/fxstat64.c: Do not include
<kernel-features.h>.
(___fxstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/lxstat64.c: Do not include
<kernel-features.h>.
(___lxstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/xstat64.c: Do not include
<kernel-features.h>.
(___xstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/xstatconv.c: Do not include
<kernel-features.h>.
(__xstat32_conv) [_HAVE_STAT64___ST_INO]: Remove conditional code.
[!_HAVE_STAT64___ST_INO]: Make code unconditional.
256 lines
6.5 KiB
C
256 lines
6.5 KiB
C
/* Convert between the kernel's `struct stat' format, and libc's.
|
|
Copyright (C) 1991-2018 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sys/stat.h>
|
|
#include <kernel_stat.h>
|
|
|
|
#ifdef STAT_IS_KERNEL_STAT
|
|
|
|
/* Dummy. */
|
|
struct kernel_stat;
|
|
|
|
#else
|
|
|
|
#include <string.h>
|
|
|
|
|
|
#if XSTAT_IS_XSTAT64
|
|
int
|
|
__xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
|
|
{
|
|
switch (vers)
|
|
{
|
|
case _STAT_VER_KERNEL:
|
|
/* Nothing to do. The struct is in the form the kernel expects.
|
|
We should have short-circuted before we got here, but for
|
|
completeness... */
|
|
*(struct kernel_stat *) ubuf = *kbuf;
|
|
break;
|
|
|
|
case _STAT_VER_LINUX:
|
|
{
|
|
struct stat *buf = ubuf;
|
|
|
|
/* Convert to current kernel version of `struct stat'. */
|
|
buf->st_dev = kbuf->st_dev;
|
|
#ifdef _HAVE_STAT___PAD1
|
|
buf->__pad1 = 0;
|
|
#endif
|
|
buf->st_ino = kbuf->st_ino;
|
|
buf->st_mode = kbuf->st_mode;
|
|
buf->st_nlink = kbuf->st_nlink;
|
|
buf->st_uid = kbuf->st_uid;
|
|
buf->st_gid = kbuf->st_gid;
|
|
buf->st_rdev = kbuf->st_rdev;
|
|
#ifdef _HAVE_STAT___PAD2
|
|
buf->__pad2 = 0;
|
|
#endif
|
|
buf->st_size = kbuf->st_size;
|
|
buf->st_blksize = kbuf->st_blksize;
|
|
buf->st_blocks = kbuf->st_blocks;
|
|
#ifdef _HAVE_STAT_NSEC
|
|
buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
|
|
buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
|
|
buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
|
|
buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
|
|
buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
|
|
buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
|
|
#else
|
|
buf->st_atime = kbuf->st_atime;
|
|
buf->st_mtime = kbuf->st_mtime;
|
|
buf->st_ctime = kbuf->st_ctime;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED1
|
|
buf->__glibc_reserved1 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED2
|
|
buf->__glibc_reserved2 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED3
|
|
buf->__glibc_reserved3 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED4
|
|
buf->__glibc_reserved4 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED5
|
|
buf->__glibc_reserved5 = 0;
|
|
#endif
|
|
}
|
|
break;
|
|
|
|
default:
|
|
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
int
|
|
__xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
|
|
{
|
|
#if XSTAT_IS_XSTAT64
|
|
return __xstat_conv (vers, kbuf, ubuf);
|
|
#else
|
|
switch (vers)
|
|
{
|
|
case _STAT_VER_LINUX:
|
|
{
|
|
struct stat64 *buf = ubuf;
|
|
|
|
/* Convert to current kernel version of `struct stat64'. */
|
|
buf->st_dev = kbuf->st_dev;
|
|
#ifdef _HAVE_STAT64___PAD1
|
|
buf->__pad1 = 0;
|
|
#endif
|
|
buf->st_ino = kbuf->st_ino;
|
|
#ifdef _HAVE_STAT64___ST_INO
|
|
buf->__st_ino = kbuf->st_ino;
|
|
#endif
|
|
buf->st_mode = kbuf->st_mode;
|
|
buf->st_nlink = kbuf->st_nlink;
|
|
buf->st_uid = kbuf->st_uid;
|
|
buf->st_gid = kbuf->st_gid;
|
|
buf->st_rdev = kbuf->st_rdev;
|
|
#ifdef _HAVE_STAT64___PAD2
|
|
buf->__pad2 = 0;
|
|
#endif
|
|
buf->st_size = kbuf->st_size;
|
|
buf->st_blksize = kbuf->st_blksize;
|
|
buf->st_blocks = kbuf->st_blocks;
|
|
#ifdef _HAVE_STAT64_NSEC
|
|
buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
|
|
buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
|
|
buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
|
|
buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
|
|
buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
|
|
buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
|
|
#else
|
|
buf->st_atime = kbuf->st_atime;
|
|
buf->st_mtime = kbuf->st_mtime;
|
|
buf->st_ctime = kbuf->st_ctime;
|
|
#endif
|
|
#ifdef _HAVE_STAT64___UNUSED1
|
|
buf->__glibc_reserved1 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT64___UNUSED2
|
|
buf->__glibc_reserved2 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT64___UNUSED3
|
|
buf->__glibc_reserved3 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT64___UNUSED4
|
|
buf->__glibc_reserved4 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT64___UNUSED5
|
|
buf->__glibc_reserved5 = 0;
|
|
#endif
|
|
}
|
|
break;
|
|
|
|
/* If struct stat64 is different from struct stat then
|
|
_STAT_VER_KERNEL does not make sense. */
|
|
case _STAT_VER_KERNEL:
|
|
default:
|
|
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
|
|
}
|
|
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
int
|
|
__xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
|
|
{
|
|
switch (vers)
|
|
{
|
|
case _STAT_VER_LINUX:
|
|
{
|
|
/* Convert current kernel version of `struct stat64' to
|
|
`struct stat'. */
|
|
buf->st_dev = kbuf->st_dev;
|
|
#ifdef _HAVE_STAT___PAD1
|
|
buf->__pad1 = 0;
|
|
#endif
|
|
buf->st_ino = kbuf->st_ino;
|
|
if (sizeof (buf->st_ino) != sizeof (kbuf->st_ino)
|
|
&& buf->st_ino != kbuf->st_ino)
|
|
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW);
|
|
buf->st_mode = kbuf->st_mode;
|
|
buf->st_nlink = kbuf->st_nlink;
|
|
buf->st_uid = kbuf->st_uid;
|
|
buf->st_gid = kbuf->st_gid;
|
|
buf->st_rdev = kbuf->st_rdev;
|
|
#ifdef _HAVE_STAT___PAD2
|
|
buf->__pad2 = 0;
|
|
#endif
|
|
buf->st_size = kbuf->st_size;
|
|
/* Check for overflow. */
|
|
if (sizeof (buf->st_size) != sizeof (kbuf->st_size)
|
|
&& buf->st_size != kbuf->st_size)
|
|
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW);
|
|
buf->st_blksize = kbuf->st_blksize;
|
|
buf->st_blocks = kbuf->st_blocks;
|
|
/* Check for overflow. */
|
|
if (sizeof (buf->st_blocks) != sizeof (kbuf->st_blocks)
|
|
&& buf->st_blocks != kbuf->st_blocks)
|
|
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW);
|
|
#ifdef _HAVE_STAT_NSEC
|
|
buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
|
|
buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
|
|
buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
|
|
buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
|
|
buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
|
|
buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
|
|
#else
|
|
buf->st_atime = kbuf->st_atime;
|
|
buf->st_mtime = kbuf->st_mtime;
|
|
buf->st_ctime = kbuf->st_ctime;
|
|
#endif
|
|
|
|
#ifdef _HAVE_STAT___UNUSED1
|
|
buf->__glibc_reserved1 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED2
|
|
buf->__glibc_reserved2 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED3
|
|
buf->__glibc_reserved3 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED4
|
|
buf->__glibc_reserved4 = 0;
|
|
#endif
|
|
#ifdef _HAVE_STAT___UNUSED5
|
|
buf->__glibc_reserved5 = 0;
|
|
#endif
|
|
}
|
|
break;
|
|
|
|
/* If struct stat64 is different from struct stat then
|
|
_STAT_VER_KERNEL does not make sense. */
|
|
case _STAT_VER_KERNEL:
|
|
default:
|
|
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif
|