[LSTAT]: Compile/use slash_aware_lstat only if it is necessary.

diff --git a/lib/stat.c b/lib/stat.c
index 3f77562be9f30eac62ba5240607100d8cf43241c..ff9e9bbe5b4b1721ca367ab57cdac09fab47093c 100644 (file)
--- 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)