diff options
author | Jakub Jelinek <jakub@redhat.com> | 2005-11-16 08:40:33 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2005-11-16 08:40:33 +0000 |
commit | b9616a4d2d0ff113b95a638127ad27c98e6c713b (patch) | |
tree | 44a217d883df77585469066a882b4eb96a1aef19 /sysdeps/unix/sysv/linux/i386 | |
parent | 7af1fc8277a5c9f20739e9c0b55ae727c3771e1a (diff) |
Updated to fedora-glibc-20051116T0829cvs/fedora-glibc-2_3_90-17
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386')
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/fchownat.c | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/fxstatat.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/fchownat.c b/sysdeps/unix/sysv/linux/i386/fchownat.c index 331623f73d..eb74fad8e0 100644 --- a/sysdeps/unix/sysv/linux/i386/fchownat.c +++ b/sysdeps/unix/sysv/linux/i386/fchownat.c @@ -19,6 +19,7 @@ #include <errno.h> #include <fcntl.h> #include <stdio.h> +#include <string.h> #include <unistd.h> #include <sysdep.h> diff --git a/sysdeps/unix/sysv/linux/i386/fxstatat.c b/sysdeps/unix/sysv/linux/i386/fxstatat.c index 2fc89e69c4..d5bc6021bc 100644 --- a/sysdeps/unix/sysv/linux/i386/fxstatat.c +++ b/sysdeps/unix/sysv/linux/i386/fxstatat.c @@ -24,6 +24,7 @@ #include <fcntl.h> #include <stddef.h> #include <stdio.h> +#include <string.h> #include <sys/stat.h> #include <kernel_stat.h> @@ -47,7 +48,7 @@ extern int __have_no_stat64; int __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { - if (flag & ~AT_SYMLINK_NOFOLLOW) + if (__builtin_expect (flag & ~AT_SYMLINK_NOFOLLOW, 0)) { __set_errno (EINVAL); return -1; @@ -138,7 +139,10 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) out: if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0)) - __atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf); + { + __atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf); + result = -1; + } return result; } |