From b1c74afa76019a45c7de3a9eab3144bc0d1fce58 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 27 Sep 2003 17:02:41 +0000 Subject: Update. 2003-09-27 Ulrich Drepper * sysdeps/unix/sysv/linux/ustat.c (ustat): Set errno to EINVAL if the device ID is invalid and return -1. * sysdeps/unix/sysv/linux/xmknod.c (__xmknod): Likewise. --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/ustat.c | 5 ++++- sysdeps/unix/sysv/linux/xmknod.c | 5 ++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f248410..0414cfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-27 Ulrich Drepper + + * sysdeps/unix/sysv/linux/ustat.c (ustat): Set errno to EINVAL if + the device ID is invalid and return -1. + * sysdeps/unix/sysv/linux/xmknod.c (__xmknod): Likewise. + 2003-09-26 Andreas Schwab * sysdeps/unix/sysv/linux/ia64/getcontext.S: Pass fourth argument to diff --git a/sysdeps/unix/sysv/linux/ustat.c b/sysdeps/unix/sysv/linux/ustat.c index e1acbed..6ac30d8 100644 --- a/sysdeps/unix/sysv/linux/ustat.c +++ b/sysdeps/unix/sysv/linux/ustat.c @@ -33,7 +33,10 @@ ustat (dev_t dev, struct ustat *ubuf) /* We must convert the value to dev_t type used by the kernel. */ k_dev = dev & ((1ULL << 32) - 1); if (k_dev != dev) - return EOVERFLOW; + { + __set_errno (EINVAL); + return -1; + } return INLINE_SYSCALL (ustat, 2, (unsigned int) k_dev, CHECK_1 (ubuf)); } diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c index 4c5b1f4..38d902e 100644 --- a/sysdeps/unix/sysv/linux/xmknod.c +++ b/sysdeps/unix/sysv/linux/xmknod.c @@ -44,7 +44,10 @@ __xmknod (int vers, const char *path, mode_t mode, dev_t *dev) /* We must convert the value to dev_t type used by the kernel. */ k_dev = (*dev) & ((1ULL << 32) - 1); if (k_dev != *dev) - return EOVERFLOW; + { + __set_errno (EINVAL); + return -1; + } return INLINE_SYSCALL (mknod, 3, CHECK_STRING (path), mode, (unsigned int) k_dev); -- cgit v1.1