Re: test du/trailing-slash fails for coreutils-6.5 under Solaris 9

[Paul Eggert]

Jim Meyering <address@hidden> writes:

> Think of this bug as incentive for you to upgrade to Solaris 10 :-)

:-)

<http://www.sun.com/service/eosl/solaris/solaris_vintage_eol_5.2005.xml>,
says Sun will stop shipping Solaris 8 on 2007-02-16, and they plan to
support Solaris 8 through 2012-03-31.  (This was news to me.)
However, Sun hasn't yet announced when Solaris 9 will be discontinued,
but I assume it'll be after that.  So we'll probably be stuck with
Solaris 9 for quite some time.

I installed the following into gnulib; when combined with coreutils it
passes the little test case you sent on Solaris 9 sparc, along with
the 'make check' test case.

This doesn't have a separate fstatat module as you suggested.  I tried
that, but it was a bit overkill (required #include "fstatat.h", etc.,
which I'm not a big fan of).  Since openat already tests for lstat
symlink/ problems, I figured it was easier just to fold the code into
openat.

2006-11-20  Paul Eggert  <address@hidden>

        * lib/openat.h (rpl_fstatat): New macro, if
        [HAVE_OPENAT && ! LSTAT_FOLLOWS_SLASHED_SYMLINK.
        (fstatat): Define to rpl_fstatat under the same conditions,
        unless COMPILING_FSTATAT.
        * m4/openat.m4 (gl_FUNC_OPENAT): Compile fstatat.c too, if fstatat
        seems to have the bug.
        * lib/fstatat.c: New file.
        * modules/openat (Files): Add it.

Index: lib/openat.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/openat.h,v
retrieving revision 1.10
diff -u -r1.10 openat.h
--- lib/openat.h        17 Aug 2006 20:34:21 -0000      1.10
+++ lib/openat.h        20 Nov 2006 22:00:54 -0000
@@ -85,6 +85,14 @@

 #endif

+#if HAVE_OPENAT && ! LSTAT_FOLLOWS_SLASHED_SYMLINK
+int rpl_fstatat (int fd, char const *file, struct stat *st, int flag);
+# if !COMPILING_FSTATAT
+#  undef fstatat
+#  define fstatat rpl_fstatat
+# endif
+#endif
+
 int mkdirat (int fd, char const *file, mode_t mode);
 void openat_restore_fail (int) ATTRIBUTE_NORETURN;
 void openat_save_fail (int) ATTRIBUTE_NORETURN;
Index: lib/fstatat.c
===================================================================
RCS file: lib/fstatat.c
diff -N lib/fstatat.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lib/fstatat.c       20 Nov 2006 22:00:54 -0000
@@ -0,0 +1,57 @@
+/* Work around an fstatat bug on Solaris 9.
+
+   Copyright (C) 2006 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
+   the Free Software Foundation; either version 2, 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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
+
+/* Written by Paul Eggert and Jim Meyering.  */
+
+#include <config.h>
+
+#define COMPILING_FSTATAT 1
+#include "openat.h"
+
+#include <errno.h>
+#include <string.h>
+
+/* fstatat should always follow symbolic links that end in /, but on
+   Solaris 9 it doesn't if AT_SYMLINK_NOFOLLOW is specified.  This is
+   the same problem that lstat.c addresses, so solve it in a similar
+   way.  */
+
+int
+rpl_fstatat (int fd, char const *file, struct stat *st, int flag)
+{
+  int result = fstatat (fd, file, st, flag);
+
+  if (result == 0 && (flag & AT_SYMLINK_NOFOLLOW) && S_ISLNK (st->st_mode)
+      && file[strlen (file) - 1] == '/')
+    {
+      /* FILE refers to a symbolic link and the name ends with a slash.
+        Get info about the link's referent.  */
+      result = fstatat (fd, file, st, flag & ~AT_SYMLINK_NOFOLLOW);
+      if (result == 0 && ! S_ISDIR (st->st_mode))
+       {
+         /* fstatat succeeded and FILE references a non-directory.
+            But it was specified via a name including a trailing
+            slash.  Fail with errno set to ENOTDIR to indicate the
+            contradiction.  */
+         errno = ENOTDIR;
+         return -1;
+       }
+    }
+
+  return result;
+}
Index: m4/openat.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/openat.m4,v
retrieving revision 1.8
diff -u -r1.8 openat.m4
--- m4/openat.m4        30 Sep 2006 00:37:49 -0000      1.8
+++ m4/openat.m4        20 Nov 2006 22:00:54 -0000
@@ -20,8 +20,9 @@
   AC_CHECK_FUNCS_ONCE([lchmod])
   AC_CHECK_FUNCS_ONCE([fdopendir])
   AC_REPLACE_FUNCS(openat)
-  case $ac_cv_func_openat in
-  yes) ;;
+  case $ac_cv_func_openat+$ac_cv_func_lstat_dereferences_slashed_symlink in
+  yes+yes) ;;
+  yes+*) AC_LIBOBJ([fstatat]);;
   *)
     AC_DEFINE([__OPENAT_PREFIX], [[rpl_]],
       [Define to rpl_ if the openat replacement function should be used.])
Index: modules/openat
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/openat,v
retrieving revision 1.16
diff -u -r1.16 openat
--- modules/openat      13 Oct 2006 12:40:23 -0000      1.16
+++ modules/openat      20 Nov 2006 22:00:54 -0000
@@ -4,6 +4,7 @@
 Files:
 lib/at-func.c
 lib/fchmodat.c
+lib/fstatat.c
 lib/mkdirat.c
 lib/openat.c
 lib/openat.h