diff options
author | Roland McGrath <roland@redhat.com> | 2010-05-04 12:13:28 -0700 |
---|---|---|
committer | Roland McGrath <roland@redhat.com> | 2010-05-04 12:13:28 -0700 |
commit | bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b (patch) | |
tree | 334c4a5d9b11045021021f5f0db53ce4f4fa3ff3 /hurd/lookup-at.c | |
parent | 2e76ab2332a7fb9e73a4047625b915bff93bd427 (diff) | |
parent | c4ccff16e2ff92f84102988bd3a32cd1d2719f3a (diff) |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'hurd/lookup-at.c')
-rw-r--r-- | hurd/lookup-at.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hurd/lookup-at.c b/hurd/lookup-at.c index a2d50cb192..7f55527d8b 100644 --- a/hurd/lookup-at.c +++ b/hurd/lookup-at.c @@ -1,5 +1,5 @@ /* Lookup helper function for Hurd implementation of *at functions. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006,2010 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 @@ -33,7 +33,7 @@ __file_name_lookup_at (int fd, int at_flags, flags |= (at_flags & AT_SYMLINK_NOFOLLOW) ? O_NOLINK : 0; at_flags &= ~AT_SYMLINK_NOFOLLOW; if (at_flags != 0) - return __hurd_fail (EINVAL); + return (__hurd_fail (EINVAL), MACH_PORT_NULL); if (fd == AT_FDCWD || file_name[0] == '/') return __file_name_lookup (file_name, flags, mode); |