diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-03-13 18:20:12 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-03-13 18:20:12 +0000 |
| commit | 984124d726e087943f1415337c50a1bff32cfc17 (patch) | |
| tree | c6f715c85c46ad0c97af31cff88257aca141d3ac /libc/io | |
| parent | 3b289e20aa9fa02a85745547a976b824bc66d096 (diff) | |
Merge changes between r9801 and r10031 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@10032 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/io')
| -rw-r--r-- | libc/io/ftw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/io/ftw.c b/libc/io/ftw.c index 9cc09077e..bb7dba8ca 100644 --- a/libc/io/ftw.c +++ b/libc/io/ftw.c @@ -1,5 +1,5 @@ /* File tree walker functions. - Copyright (C) 1996-2004, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1996-2004, 2006-2008, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -790,6 +790,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, { int save_err = errno; __fchdir (cwdfd); + close_not_cancel_no_status (cwdfd); __set_errno (save_err); } else if (cwd != NULL) |