docbase: fix info filename; don't remove doc/updated-stamp

[gnulib.git] / lib / chdir-safer.c

diff --git a/lib/chdir-safer.c b/lib/chdir-safer.c
index a6f77b0..2e21e05 100644 (file)
--- a/lib/chdir-safer.c
+++ b/lib/chdir-safer.c
@@ -1,6 +1,6 @@
 /* much like chdir(2), but safer
 
-   Copyright (C) 2005-2006, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,16 +34,19 @@
 #endif
 
 /* Like chdir, but fail if DIR is a symbolic link to a directory (or
-   similar funny business), or if DIR is not readable.  This avoids a
-   minor race condition between when a directory is created or statted
-   and when the process chdirs into it.  */
+   similar funny business).  This avoids a minor race condition
+   between when a directory is created or statted and when the process
+   chdirs into it.
+
+   On older systems lacking full support for O_SEARCH, this function
+   can also fail if DIR is not readable.  */
 int
 chdir_no_follow (char const *dir)
 {
   int result = 0;
   int saved_errno;
   int fd = open (dir,
-                O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK);
+                 O_SEARCH | O_DIRECTORY | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK);
   if (fd < 0)
     return -1;
 
@@ -58,15 +61,15 @@ chdir_no_follow (char const *dir)
       struct stat sb1;
       result = lstat (dir, &sb1);
       if (result == 0)
-       {
-         struct stat sb2;
-         result = fstat (fd, &sb2);
-         if (result == 0 && ! SAME_INODE (sb1, sb2))
-           {
-             errno = ELOOP;
-             result = -1;
-           }
-       }
+        {
+          struct stat sb2;
+          result = fstat (fd, &sb2);
+          if (result == 0 && ! SAME_INODE (sb1, sb2))
+            {
+              errno = ELOOP;
+              result = -1;
+            }
+        }
     }
 
   if (result == 0)