Derek Robert Price <[EMAIL PROTECTED]> wrote:
> Jim Meyering wrote:
>>I do see why that prerequisite-testing [in stat.m4 and lstat.m4]
>>is conditional, and agree in principle with the general goal.
>
> I should hope so. Doesn't the "jm_" prefix on "jm_FUNC_LSTAT" mean
> you wrote the macro in the first place? :)
I wrote that one, but didn't conditionalize the prerequisite-testing.
Regarding the jm_ prefix, note that some other people also wrote
macros (e.g., for coreutils) that they named with the jm_ prefix.
I sure do wish I had chosen a prefix like gl_ from the beginning.
> Did you have an opinion about my tweaks to stat.c?
Yes. I liked it and have just made that change. Thanks.
I also confirmed that Solaris5.9 still requires the
work-around code and added this comment:
Also work around a deficiency in Solaris systems (up to at
least Solaris5.9) regarding the semantics of `lstat ("symlink/", sbuf).'
has this bug.
2003-05-20 Derek Price <[EMAIL PROTECTED]>
* stat.c [LSTAT]: Compile/use slash_aware_lstat only if it is necessary.
Here's the diff:
Index: stat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/stat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -u -r1.6 -r1.7
--- stat.c 7 Jun 2003 10:19:12 -0000 1.6
+++ stat.c 11 Jun 2003 08:50:33 -0000 1.7
@@ -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, str
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, str
#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)
