Make pwd and readlink work also when run with an unreadable parent dir

on systems with openat support.
* lib/getcwd.c (__getcwd) [HAVE_PARTLY_WORKING_GETCWD]: Use the system
provided getcwd function, even when we have openat support.
Reported by Dmitry V. Levin in <http://bugzilla.redhat.com/227168>.

diff --git a/ChangeLog b/ChangeLog
index 394e68e8872dc1be6a7c8515a0f3b6ee24354ce5..7b35b210306c1119214ecda9866b6058246e4cab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-03  Jim Meyering  <jim@meyering.net>
+
+       Make pwd and readlink work also when run with an unreadable parent dir
+       on systems with openat support.
+       * lib/getcwd.c (__getcwd) [HAVE_PARTLY_WORKING_GETCWD]: Use the system
+       provided getcwd function, even when we have openat support.
+       Reported by Dmitry V. Levin in <http://bugzilla.redhat.com/227168>.
+
 2007-02-02  Bruno Haible  <bruno@clisp.org>
 
        * lib/string_.h (memmem, mempcpy, memrchr, stpcpy, stpncpy, strchrnul,

diff --git a/lib/getcwd.c b/lib/getcwd.c
index 978c5383737da0672fa98a1c71a7f2b377360095..0ac5cdce3387768e2064ce39090f99a830bebb83 100644 (file)
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -140,13 +140,18 @@ __getcwd (char *buf, size_t size)
   size_t allocated = size;
   size_t used;
 
-#if HAVE_PARTLY_WORKING_GETCWD && !defined AT_FDCWD
+#if HAVE_PARTLY_WORKING_GETCWD
   /* The system getcwd works, except it sometimes fails when it
      shouldn't, setting errno to ERANGE, ENAMETOOLONG, or ENOENT.  If
      AT_FDCWD is not defined, the algorithm below is O(N**2) and this
      is much slower than the system getcwd (at least on GNU/Linux).
      So trust the system getcwd's results unless they look
-     suspicious.  */
+     suspicious.
+
+     Use the system getcwd even if we have openat support, since the
+     system getcwd works even when a parent is unreadable, while the
+     openat-based approach does not.  */
+
 # undef getcwd
   dir = getcwd (buf, size);
   if (dir || (errno != ERANGE && !is_ENAMETOOLONG (errno) && errno != ENOENT))