aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-01-18 00:35:55 +0000
committerRoland McGrath <roland@gnu.org>1996-01-18 00:35:55 +0000
commitc43b8c4bea7980e6830d5ecfbc301fb5cd89dec5 (patch)
tree76f72fe704dc4b226fb0ff285b8c8802e88ea312 /sysdeps/unix
parentc59928df4dd6083a5721fc2bada6c6eb6340b74f (diff)
downloadglibc-c43b8c4bea7980e6830d5ecfbc301fb5cd89dec5.tar
glibc-c43b8c4bea7980e6830d5ecfbc301fb5cd89dec5.tar.gz
glibc-c43b8c4bea7980e6830d5ecfbc301fb5cd89dec5.tar.bz2
glibc-c43b8c4bea7980e6830d5ecfbc301fb5cd89dec5.zip
Wed Jan 17 11:04:58 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* 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.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/common/lstat.S24
-rw-r--r--sysdeps/unix/common/lxstat.c (renamed from sysdeps/unix/sysv/linux/fstat.c)23
-rw-r--r--sysdeps/unix/fstat.S24
-rw-r--r--sysdeps/unix/fxstat.c (renamed from sysdeps/unix/sysv/linux/lstat.c)24
-rw-r--r--sysdeps/unix/mkfifo.c8
-rw-r--r--sysdeps/unix/mknod.S24
-rw-r--r--sysdeps/unix/stat.S24
-rw-r--r--sysdeps/unix/sysv/linux/i386/fxstat.S4
-rw-r--r--sysdeps/unix/sysv/linux/i386/lxstat.S4
-rw-r--r--sysdeps/unix/sysv/linux/i386/xmknod.S48
-rw-r--r--sysdeps/unix/sysv/linux/i386/xstat.S48
-rw-r--r--sysdeps/unix/sysv/sysv4/i386/fstat.S37
-rw-r--r--sysdeps/unix/sysv/sysv4/i386/lstat.S37
-rw-r--r--sysdeps/unix/sysv/sysv4/i386/mknod.S36
-rw-r--r--sysdeps/unix/sysv/sysv4/i386/stat.S37
-rw-r--r--sysdeps/unix/xmknod.c (renamed from sysdeps/unix/sysv/linux/stat.c)25
-rw-r--r--sysdeps/unix/xstat.c (renamed from sysdeps/unix/sysv/linux/mknod.c)21
17 files changed, 64 insertions, 384 deletions
diff --git a/sysdeps/unix/common/lstat.S b/sysdeps/unix/common/lstat.S
deleted file mode 100644
index bc9592232f..0000000000
--- 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 <sysdep.h>
-
-SYSCALL__ (lstat, 2)
- ret
-
-weak_alias (__lstat, lstat)
diff --git a/sysdeps/unix/sysv/linux/fstat.c b/sysdeps/unix/common/lxstat.c
index e6ef27094d..499a0838ac 100644
--- a/sysdeps/unix/sysv/linux/fstat.c
+++ b/sysdeps/unix/common/lxstat.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995 Free Software Foundation, Inc.
+/* 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
@@ -16,17 +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 <errno.h>
+#include <stddef.h>
#include <sys/stat.h>
-/* 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. */
+extern int __syscall_lstat (const char *, struct stat *);
int
-__fstat (int fd, struct stat *buf)
+__lxstat (int vers, const char *file, struct stat *buf)
{
- return __fxstat (_STAT_VER, fd, buf);
-}
+ if (vers != _STAT_VER)
+ {
+ errno = EINVAL;
+ return -1;
+ }
-weak_alias (__fstat, fstat)
+ 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 cf501efe3e..0000000000
--- 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 <sysdep.h>
-
-SYSCALL__ (fstat, 2)
- ret
-
-weak_alias (__fstat, fstat)
diff --git a/sysdeps/unix/sysv/linux/lstat.c b/sysdeps/unix/fxstat.c
index 51597b8f4d..522d3fd052 100644
--- a/sysdeps/unix/sysv/linux/lstat.c
+++ b/sysdeps/unix/fxstat.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995 Free Software Foundation, Inc.
+/* 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
@@ -16,17 +17,22 @@ 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 <errno.h>
+#include <stddef.h>
#include <sys/stat.h>
-/* 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. */
+extern int __syscall_fstat (int, struct stat *);
+/* Get information about the file descriptor FD in BUF. */
int
-__lstat (const char *file, struct stat *buf)
+__fxstat (int vers, int fd, struct stat *buf)
{
- return __lxstat (_STAT_VER, file, buf);
-}
+ if (vers != _STAT_VER)
+ {
+ errno = EINVAL;
+ return -1;
+ }
-weak_alias (__lstat, lstat)
+ return __syscall_fstat (fd, buf);
+}
+weak_alias (__fxstat, _fxstat)
diff --git a/sysdeps/unix/mkfifo.c b/sysdeps/unix/mkfifo.c
index 776e981d93..4041f3a7be 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 <ansidecl.h>
#include <errno.h>
#include <stddef.h>
#include <sys/stat.h>
@@ -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 76fab52ee1..0000000000
--- 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 <sysdep.h>
-
-SYSCALL__ (mknod, 3)
- ret
-
-weak_alias (__mknod, mknod)
diff --git a/sysdeps/unix/stat.S b/sysdeps/unix/stat.S
deleted file mode 100644
index 8ffd60a464..0000000000
--- a/sysdeps/unix/stat.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 <sysdep.h>
-
-SYSCALL__ (stat, 2)
- ret
-
-weak_alias (__stat, stat)
diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.S b/sysdeps/unix/sysv/linux/i386/fxstat.S
deleted file mode 100644
index c4db088abe..0000000000
--- 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 fee635be78..0000000000
--- 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 e075e52105..0000000000
--- 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 <sysdep.h>
-#include <errnos.h>
-
- .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 b936bb5b69..0000000000
--- 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 <sysdep.h>
-#include <errnos.h>
-
- .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/sysv4/i386/fstat.S b/sysdeps/unix/sysv/sysv4/i386/fstat.S
deleted file mode 100644
index 11743b3fc3..0000000000
--- 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 <sysdep.h>
-
-/* 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 <statbuf.h>. */
-#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 52ffdbadfd..0000000000
--- 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 <sysdep.h>
-
-/* 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 <statbuf.h>. */
-#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 21f932c921..0000000000
--- 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 <sysdep.h>
-
-/* 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 3a5107c267..0000000000
--- 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 <sysdep.h>
-
-/* 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 <statbuf.h>. */
-#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/sysv/linux/stat.c b/sysdeps/unix/xmknod.c
index cfdf46f49d..81c794a435 100644
--- a/sysdeps/unix/sysv/linux/stat.c
+++ b/sysdeps/unix/xmknod.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995 Free Software Foundation, Inc.
+/* 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
@@ -16,17 +17,25 @@ 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 <errno.h>
+#include <sys/types.h>
#include <sys/stat.h>
-/* 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. */
+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
-__stat (const char *file, struct stat *buf)
+__xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
{
- return __xstat (_STAT_VER, file, buf);
+ if (vers != _MKNOD_VER)
+ {
+ errno = EINVAL;
+ return -1;
+ }
+
+ return __syscall_mknod (path, mode, *dev);
}
-weak_alias (__stat, stat)
+weak_alias (__xmknod, _xmknod)
diff --git a/sysdeps/unix/sysv/linux/mknod.c b/sysdeps/unix/xstat.c
index 38a85b9c20..3b1b112234 100644
--- a/sysdeps/unix/sysv/linux/mknod.c
+++ b/sysdeps/unix/xstat.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995, 1996 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,15 +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 <errno.h>
+#include <stddef.h>
#include <sys/stat.h>
-/* In Linux the `mknod' call is actually done by emulating a `xmknod'
- system call, which takes an additional first argument. */
+extern int __syscall_stat (const char *, struct stat *);
int
-__mknod (const char *path, mode_t mode, dev_t dev)
+__xstat (int vers, const char *file, struct stat *buf)
{
- return __xmknod (LINUX_MKNOD_VERSION, path, mode, &dev);
-}
+ if (vers != _STAT_VER)
+ {
+ errno = EINVAL;
+ return -1;
+ }
-weak_alias (__mknod, mknod)
+ return __syscall_stat (file, buf);
+}
+weak_alias (__xstat, _xstat)