mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Update.
2000-08-11 Ulrich Drepper <drepper@redhat.com> * rt/aio_cancel.c: If canceling a specific request which is running *really* do nothing. * rt/aio_misc.h: Add `done' to states of a request. * rt/aio_misc.c: Add several tests for the correct state. Simplify request table memory handling. 2000-08-10 Jakub Jelinek <jakub@redhat.com> * dirent/scandir.c: Use it for scandir64 and old_scandir64 as well. * dirent/scandir64.c: Move... * sysdeps/generic/scandir64.c: ...here. * dirent/alphasort64.c: Move... * sysdeps/generic/alphasort64.c: ...here. * dirent/versionsort64.c: Move... * sysdeps/generic/versionsort64.c: ...here. * sysdeps/unix/sysv/linux/i386/dirent/Versions (alphasort64, getdirentries64, readdir64, readdir64_r, scandir64, versionsort64): Export symbols at GLIBC_2.2. * sysdeps/unix/sysv/linux/powerpc/dirent/Versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/dirent/Versions: Likewise. * include/dirent.h (__readdir64_r, __scandir64, __alphasort64, __versionsort64): Add prototypes. * io/Versions (__xstat64, __fxstat64, __lxstat64): Export at GLIBC_2.2. * sysdeps/unix/sysv/linux/alpha/kernel_stat.h (__xstat_conv): Remove unused prototype. * sysdeps/unix/sysv/linux/alpha/readdir.c: Export at both GLIBC_2.1 and GLIBC_2.2. * sysdeps/unix/sysv/linux/alpha/readdir_r.c: Likewise. * sysdeps/unix/sysv/linux/alpha/getdents.c: New. * sysdeps/unix/sysv/linux/alpha/getdents64.c: New. * sysdeps/unix/sysv/linux/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/bits/stat.h (struct stat, struct stat64): Adjust for kernel-2.4.0-test6 layout. * sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat64): Export at both GLIBC_2.1 and GLIBC_2.2. * sysdeps/unix/sysv/linux/i386/lxstat.c (__lxstat64): Likewise. * sysdeps/unix/sysv/linux/i386/xstat.c (__xstat64): Likewise. * sysdeps/unix/sysv/linux/i386/getdents64.c: New. * sysdeps/unix/sysv/linux/i386/olddirent.h: New. * sysdeps/unix/sysv/linux/i386/readdir64.c: New. * sysdeps/unix/sysv/linux/i386/readdir64_r.c: New. * sysdeps/unix/sysv/linux/i386/scandir64.c: New. * sysdeps/unix/sysv/linux/i386/alphasort64.c: New. * sysdeps/unix/sysv/linux/i386/versionsort64.c: New. * sysdeps/unix/sysv/linux/ia64/getdents.c: New. * sysdeps/unix/sysv/linux/ia64/getdents64.c: New. * sysdeps/unix/sysv/linux/ia64/readdir.c: Include alpha/readdir.c. * sysdeps/unix/sysv/linux/ia64/readdir_r.c: Include alpha/readdir_r.c. * sysdeps/unix/sysv/linux/mips/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h: New. * sysdeps/unix/sysv/linux/powerpc/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/powerpc/scandir64.c: New. * sysdeps/unix/sysv/linux/powerpc/getdents64.c: New. * sysdeps/unix/sysv/linux/powerpc/readdir64.c: New. * sysdeps/unix/sysv/linux/powerpc/readdir64_r.c: New. * sysdeps/unix/sysv/linux/sparc/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/sparc/bits/stat.h: New. * sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/sparc/sparc32/getdents64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/readdir64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/readdir64_r.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/scandir64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/sparc/sparc64/readdir.c: Include alpha/readdir.c. * sysdeps/unix/sysv/linux/sparc/sparc64/readdir_r.c: Include alpha/readdir_r.c * sysdeps/unix/sysv/linux/sparc/sparc64/getdents.c: New. * sysdeps/unix/sysv/linux/sparc/sparc64/getdents64.c: New. * sysdeps/unix/sysv/linux/fxstat64.c (__fxstat64): If _HAVE_STAT64___ST_INO and __st_ino != (uint32_t)st_ino, set st_ino from __st_ino. * sysdeps/unix/sysv/linux/lxstat64.c (__lxstat64): Likewise. * sysdeps/unix/sysv/linux/xstat64.c (__xstat64): Likewise. * sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv, xstat64_conv, xstat32_conv): Use _HAVE_STAT* macros. If _HAVE_STAT64___ST_INO, set __st_ino in addition to st_ino. * sysdeps/unix/sysv/linux/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/getdents.c: Use it for __getdents64 and __old_getdents64 as well. * sysdeps/unix/sysv/linux/getdirentries.c: Use it for getdirentries64 and old_getdirentries64 as well. * sysdeps/unix/sysv/linux/getdirentries64.c (GETDIRENTRIES, __GETDENTS): Define. (GETDENTS64): Remove. * sysdeps/unix/sysv/linux/getdents64.c (__GETDENTS, DIRENT_TYPE): Define. (GETDENTS64): Remove. * sysdeps/unix/sysv/linux/readdir64.c: Use sysdeps/unix/readdir.c. * sysdeps/unix/sysv/linux/readdir64_r.c: Use sysdeps/unix/readdir_r.c. * sysdeps/unix/readdir.c: Use it for readdir64 and __old_readdir64 as well. * sysdeps/unix/readdir_r.c: Use it for readdir64_r and __old_readdir64_r as well. * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_ST_INO_64_bit for kernel 2.4.1 and up. * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h: Add SI_KERNEL define.
This commit is contained in:
@ -38,7 +38,7 @@ xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
|
||||
|
||||
/* Convert to current kernel version of `struct stat'. */
|
||||
buf->st_dev = kbuf->st_dev;
|
||||
#ifdef _HAVE___PAD1
|
||||
#ifdef _HAVE_STAT___PAD1
|
||||
buf->__pad1 = 0;
|
||||
#endif
|
||||
buf->st_ino = kbuf->st_ino;
|
||||
@ -47,28 +47,28 @@ xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
|
||||
buf->st_uid = kbuf->st_uid;
|
||||
buf->st_gid = kbuf->st_gid;
|
||||
buf->st_rdev = kbuf->st_rdev;
|
||||
#ifdef _HAVE___PAD2
|
||||
#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;
|
||||
buf->st_atime = kbuf->st_atime;
|
||||
#ifdef _HAVE___UNUSED1
|
||||
#ifdef _HAVE_STAT___UNUSED1
|
||||
buf->__unused1 = 0;
|
||||
#endif
|
||||
buf->st_mtime = kbuf->st_mtime;
|
||||
#ifdef _HAVE___UNUSED2
|
||||
#ifdef _HAVE_STAT___UNUSED2
|
||||
buf->__unused2 = 0;
|
||||
#endif
|
||||
buf->st_ctime = kbuf->st_ctime;
|
||||
#ifdef _HAVE___UNUSED3
|
||||
#ifdef _HAVE_STAT___UNUSED3
|
||||
buf->__unused3 = 0;
|
||||
#endif
|
||||
#ifdef _HAVE___UNUSED4
|
||||
#ifdef _HAVE_STAT___UNUSED4
|
||||
buf->__unused4 = 0;
|
||||
#endif
|
||||
#ifdef _HAVE___UNUSED5
|
||||
#ifdef _HAVE_STAT___UNUSED5
|
||||
buf->__unused5 = 0;
|
||||
#endif
|
||||
}
|
||||
@ -96,37 +96,40 @@ xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
|
||||
|
||||
/* Convert to current kernel version of `struct stat64'. */
|
||||
buf->st_dev = kbuf->st_dev;
|
||||
#ifdef _HAVE___PAD1
|
||||
#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___PAD2
|
||||
#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;
|
||||
buf->st_atime = kbuf->st_atime;
|
||||
#ifdef _HAVE___UNUSED1
|
||||
#ifdef _HAVE_STAT64___UNUSED1
|
||||
buf->__unused1 = 0;
|
||||
#endif
|
||||
buf->st_mtime = kbuf->st_mtime;
|
||||
#ifdef _HAVE___UNUSED2
|
||||
#ifdef _HAVE_STAT64___UNUSED2
|
||||
buf->__unused2 = 0;
|
||||
#endif
|
||||
buf->st_ctime = kbuf->st_ctime;
|
||||
#ifdef _HAVE___UNUSED3
|
||||
#ifdef _HAVE_STAT64___UNUSED3
|
||||
buf->__unused3 = 0;
|
||||
#endif
|
||||
#ifdef _HAVE___UNUSED4
|
||||
#ifdef _HAVE_STAT64___UNUSED4
|
||||
buf->__unused4 = 0;
|
||||
#endif
|
||||
#ifdef _HAVE___UNUSED5
|
||||
#ifdef _HAVE_STAT64___UNUSED5
|
||||
buf->__unused5 = 0;
|
||||
#endif
|
||||
}
|
||||
@ -151,23 +154,48 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
|
||||
{
|
||||
case _STAT_VER_LINUX:
|
||||
{
|
||||
/* Convert current kernel version of `struct stat64' to `struct stat'. */
|
||||
/* Convert current kernel version of `struct stat64' to
|
||||
`struct stat'. */
|
||||
buf->st_dev = kbuf->st_dev;
|
||||
#ifdef _HAVE___PAD1
|
||||
#ifdef _HAVE_STAT___PAD1
|
||||
buf->__pad1 = 0;
|
||||
#endif
|
||||
buf->st_ino = kbuf->st_ino;
|
||||
#ifdef _HAVE_STAT64___ST_INO
|
||||
# if __ASSUME_ST_INO_64_BIT == 0
|
||||
if (kbuf->st_ino == 0)
|
||||
buf->st_ino = kbuf->__st_ino;
|
||||
else
|
||||
# endif
|
||||
{
|
||||
buf->st_ino = kbuf->st_ino;
|
||||
if (sizeof (buf->st_ino) != sizeof (kbuf->__st_ino)
|
||||
&& buf->st_ino != kbuf->st_ino)
|
||||
{
|
||||
__set_errno (EOVERFLOW);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#else
|
||||
buf->st_ino = kbuf->__st_ino;
|
||||
if (sizeof (buf->st_ino) != sizeof (kbuf->__st_ino)
|
||||
&& buf->st_ino != kbuf->st_ino)
|
||||
{
|
||||
__set_errno (EOVERFLOW);
|
||||
return -1;
|
||||
}
|
||||
#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___PAD2
|
||||
#ifdef _HAVE_STAT___PAD2
|
||||
buf->__pad2 = 0;
|
||||
#endif
|
||||
buf->st_size = kbuf->st_size;
|
||||
/* Check for overflow. */
|
||||
if (buf->st_size != kbuf->st_size)
|
||||
if (sizeof (buf->st_size) != sizeof (kbuf->st_size)
|
||||
&& buf->st_size != kbuf->st_size)
|
||||
{
|
||||
__set_errno (EOVERFLOW);
|
||||
return -1;
|
||||
@ -175,27 +203,28 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
|
||||
buf->st_blksize = kbuf->st_blksize;
|
||||
buf->st_blocks = kbuf->st_blocks;
|
||||
/* Check for overflow. */
|
||||
if (buf->st_blocks != kbuf->st_blocks)
|
||||
if (sizeof (buf->st_blocks) != sizeof (kbuf->st_blocks)
|
||||
&& buf->st_blocks != kbuf->st_blocks)
|
||||
{
|
||||
__set_errno (EOVERFLOW);
|
||||
return -1;
|
||||
}
|
||||
buf->st_atime = kbuf->st_atime;
|
||||
#ifdef _HAVE___UNUSED1
|
||||
#ifdef _HAVE_STAT___UNUSED1
|
||||
buf->__unused1 = 0;
|
||||
#endif
|
||||
buf->st_mtime = kbuf->st_mtime;
|
||||
#ifdef _HAVE___UNUSED2
|
||||
#ifdef _HAVE_STAT___UNUSED2
|
||||
buf->__unused2 = 0;
|
||||
#endif
|
||||
buf->st_ctime = kbuf->st_ctime;
|
||||
#ifdef _HAVE___UNUSED3
|
||||
#ifdef _HAVE_STAT___UNUSED3
|
||||
buf->__unused3 = 0;
|
||||
#endif
|
||||
#ifdef _HAVE___UNUSED4
|
||||
#ifdef _HAVE_STAT___UNUSED4
|
||||
buf->__unused4 = 0;
|
||||
#endif
|
||||
#ifdef _HAVE___UNUSED5
|
||||
#ifdef _HAVE_STAT___UNUSED5
|
||||
buf->__unused5 = 0;
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user