2002-10-02 Roland McGrath <roland@redhat.com>
* 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.
This commit is contained in:
parent
4c53d2217e
commit
c84d1f2ed7
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -33,25 +33,31 @@
|
|||
|
||||
#include <xstatconv.c>
|
||||
|
||||
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);
|
||||
|
|
|
@ -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 <string.h>
|
||||
|
||||
|
||||
|
@ -240,3 +247,5 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue