From c43b8c4bea7980e6830d5ecfbc301fb5cd89dec5 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 18 Jan 1996 00:35:55 +0000 Subject: [PATCH] Wed Jan 17 11:04:58 1996 Roland McGrath * io/sys/stat.h (_STAT_VER, _MKNOD_VER): New macros. (__xstat, __fxstat, __lxstat, __xmknod): Declare new functions. [__GNUC__] (stat, fstat, lstat, mknod): Define these (and __ names) as `extern inline's calling the `x' functions. * io/fstat.c: New file. * io/lstat.c: New file. * io/stat.c: New file. * sysdeps/generic/lstat.c: File removed. * sysdeps/generic/lxstat.c: New file. * sysdeps/mach/hurd/fstat.c: File removed. * sysdeps/mach/hurd/fxstat.c: New file. * sysdeps/mach/hurd/lstat.c: File removed. * sysdeps/mach/hurd/lxstat.c: New file. * sysdeps/mach/hurd/mknod.c: File removed. * sysdeps/mach/hurd/stat.c: File removed. * sysdeps/mach/hurd/xmknod.c: New file. * sysdeps/mach/hurd/xstat.c: New file. * sysdeps/stub/fstat.c: File removed. * sysdeps/stub/fxstat.c: New file. * sysdeps/stub/lstat.c: File removed. * sysdeps/stub/lxstat.c: New file. * sysdeps/stub/mknod.c: File removed. * sysdeps/stub/stat.c: File removed. * sysdeps/stub/xmknod.c: New file. * sysdeps/stub/xstat.c: New file. * sysdeps/unix/common/lstat.S: File removed. * sysdeps/unix/common/lxstat.c: New file. * sysdeps/unix/fstat.S: File removed. * sysdeps/unix/fxstat.c: New file. * sysdeps/unix/mknod.S: File removed. * sysdeps/unix/stat.S: File removed. * sysdeps/unix/sysv/linux/fstat.c: File removed. * sysdeps/unix/sysv/linux/i386/fxstat.S: File removed. * sysdeps/unix/sysv/linux/i386/lxstat.S: File removed. * sysdeps/unix/sysv/linux/i386/xmknod.S: File removed. * sysdeps/unix/sysv/linux/i386/xstat.S: File removed. * sysdeps/unix/sysv/linux/lstat.c: File removed. * sysdeps/unix/sysv/linux/mknod.c: File removed. * sysdeps/unix/sysv/linux/stat.c: File removed. * sysdeps/unix/sysv/sysv4/i386/fstat.S: File removed. * sysdeps/unix/sysv/sysv4/i386/lstat.S: File removed. * sysdeps/unix/sysv/sysv4/i386/mknod.S: File removed. * sysdeps/unix/sysv/sysv4/i386/stat.S: File removed. * sysdeps/unix/xmknod.c: New file. * sysdeps/unix/xstat.c: New file. * sysdeps/unix/mkfifo.c: Use __xmknod instead of __mknod. * misc/Makefile (routines): Remove mknod. * io/sys/stat.h (_STAT_VER, _MKNOD_VER): New macros. (__xstat, __fxstat, __lxstat, __xmknod): Declare new functions. [__GNUC__] (stat, fstat, lstat, mknod): Define these (and __ names) as `extern inline's calling the `x' functions. * io/fstat.c: New file. * io/lstat.c: New file. * io/stat.c: New file. * sysdeps/generic/lstat.c: File removed. * sysdeps/generic/lxstat.c: New file. * sysdeps/mach/hurd/fstat.c: File removed. * sysdeps/mach/hurd/fxstat.c: New file. * sysdeps/mach/hurd/lstat.c: File removed. * sysdeps/mach/hurd/lxstat.c: New file. * sysdeps/mach/hurd/mknod.c: File removed. * sysdeps/mach/hurd/stat.c: File removed. * sysdeps/mach/hurd/xmknod.c: New file. * sysdeps/mach/hurd/xstat.c: New file. * sysdeps/stub/fstat.c: File removed. * sysdeps/stub/fxstat.c: New file. * sysdeps/stub/lstat.c: File removed. * sysdeps/stub/lxstat.c: New file. * sysdeps/stub/mknod.c: File removed. * sysdeps/stub/stat.c: File removed. * sysdeps/stub/xmknod.c: New file. * sysdeps/stub/xstat.c: New file. * sysdeps/unix/common/lstat.S: File removed. * sysdeps/unix/common/lxstat.c: New file. * sysdeps/unix/fstat.S: File removed. * sysdeps/unix/fxstat.c: New file. * sysdeps/unix/mknod.S: File removed. * sysdeps/unix/stat.S: File removed. * sysdeps/unix/sysv/linux/fstat.c: File removed. * sysdeps/unix/sysv/linux/i386/fxstat.S: File removed. * sysdeps/unix/sysv/linux/i386/lxstat.S: File removed. * sysdeps/unix/sysv/linux/i386/xmknod.S: File removed. * sysdeps/unix/sysv/linux/i386/xstat.S: File removed. * sysdeps/unix/sysv/linux/lstat.c: File removed. * sysdeps/unix/sysv/linux/mknod.c: File removed. * sysdeps/unix/sysv/linux/stat.c: File removed. * sysdeps/unix/sysv/sysv4/i386/fstat.S: File removed. * sysdeps/unix/sysv/sysv4/i386/lstat.S: File removed. * sysdeps/unix/sysv/sysv4/i386/mknod.S: File removed. * sysdeps/unix/sysv/sysv4/i386/stat.S: File removed. * sysdeps/unix/xmknod.c: New file. * sysdeps/unix/xstat.c: New file. * sysdeps/unix/mkfifo.c: Use __xmknod instead of __mknod. * misc/Makefile (routines): Remove mknod. * sysdeps/ieee754/ieee754.h (union ieee854_long_double.ieee_nan): Add missing ; in little-endian case. --- ChangeLog | 51 +++++++++++++++++++++++++++++++ {sysdeps/unix/sysv/linux => io}/fstat.c | 14 ++++++--- {sysdeps/unix/sysv/linux => io}/lstat.c | 14 ++++++--- {sysdeps/unix/sysv/linux => io}/stat.c | 14 ++++++--- sysdeps/{unix/stat.S => generic/lxstat.c} | 13 +++++--- sysdeps/mach/hurd/{fstat.c => fxstat.c} | 10 +++--- sysdeps/mach/hurd/{lstat.c => lxstat.c} | 14 ++++++--- sysdeps/mach/hurd/{mknod.c => xmknod.c} | 19 ++++++------ sysdeps/mach/hurd/{stat.c => xstat.c} | 14 ++++++--- sysdeps/stub/{fstat.c => fxstat.c} | 15 ++++++--- sysdeps/stub/{lstat.c => lxstat.c} | 11 +++---- sysdeps/stub/{mknod.c => xmknod.c} | 16 ++++++---- sysdeps/stub/{stat.c => xstat.c} | 9 +++--- sysdeps/unix/common/lstat.S | 24 --------------- sysdeps/unix/common/lxstat.c | 37 ++++++++++++++++++++++ sysdeps/unix/fstat.S | 24 --------------- sysdeps/unix/fxstat.c | 38 +++++++++++++++++++++++ sysdeps/unix/mkfifo.c | 8 ++--- sysdeps/unix/mknod.S | 24 --------------- sysdeps/unix/sysv/linux/i386/fxstat.S | 4 --- sysdeps/unix/sysv/linux/i386/lxstat.S | 4 --- sysdeps/unix/sysv/linux/i386/xmknod.S | 48 ----------------------------- sysdeps/unix/sysv/linux/i386/xstat.S | 48 ----------------------------- sysdeps/unix/sysv/linux/mknod.c | 30 ------------------ sysdeps/unix/sysv/sysv4/i386/fstat.S | 37 ---------------------- sysdeps/unix/sysv/sysv4/i386/lstat.S | 37 ---------------------- sysdeps/unix/sysv/sysv4/i386/mknod.S | 36 ---------------------- sysdeps/unix/sysv/sysv4/i386/stat.S | 37 ---------------------- sysdeps/unix/xmknod.c | 41 +++++++++++++++++++++++++ sysdeps/{generic/lstat.c => unix/xstat.c} | 20 +++++++----- 30 files changed, 282 insertions(+), 429 deletions(-) rename {sysdeps/unix/sysv/linux => io}/fstat.c (61%) rename {sysdeps/unix/sysv/linux => io}/lstat.c (61%) rename {sysdeps/unix/sysv/linux => io}/stat.c (61%) rename sysdeps/{unix/stat.S => generic/lxstat.c} (77%) rename sysdeps/mach/hurd/{fstat.c => fxstat.c} (83%) rename sysdeps/mach/hurd/{lstat.c => lxstat.c} (78%) rename sysdeps/mach/hurd/{mknod.c => xmknod.c} (90%) rename sysdeps/mach/hurd/{stat.c => xstat.c} (79%) rename sysdeps/stub/{fstat.c => fxstat.c} (81%) rename sysdeps/stub/{lstat.c => lxstat.c} (81%) rename sysdeps/stub/{mknod.c => xmknod.c} (80%) rename sysdeps/stub/{stat.c => xstat.c} (82%) delete mode 100644 sysdeps/unix/common/lstat.S create mode 100644 sysdeps/unix/common/lxstat.c delete mode 100644 sysdeps/unix/fstat.S create mode 100644 sysdeps/unix/fxstat.c delete mode 100644 sysdeps/unix/mknod.S delete mode 100644 sysdeps/unix/sysv/linux/i386/fxstat.S delete mode 100644 sysdeps/unix/sysv/linux/i386/lxstat.S delete mode 100644 sysdeps/unix/sysv/linux/i386/xmknod.S delete mode 100644 sysdeps/unix/sysv/linux/i386/xstat.S delete mode 100644 sysdeps/unix/sysv/linux/mknod.c delete mode 100644 sysdeps/unix/sysv/sysv4/i386/fstat.S delete mode 100644 sysdeps/unix/sysv/sysv4/i386/lstat.S delete mode 100644 sysdeps/unix/sysv/sysv4/i386/mknod.S delete mode 100644 sysdeps/unix/sysv/sysv4/i386/stat.S create mode 100644 sysdeps/unix/xmknod.c rename sysdeps/{generic/lstat.c => unix/xstat.c} (69%) diff --git a/ChangeLog b/ChangeLog index d21eca3..ec92ce9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,56 @@ Wed Jan 17 11:04:58 1996 Roland McGrath + * io/sys/stat.h (_STAT_VER, _MKNOD_VER): New macros. + (__xstat, __fxstat, __lxstat, __xmknod): Declare new functions. + [__GNUC__] (stat, fstat, lstat, mknod): Define these (and __ names) + as `extern inline's calling the `x' functions. + * io/fstat.c: New file. + * io/lstat.c: New file. + * io/stat.c: New file. + * sysdeps/generic/lstat.c: File removed. + * sysdeps/generic/lxstat.c: New file. + * sysdeps/mach/hurd/fstat.c: File removed. + * sysdeps/mach/hurd/fxstat.c: New file. + * sysdeps/mach/hurd/lstat.c: File removed. + * sysdeps/mach/hurd/lxstat.c: New file. + * sysdeps/mach/hurd/mknod.c: File removed. + * sysdeps/mach/hurd/stat.c: File removed. + * sysdeps/mach/hurd/xmknod.c: New file. + * sysdeps/mach/hurd/xstat.c: New file. + * sysdeps/stub/fstat.c: File removed. + * sysdeps/stub/fxstat.c: New file. + * sysdeps/stub/lstat.c: File removed. + * sysdeps/stub/lxstat.c: New file. + * sysdeps/stub/mknod.c: File removed. + * sysdeps/stub/stat.c: File removed. + * sysdeps/stub/xmknod.c: New file. + * sysdeps/stub/xstat.c: New file. + * sysdeps/unix/common/lstat.S: File removed. + * sysdeps/unix/common/lxstat.c: New file. + * sysdeps/unix/fstat.S: File removed. + * sysdeps/unix/fxstat.c: New file. + * sysdeps/unix/mknod.S: File removed. + * sysdeps/unix/stat.S: File removed. + * sysdeps/unix/sysv/linux/fstat.c: File removed. + * sysdeps/unix/sysv/linux/i386/fxstat.S: File removed. + * sysdeps/unix/sysv/linux/i386/lxstat.S: File removed. + * sysdeps/unix/sysv/linux/i386/xmknod.S: File removed. + * sysdeps/unix/sysv/linux/i386/xstat.S: File removed. + * sysdeps/unix/sysv/linux/lstat.c: File removed. + * sysdeps/unix/sysv/linux/mknod.c: File removed. + * sysdeps/unix/sysv/linux/stat.c: File removed. + * sysdeps/unix/sysv/sysv4/i386/fstat.S: File removed. + * sysdeps/unix/sysv/sysv4/i386/lstat.S: File removed. + * sysdeps/unix/sysv/sysv4/i386/mknod.S: File removed. + * sysdeps/unix/sysv/sysv4/i386/stat.S: File removed. + * sysdeps/unix/xmknod.c: New file. + * sysdeps/unix/xstat.c: New file. + * sysdeps/unix/mkfifo.c: Use __xmknod instead of __mknod. + * misc/Makefile (routines): Remove mknod. + + * sysdeps/ieee754/ieee754.h (union ieee854_long_double.ieee_nan): + Add missing ; in little-endian case. + * elf/dynamic-link.h [ELF_MACHINE_NO_REL] (ELF_DYNAMIC_DO_REL): Define this instead of ELF_DYNAMIC_DO_RELA. diff --git a/sysdeps/unix/sysv/linux/fstat.c b/io/fstat.c similarity index 61% rename from sysdeps/unix/sysv/linux/fstat.c rename to io/fstat.c index e6ef270..60dd2f0 100644 --- a/sysdeps/unix/sysv/linux/fstat.c +++ b/io/fstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995 Free Software Foundation, Inc. +/* Copyright (C) 1996 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 @@ -18,10 +18,14 @@ Cambridge, MA 02139, USA. */ #include -/* In Linux the `stat' call is actually done by emulating a `xstat' system - call, which takes an additional first argument giving a version number - for `struct stat'. Likewise for `fstat' and `lstat' there are `fxstat' - and `lxstat' emulations. */ +/* This definition is only used if inlining fails for this function; see + the last page of . The real work is done by the `x' + function which is passed a version number argument. We arrange in the + makefile that when not inlined this function is always statically + linked; that way a dynamically-linked executable always encodes the + version number corresponding to the data structures it uses, so the `x' + functions in the shared library can adapt without needing to recompile + all callers. */ int __fstat (int fd, struct stat *buf) diff --git a/sysdeps/unix/sysv/linux/lstat.c b/io/lstat.c similarity index 61% rename from sysdeps/unix/sysv/linux/lstat.c rename to io/lstat.c index 51597b8..f2ab6bc 100644 --- a/sysdeps/unix/sysv/linux/lstat.c +++ b/io/lstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995 Free Software Foundation, Inc. +/* Copyright (C) 1996 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 @@ -18,10 +18,14 @@ Cambridge, MA 02139, USA. */ #include -/* In Linux the `stat' call is actually done by emulating a `xstat' system - call, which takes an additional first argument giving a version number - for `struct stat'. Likewise for `fstat' and `lstat' there are `fxstat' - and `lxstat' emulations. */ +/* This definition is only used if inlining fails for this function; see + the last page of . The real work is done by the `x' + function which is passed a version number argument. We arrange in the + makefile that when not inlined this function is always statically + linked; that way a dynamically-linked executable always encodes the + version number corresponding to the data structures it uses, so the `x' + functions in the shared library can adapt without needing to recompile + all callers. */ int __lstat (const char *file, struct stat *buf) diff --git a/sysdeps/unix/sysv/linux/stat.c b/io/stat.c similarity index 61% rename from sysdeps/unix/sysv/linux/stat.c rename to io/stat.c index cfdf46f..007fdf0 100644 --- a/sysdeps/unix/sysv/linux/stat.c +++ b/io/stat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995 Free Software Foundation, Inc. +/* Copyright (C) 1996 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 @@ -18,10 +18,14 @@ Cambridge, MA 02139, USA. */ #include -/* In Linux the `stat' call is actually done by emulating a `xstat' system - call, which takes an additional first argument giving a version number - for `struct stat'. Likewise for `fstat' and `lstat' there are `fxstat' - and `lxstat' emulations. */ +/* This definition is only used if inlining fails for this function; see + the last page of . The real work is done by the `x' + function which is passed a version number argument. We arrange in the + makefile that when not inlined this function is always statically + linked; that way a dynamically-linked executable always encodes the + version number corresponding to the data structures it uses, so the `x' + functions in the shared library can adapt without needing to recompile + all callers. */ int __stat (const char *file, struct stat *buf) diff --git a/sysdeps/unix/stat.S b/sysdeps/generic/lxstat.c similarity index 77% rename from sysdeps/unix/stat.S rename to sysdeps/generic/lxstat.c index 8ffd60a..cf28fee 100644 --- a/sysdeps/unix/stat.S +++ b/sysdeps/generic/lxstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995, 1996 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 @@ -16,9 +16,12 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include -SYSCALL__ (stat, 2) - ret +int +__lxstat (int version, const char *file, struct stat *buf) +{ + return __xstat (version, file, buf); +} -weak_alias (__stat, stat) +weak_alias (__lxstat, _lxstat) diff --git a/sysdeps/mach/hurd/fstat.c b/sysdeps/mach/hurd/fxstat.c similarity index 83% rename from sysdeps/mach/hurd/fstat.c rename to sysdeps/mach/hurd/fxstat.c index 5341e3e..d228e11 100644 --- a/sysdeps/mach/hurd/fstat.c +++ b/sysdeps/mach/hurd/fxstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1993, 1994, 1995, 1996 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -25,14 +24,17 @@ Cambridge, MA 02139, USA. */ /* Get information about the file descriptor FD in BUF. */ int -DEFUN(__fstat, (fd, buf), int fd AND struct stat *buf) +__fxstat (int vers, int fd, struct stat *buf) { error_t err; + if (vers != _STAT_VER) + return __hurd_fail (EINVAL); + if (err = HURD_DPORT_USE (fd, __io_stat (port, buf))) return __hurd_dfail (fd, err); return 0; } -weak_alias (__fstat, fstat) +weak_alias (__fxstat, _fxstat) diff --git a/sysdeps/mach/hurd/lstat.c b/sysdeps/mach/hurd/lxstat.c similarity index 78% rename from sysdeps/mach/hurd/lstat.c rename to sysdeps/mach/hurd/lxstat.c index 21eb448..eb37552 100644 --- a/sysdeps/mach/hurd/lstat.c +++ b/sysdeps/mach/hurd/lxstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1993, 1994, 1995, 1996 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -24,10 +23,15 @@ Cambridge, MA 02139, USA. */ #include int -DEFUN(__lstat, (file, buf), CONST char *file AND struct stat *buf) +__lxstat (int vers, const char *file, struct stat *buf) { error_t err; - file_t port = __file_name_lookup (file, O_NOLINK, 0); + file_t port; + + if (vers != _STAT_VER) + return __hurd_fail (EINVAL); + + port = __file_name_lookup (file, O_NOLINK, 0); if (port == MACH_PORT_NULL) return -1; err = __io_stat (port, buf); @@ -37,4 +41,4 @@ DEFUN(__lstat, (file, buf), CONST char *file AND struct stat *buf) return 0; } -weak_alias (__lstat, lstat) +weak_alias (__lxstat, _lxstat) diff --git a/sysdeps/mach/hurd/mknod.c b/sysdeps/mach/hurd/xmknod.c similarity index 90% rename from sysdeps/mach/hurd/mknod.c rename to sysdeps/mach/hurd/xmknod.c index 1d82764..68fb224 100644 --- a/sysdeps/mach/hurd/mknod.c +++ b/sysdeps/mach/hurd/xmknod.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 95, 96 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -34,8 +33,7 @@ Cambridge, MA 02139, USA. */ and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ int -DEFUN(__mknod, (file_name, mode, dev), - CONST char *file_name AND mode_t mode AND dev_t dev) +__xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev) { error_t err; file_t dir, node; @@ -44,6 +42,9 @@ DEFUN(__mknod, (file_name, mode, dev), const char *translator; size_t len; + if (vers != _MKNOD_VER) + return __hurd_fail (EINVAL); + if (S_ISCHR (mode)) { translator = _HURD_CHRDEV; @@ -64,7 +65,7 @@ DEFUN(__mknod, (file_name, mode, dev), errno = EINVAL; return -1; } - + if (! S_ISFIFO (mode)) { /* We set the translator to "ifmt\0major\0minor\0", where IFMT @@ -76,14 +77,14 @@ DEFUN(__mknod, (file_name, mode, dev), bp = buf + sizeof (buf); *--bp = '\0'; - bp = _itoa (minor (dev), bp, 10, 0); + bp = _itoa (minor (*dev), bp, 10, 0); *--bp = '\0'; - bp = _itoa (major (dev), bp, 10, 0); + bp = _itoa (major (*dev), bp, 10, 0); memcpy (bp - len, translator, len); translator = bp - len; len = buf + sizeof (buf) - translator; } - + dir = __file_name_split (file_name, &name); if (dir == MACH_PORT_NULL) return -1; @@ -93,7 +94,7 @@ DEFUN(__mknod, (file_name, mode, dev), if (! err) /* Set the node's translator to make it a device. */ - err = __file_set_translator (node, + err = __file_set_translator (node, FS_TRANS_EXCL | FS_TRANS_SET, FS_TRANS_EXCL | FS_TRANS_SET, 0, translator, len, diff --git a/sysdeps/mach/hurd/stat.c b/sysdeps/mach/hurd/xstat.c similarity index 79% rename from sysdeps/mach/hurd/stat.c rename to sysdeps/mach/hurd/xstat.c index e6df5e6..b56ca38 100644 --- a/sysdeps/mach/hurd/stat.c +++ b/sysdeps/mach/hurd/xstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1993, 1994, 1995, 1996 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -24,10 +23,15 @@ Cambridge, MA 02139, USA. */ /* Get file information about FILE in BUF. */ int -DEFUN(__stat, (file, buf), CONST char *file AND struct stat *buf) +__xstat (int vers, const char *file, struct stat *buf) { error_t err; - file_t port = __file_name_lookup (file, 0, 0); + file_t port; + + if (vers != _STAT_VER) + return __hurd_fail (EINVAL); + + port = __file_name_lookup (file, 0, 0); if (port == MACH_PORT_NULL) return -1; err = __io_stat (port, buf); @@ -37,4 +41,4 @@ DEFUN(__stat, (file, buf), CONST char *file AND struct stat *buf) return 0; } -weak_alias (__stat, stat) +weak_alias (__xstat, _xstat) diff --git a/sysdeps/stub/fstat.c b/sysdeps/stub/fxstat.c similarity index 81% rename from sysdeps/stub/fstat.c rename to sysdeps/stub/fxstat.c index 49981bb..7c1eeff 100644 --- a/sysdeps/stub/fstat.c +++ b/sysdeps/stub/fxstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -16,15 +16,20 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include /* Get information about the file descriptor FD in BUF. */ int -DEFUN(__fstat, (fd, buf), int fd AND struct stat *buf) +__fxstat (int vers, int fd, struct stat *buf) { + if (vers != _STAT_VER) + { + errno = EINVAL; + return -1; + } + if (fd < 0) { errno = EBADF; @@ -39,6 +44,6 @@ DEFUN(__fstat, (fd, buf), int fd AND struct stat *buf) errno = ENOSYS; return -1; } -stub_warning (fstat) +stub_warning (__fxstat) -weak_alias (__fstat, fstat) +weak_alias (__fxstat, _fxstat) diff --git a/sysdeps/stub/lstat.c b/sysdeps/stub/lxstat.c similarity index 81% rename from sysdeps/stub/lstat.c rename to sysdeps/stub/lxstat.c index 0e69a08..5729925 100644 --- a/sysdeps/stub/lstat.c +++ b/sysdeps/stub/lxstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -24,9 +23,9 @@ Cambridge, MA 02139, USA. */ /* Get file information about FILE in BUF. If FILE is a symbolic link, do not follow it. */ int -DEFUN(__lstat, (file, buf), CONST char *file AND struct stat *buf) +__lxstat (int vers, const char *file, struct stat *buf) { - if (file == NULL || buf == NULL) + if (vers != _STAT_VER || file == NULL || buf == NULL) { errno = EINVAL; return -1; @@ -35,6 +34,6 @@ DEFUN(__lstat, (file, buf), CONST char *file AND struct stat *buf) errno = ENOSYS; return -1; } -stub_warning (lstat) +stub_warning (__lxstat) -weak_alias (__lstat, lstat) +weak_alias (__lxstat, _lxstat) diff --git a/sysdeps/stub/mknod.c b/sysdeps/stub/xmknod.c similarity index 80% rename from sysdeps/stub/mknod.c rename to sysdeps/stub/xmknod.c index 66f88aa..6d365cb 100644 --- a/sysdeps/stub/mknod.c +++ b/sysdeps/stub/xmknod.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1995, 1996 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -25,12 +24,17 @@ Cambridge, MA 02139, USA. */ and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ int -DEFUN(__mknod, (path, mode, dev), - CONST char *path AND mode_t mode AND dev_t dev) +__xmknod (int vers, const char *path, mode_t mode, dev_t *dev) { + if (vers != _MKNOD_VER) + { + errno = EINVAL; + return -1; + } + errno = ENOSYS; return -1; } -stub_warning (mknod) +stub_warning (__xmknod) -weak_alias (__mknod, mknod) +weak_alias (__xmknod, _xmknod) diff --git a/sysdeps/stub/stat.c b/sysdeps/stub/xstat.c similarity index 82% rename from sysdeps/stub/stat.c rename to sysdeps/stub/xstat.c index f24ce64..ad67aa9 100644 --- a/sysdeps/stub/stat.c +++ b/sysdeps/stub/xstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -16,16 +16,15 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include /* Get file information about FILE in BUF. */ int -DEFUN(__stat, (file, buf), CONST char *file AND struct stat *buf) +__xstat (int vers, const char *file, struct stat *buf) { - if (file == NULL || buf == NULL) + if (vers != _STAT_VER || file == NULL || buf == NULL) { errno = EINVAL; return -1; @@ -36,4 +35,4 @@ DEFUN(__stat, (file, buf), CONST char *file AND struct stat *buf) } stub_warning (stat) -weak_alias (__stat, stat) +weak_alias (__xstat, _xstat) diff --git a/sysdeps/unix/common/lstat.S b/sysdeps/unix/common/lstat.S deleted file mode 100644 index bc95922..0000000 --- a/sysdeps/unix/common/lstat.S +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (C) 1991, 1992, 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include - -SYSCALL__ (lstat, 2) - ret - -weak_alias (__lstat, lstat) diff --git a/sysdeps/unix/common/lxstat.c b/sysdeps/unix/common/lxstat.c new file mode 100644 index 0000000..499a083 --- /dev/null +++ b/sysdeps/unix/common/lxstat.c @@ -0,0 +1,37 @@ +/* lxstat using old-style Unix lstat system call. +Copyright (C) 1991, 1995, 1996 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#include +#include + +extern int __syscall_lstat (const char *, struct stat *); + +int +__lxstat (int vers, const char *file, struct stat *buf) +{ + if (vers != _STAT_VER) + { + errno = EINVAL; + return -1; + } + + return __syscall_lstat (file, buf); +} +weak_alias (__lxstat, _lxstat) diff --git a/sysdeps/unix/fstat.S b/sysdeps/unix/fstat.S deleted file mode 100644 index cf501ef..0000000 --- a/sysdeps/unix/fstat.S +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (C) 1991, 1992, 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include - -SYSCALL__ (fstat, 2) - ret - -weak_alias (__fstat, fstat) diff --git a/sysdeps/unix/fxstat.c b/sysdeps/unix/fxstat.c new file mode 100644 index 0000000..522d3fd --- /dev/null +++ b/sysdeps/unix/fxstat.c @@ -0,0 +1,38 @@ +/* fxstat using old-style Unix fstat system call. +Copyright (C) 1991, 1995, 1996 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#include +#include + +extern int __syscall_fstat (int, struct stat *); + +/* Get information about the file descriptor FD in BUF. */ +int +__fxstat (int vers, int fd, struct stat *buf) +{ + if (vers != _STAT_VER) + { + errno = EINVAL; + return -1; + } + + return __syscall_fstat (fd, buf); +} +weak_alias (__fxstat, _fxstat) diff --git a/sysdeps/unix/mkfifo.c b/sysdeps/unix/mkfifo.c index 776e981..4041f3a 100644 --- a/sysdeps/unix/mkfifo.c +++ b/sysdeps/unix/mkfifo.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996 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 @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with the GNU C Library; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -23,7 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Create a named pipe (FIFO) named PATH with protections MODE. */ int -DEFUN(mkfifo, (path, mode), CONST char *path AND mode_t mode) +mkfifo (const char *path, mode_t mode) { - return __mknod (path, mode | S_IFIFO, 0); + dev_t dev = 0; + return __xmknod (_MKNOD_VER, path, mode | S_IFIFO, &dev); } diff --git a/sysdeps/unix/mknod.S b/sysdeps/unix/mknod.S deleted file mode 100644 index 76fab52..0000000 --- a/sysdeps/unix/mknod.S +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (C) 1991, 1992, 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include - -SYSCALL__ (mknod, 3) - ret - -weak_alias (__mknod, mknod) diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.S b/sysdeps/unix/sysv/linux/i386/fxstat.S deleted file mode 100644 index c4db088..0000000 --- a/sysdeps/unix/sysv/linux/i386/fxstat.S +++ /dev/null @@ -1,4 +0,0 @@ -#define __xstat __fxstat -#define _xstat _fxstat -#define stat fstat -#include "xstat.S" diff --git a/sysdeps/unix/sysv/linux/i386/lxstat.S b/sysdeps/unix/sysv/linux/i386/lxstat.S deleted file mode 100644 index fee635b..0000000 --- a/sysdeps/unix/sysv/linux/i386/lxstat.S +++ /dev/null @@ -1,4 +0,0 @@ -#define __xstat __lxstat -#define _xstat _lxstat -#define stat lstat -#include "xstat.S" diff --git a/sysdeps/unix/sysv/linux/i386/xmknod.S b/sysdeps/unix/sysv/linux/i386/xmknod.S deleted file mode 100644 index e075e52..0000000 --- a/sysdeps/unix/sysv/linux/i386/xmknod.S +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include -#include - - .text - SYSCALL_ERROR_HANDLER /* Error handler for PIC. */ -ENTRY (__xmknod) - popl %ecx /* Pop return address into %eax. */ - popl %edx /* Pop version number into %edx. */ - pushl %ecx /* Push back the return address. */ - - cmpl $1, %edx /* Version 1 xstat call? */ - je .L1 /* Yes, do syscall. */ - - movl $-EINVAL, %eax /* Load error code into %eax. */ - jmp .L2 - -.L1: DO_CALL (3, mknod) /* Do the syscall. */ - - movl (%esp), %ecx - testl %eax, %eax /* Check for error. */ - jl .L2 - - jmp *%ecx /* Return success. */ - -.L2: pushl %ecx - jmp syscall_error - /* Yes, then branch to error handling. */ - -/* For compatibility with Linux libc. */ -weak_alias (__xmknod, _xmknod) diff --git a/sysdeps/unix/sysv/linux/i386/xstat.S b/sysdeps/unix/sysv/linux/i386/xstat.S deleted file mode 100644 index b936bb5..0000000 --- a/sysdeps/unix/sysv/linux/i386/xstat.S +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include -#include - - .text - SYSCALL_ERROR_HANDLER /* Error handler for PIC. */ -ENTRY (__xstat) - popl %ecx /* Pop return address into %eax. */ - popl %edx /* Pop version number into %edx. */ - pushl %ecx /* Push back the return address. */ - - cmpl $1, %edx /* Version 1 xstat call? */ - je .L1 /* Yes, do syscall. */ - - movl $-EINVAL, %eax /* Load error code into %eax. */ - jmp .L2 - -.L1: DO_CALL (2, stat) /* Do the syscall. */ - - movl (%esp), %ecx - testl %eax, %eax /* Check for error. */ - jl .L2 - - jmp *%ecx /* Return success. */ - -.L2: pushl %ecx - jmp syscall_error - /* Yes, then branch to error handling. */ - -/* For compatibility with Linux libc. */ -weak_alias (__xstat, _xstat) diff --git a/sysdeps/unix/sysv/linux/mknod.c b/sysdeps/unix/sysv/linux/mknod.c deleted file mode 100644 index 38a85b9..0000000 --- a/sysdeps/unix/sysv/linux/mknod.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 1995, 1996 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include - -/* In Linux the `mknod' call is actually done by emulating a `xmknod' - system call, which takes an additional first argument. */ - -int -__mknod (const char *path, mode_t mode, dev_t dev) -{ - return __xmknod (LINUX_MKNOD_VERSION, path, mode, &dev); -} - -weak_alias (__mknod, mknod) diff --git a/sysdeps/unix/sysv/sysv4/i386/fstat.S b/sysdeps/unix/sysv/sysv4/i386/fstat.S deleted file mode 100644 index 11743b3..0000000 --- a/sysdeps/unix/sysv/sysv4/i386/fstat.S +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 1994, 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include - -/* In SVR4 the `stat' call is actually done by the `xstat' system call, - which takes an additional first argument giving a version number for - `struct stat'. Likewise for `fstat' and `lstat' there are `fxstat' and - `lxstat' system calls. This macro gives the SVR4 version number that - corresponds to the definition of `struct stat' in . */ -#define _STAT_VER 2 - -.globl syscall_error -ENTRY (__fstat) - popl %eax /* Pop return address into %eax. */ - pushl $_STAT_VER /* Push extra first arg to syscall. */ - pushl %eax /* Push back the return address. */ - DO_CALL (fxstat, 3) /* Do the syscall. */ - jb syscall_error /* Check for error. */ - ret /* Return success. */ - -weak_alias (__fstat, fstat) diff --git a/sysdeps/unix/sysv/sysv4/i386/lstat.S b/sysdeps/unix/sysv/sysv4/i386/lstat.S deleted file mode 100644 index 52ffdba..0000000 --- a/sysdeps/unix/sysv/sysv4/i386/lstat.S +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 1994, 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include - -/* In SVR4 the `stat' call is actually done by the `xstat' system call, - which takes an additional first argument giving a version number for - `struct stat'. Likewise for `fstat' and `lstat' there are `fxstat' and - `lxstat' system calls. This macro gives the SVR4 version number that - corresponds to the definition of `struct stat' in . */ -#define _STAT_VER 2 - -.globl syscall_error -ENTRY (__lstat) - popl %eax /* Pop return address into %eax. */ - pushl $_STAT_VER /* Push extra first arg to syscall. */ - pushl %eax /* Push back the return address. */ - DO_CALL (lxstat, 3) /* Do the syscall. */ - jb syscall_error /* Check for error. */ - ret /* Return success. */ - -weak_alias (__lstat, lstat) diff --git a/sysdeps/unix/sysv/sysv4/i386/mknod.S b/sysdeps/unix/sysv/sysv4/i386/mknod.S deleted file mode 100644 index 21f932c..0000000 --- a/sysdeps/unix/sysv/sysv4/i386/mknod.S +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (C) 1994, 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include - -/* In SVR4 the `mknod' call is actually done by the `xmknod' system call, - which takes an additional first argument giving a version number for - the interface. This macro gives the SVR4 version number that - corresponds to the modern interface. */ -#define _MKNOD_VER 2 - -.globl syscall_error -ENTRY (__mknod) - popl %eax /* Pop return address into %eax. */ - pushl $_MKNOD_VER /* Push extra first arg to syscall. */ - pushl %eax /* Push back the return address. */ - DO_CALL (xmknod, 3) /* Do the syscall. */ - jb syscall_error /* Check for error. */ - ret /* Return success. */ - -weak_alias (__mknod, mknod) diff --git a/sysdeps/unix/sysv/sysv4/i386/stat.S b/sysdeps/unix/sysv/sysv4/i386/stat.S deleted file mode 100644 index 3a5107c..0000000 --- a/sysdeps/unix/sysv/sysv4/i386/stat.S +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 1994, 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include - -/* In SVR4 the `stat' call is actually done by the `xstat' system call, - which takes an additional first argument giving a version number for - `struct stat'. Likewise for `fstat' and `lstat' there are `fxstat' and - `lxstat' system calls. This macro gives the SVR4 version number that - corresponds to the definition of `struct stat' in . */ -#define _STAT_VER 2 - -.globl syscall_error -ENTRY (__stat) - popl %eax /* Pop return address into %eax. */ - pushl $_STAT_VER /* Push extra first arg to syscall. */ - pushl %eax /* Push back the return address. */ - DO_CALL (xstat, 3) /* Do the syscall. */ - jb syscall_error /* Check for error. */ - ret /* Return success. */ - -weak_alias (__stat, stat) diff --git a/sysdeps/unix/xmknod.c b/sysdeps/unix/xmknod.c new file mode 100644 index 0000000..81c794a --- /dev/null +++ b/sysdeps/unix/xmknod.c @@ -0,0 +1,41 @@ +/* xmknod call using old-style Unix mknod system call. +Copyright (C) 1991, 1993, 1995, 1996 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#include +#include + +extern int __syscall_mknod (const char *, mode_t, dev_t); + +/* Create a device file named PATH, with permission and special bits MODE + and device number DEV (which can be constructed from major and minor + device numbers with the `makedev' macro above). */ +int +__xmknod (int vers, const char *path, mode_t mode, dev_t *dev) +{ + if (vers != _MKNOD_VER) + { + errno = EINVAL; + return -1; + } + + return __syscall_mknod (path, mode, *dev); +} + +weak_alias (__xmknod, _xmknod) diff --git a/sysdeps/generic/lstat.c b/sysdeps/unix/xstat.c similarity index 69% rename from sysdeps/generic/lstat.c rename to sysdeps/unix/xstat.c index 44fafa6..3b1b112 100644 --- a/sysdeps/generic/lstat.c +++ b/sysdeps/unix/xstat.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc. +/* xstat using old-style Unix stat system call. +Copyright (C) 1991, 1995, 1996 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 @@ -16,16 +17,21 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include +extern int __syscall_stat (const char *, struct stat *); + int -DEFUN(__lstat, (file, buf), - CONST char *file AND struct stat *buf) +__xstat (int vers, const char *file, struct stat *buf) { - return __stat (file, buf); -} + if (vers != _STAT_VER) + { + errno = EINVAL; + return -1; + } -weak_alias (__lstat, lstat) + return __syscall_stat (file, buf); +} +weak_alias (__xstat, _xstat) -- 2.7.4