Don't use FD after a successful "fdopendir (fd)".

* lib/getcwd.c (__getcwd) [AT_FDCWD]: fdopendir (fd) usually closes fd.
Reset it by calling dirfd on the just-obtained DIR*.

diff --git a/ChangeLog b/ChangeLog
index 89196395de6a40f7a2f8e51641afe6e21d06ac4d..2f3243697d9b9ddf3eb0e4e4cad567ae2b76be3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-02-19  Jim Meyering  <jim@meyering.net>
 
+       Don't use FD after a successful "fdopendir (fd)".
+       * lib/getcwd.c (__getcwd) [AT_FDCWD]: fdopendir (fd) usually closes fd.
+       Reset it by calling dirfd on the just-obtained DIR*.
+
        * m4/ftruncate.m4: Adjust comment to give this module a 3-year reprieve.
        Prompted by a report from Bruno Haible that mingw lacks ftruncate.
 

diff --git a/lib/getcwd.c b/lib/getcwd.c
index 3cdc113916098b0f65043f91916d18a91947269f..dea0ebcac45f4f5d4b37b8eb887224ef778dc0db 100644 (file)
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -234,6 +234,8 @@ __getcwd (char *buf, size_t size)
       dirstream = fdopendir (fd);
       if (dirstream == NULL)
        goto lose;
+      /* Reset fd.  It may have been closed by fdopendir.  */
+      fd = dirfd (dirstream);
       fd_needs_closing = false;
 #else
       dirstream = __opendir (dotlist);