summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-06-11 08:50:01 +0000
committerJim Meyering <jim@meyering.net>2003-06-11 08:50:01 +0000
commitc393a4fa206ed61b7cdeb33d68efa68b1b4aa2ef (patch)
treef0bf2351201333f84dde6eae4ded248c03a7f7b0
parent383db808ef7259f92935a0460dba18a0bae32d01 (diff)
downloadcoreutils-c393a4fa206ed61b7cdeb33d68efa68b1b4aa2ef.tar.xz
[LSTAT]: Compile/use slash_aware_lstat only if it is necessary.
-rw-r--r--lib/stat.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/stat.c b/lib/stat.c
index 3f77562be..ff9e9bbe5 100644
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -1,6 +1,7 @@
/* Work around the bug in some systems whereby stat/lstat succeeds when
given the zero-length file name argument. The stat/lstat from SunOS4.1.4
- has this bug.
+ has this bug. Also work around a deficiency in Solaris systems (up to at
+ least Solaris5.9) regarding the semantics of `lstat ("symlink/", sbuf).'
Copyright (C) 1997-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@ -27,7 +28,7 @@
#ifndef errno
extern int errno;
#endif
-#ifdef LSTAT
+#if defined LSTAT && ! LSTAT_FOLLOWS_SLASHED_SYMLINK
# include <string.h>
# if HAVE_STDLIB_H
@@ -94,7 +95,7 @@ slash_aware_lstat (const char *file, struct stat *sbuf)
return lstat_result;
}
-#endif /* LSTAT */
+#endif /* LSTAT && ! LSTAT_FOLLOWS_SLASHED_SYMLINK */
/* This is a wrapper for stat/lstat.
If FILE is the empty string, fail with errno == ENOENT.
@@ -109,7 +110,11 @@ slash_aware_lstat (const char *file, struct stat *sbuf)
#ifdef LSTAT
# define rpl_xstat rpl_lstat
-# define xstat_return_val(F, S) slash_aware_lstat (F, S)
+# if ! LSTAT_FOLLOWS_SLASHED_SYMLINK
+# define xstat_return_val(F, S) slash_aware_lstat (F, S)
+# else
+# define xstat_return_val(F, S) lstat (F, S)
+# endif
#else
# define rpl_xstat rpl_stat
# define xstat_return_val(F, S) stat (F, S)