X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fchdir-safer.c;h=b3266b51be30592aadca5ca82f78de157032f8fb;hb=c8068b3df116650efbf0fbf2d790c706577ae972;hp=5c313bcab9eb3829f8f2121e32701a249e3eb74a;hpb=79c0a43808d9ca85acd04600149fc1a9b75bd1b9;p=gnulib.git
diff --git a/lib/chdir-safer.c b/lib/chdir-safer.c
index 5c313bcab..b3266b51b 100644
--- a/lib/chdir-safer.c
+++ b/lib/chdir-safer.c
@@ -1,11 +1,11 @@
/* much like chdir(2), but safer
- Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2008-2010 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,14 +13,11 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "chdir-safer.h"
@@ -32,12 +29,8 @@
#include
#include "same-inode.h"
-#ifndef O_DIRECTORY
-# define O_DIRECTORY 0
-#endif
-
-#ifndef O_NOFOLLOW
-# define O_NOFOLLOW 0
+#ifndef HAVE_READLINK
+# define HAVE_READLINK 0
#endif
/* Like chdir, but fail if DIR is a symbolic link to a directory (or
@@ -50,28 +43,30 @@ 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_RDONLY | O_DIRECTORY | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK);
if (fd < 0)
return -1;
/* If open follows symlinks, lstat DIR and fstat FD to ensure that
they are the same file; if they are different files, set errno to
ELOOP (the same value that open uses for symlinks with
- O_NOFOLLOW) so the caller can report a failure. */
- if (! O_NOFOLLOW)
+ O_NOFOLLOW) so the caller can report a failure.
+ Skip this check if HAVE_READLINK == 0, which should be the case
+ on any system that lacks symlink support. */
+ if (HAVE_READLINK && ! HAVE_WORKING_O_NOFOLLOW)
{
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)