From c84d1f2ed7bbd6926d0831a00ea80299172f65c3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 2 Oct 2002 08:33:46 +0000 Subject: [PATCH] 2002-10-02 Roland McGrath * sysdeps/unix/sysv/linux/xstatconv.c [STAT_IS_KERNEL_STAT]: Conditionalize the function definitions on this. * sysdeps/unix/sysv/linux/xstat.c (__xstat) [STAT_IS_KERNEL_STAT]: Don't use xstat_conv, just fail if VERS != _STAT_VER_KERNEL. * sysdeps/unix/sysv/linux/fxstat.c (__fxstat) [STAT_IS_KERNEL_STAT]: Likewise. * sysdeps/unix/sysv/linux/lxstat.c (__lxstat) [STAT_IS_KERNEL_STAT]: Likewise. --- sysdeps/unix/sysv/linux/fxstat.c | 11 ++++++++--- sysdeps/unix/sysv/linux/lxstat.c | 11 ++++++++--- sysdeps/unix/sysv/linux/xstat.c | 14 ++++++++++---- sysdeps/unix/sysv/linux/xstatconv.c | 11 ++++++++++- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index 78bcceb6e0..b19450598d 100644 --- a/sysdeps/unix/sysv/linux/fxstat.c +++ b/sysdeps/unix/sysv/linux/fxstat.c @@ -39,17 +39,22 @@ extern int __syscall_fstat (int, struct kernel_stat *__unbounded); int __fxstat (int vers, int fd, struct stat *buf) { - struct kernel_stat kbuf; - int result; - if (vers == _STAT_VER_KERNEL) return INLINE_SYSCALL (fstat, 2, fd, CHECK_1 ((struct kernel_stat *) buf)); +#ifdef STAT_IS_KERNEL_STAT + errno = EINVAL; + return -1; +#else + struct kernel_stat kbuf; + int result; + result = INLINE_SYSCALL (fstat, 2, fd, __ptrvalue (&kbuf)); if (result == 0) result = xstat_conv (vers, &kbuf, buf); return result; +#endif } hidden_def (__fxstat) diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c index 9de85f5699..ece1a85f30 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -39,18 +39,23 @@ extern int __syscall_lstat (const char *__unbounded, int __lxstat (int vers, const char *name, struct stat *buf) { - struct kernel_stat kbuf; - int result; - if (vers == _STAT_VER_KERNEL) return INLINE_SYSCALL (lstat, 2, CHECK_STRING (name), CHECK_1 ((struct kernel_stat *) buf)); +#ifdef STAT_IS_KERNEL_STAT + errno = EINVAL; + return -1; +#else + struct kernel_stat kbuf; + int result; + result = INLINE_SYSCALL (lstat, 2, CHECK_STRING (name), __ptrvalue (&kbuf)); if (result == 0) result = xstat_conv (vers, &kbuf, buf); return result; +#endif } hidden_def (__lxstat) diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c index 5f936388db..05e170d17c 100644 --- a/sysdeps/unix/sysv/linux/xstat.c +++ b/sysdeps/unix/sysv/linux/xstat.c @@ -33,25 +33,31 @@ #include -extern int __syscall_stat (const char *__unbounded, struct kernel_stat *__unbounded); +extern int __syscall_stat (const char *__unbounded, + struct kernel_stat *__unbounded); /* Get information about the file NAME in BUF. */ int __xstat (int vers, const char *name, struct stat *buf) { - struct kernel_stat kbuf; - int result; - if (vers == _STAT_VER_KERNEL) return INLINE_SYSCALL (stat, 2, CHECK_STRING (name), CHECK_1 ((struct kernel_stat *) buf)); +#ifdef STAT_IS_KERNEL_STAT + errno = EINVAL; + return -1; +#else + struct kernel_stat kbuf; + int result; + result = INLINE_SYSCALL (stat, 2, CHECK_STRING (name), __ptrvalue (&kbuf)); if (result == 0) result = xstat_conv (vers, &kbuf, buf); return result; +#endif } hidden_def (__xstat) weak_alias (__xstat, _xstat); diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c index 78399b0d01..d1f5e17b07 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.c +++ b/sysdeps/unix/sysv/linux/xstatconv.c @@ -1,5 +1,5 @@ /* Convert between the kernel's `struct stat' format, and libc's. - Copyright (C) 1991, 1995, 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1991,1995,1996,1997,2000,2002 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 @@ -17,6 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifdef STAT_IS_KERNEL_STAT + +/* Dummy. */ +struct kernel_stat; + +#else + #include @@ -240,3 +247,5 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf) return 0; } + +#endif -- 2.43.5