Re: [Bug-gnulib] lstat/stat

[Paul Eggert]

Derek Robert Price <address@hidden> writes:

> I just got a complaint from one of the other CVS developers that Sun
> likes to see wither the uname output (SunOS 5.9) or their marketing
> name (Solaris 9) when referring to various versions of their operating
> systems.

Thanks.  I reviewed gnulib for other instances of divergence from
Sun's usage, and installed the following patch.  There are some other
divergences but they might be more controversial so I'll address them
separately.

Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/ChangeLog,v
retrieving revision 1.516
diff -p -u -r1.516 ChangeLog
--- lib/ChangeLog       22 Jul 2003 22:10:56 -0000      1.516
+++ lib/ChangeLog       22 Jul 2003 22:45:51 -0000
@@ -82,7 +82,7 @@
        * save-cwd.h (restore_cwd): Update prototype.
        * save-cwd.c (restore_cwd): Remove two parameters.
        Simplify.  Don't call error upon failure.  Let callers do that.
-       (save_cwd): Mention that Irix 5.3 has the same problem as SunOS4
+       (save_cwd): Mention that Irix 5.3 has the same problem as SunOS 4
        when auditing is enabled.  But don't bother updating the #if.
 
 2003-07-14  Simon Josefsson  <address@hidden>
@@ -808,7 +808,7 @@
        2001-12-20  Bruno Haible  <address@hidden>
 
                * setenv.c (__add_to_environ): Don't call realloc(NULL,...),
-               use malloc instead. For SunOS4.
+               use malloc instead. For SunOS 4.
 
        2001-12-11  Bruno Haible  <address@hidden>
 
@@ -1210,7 +1210,7 @@
 2002-06-22  Jim Meyering  <address@hidden>
 
        * fnmatch.c (ISASCII, ISPRINT): Undefine, to avoid warning about
-       redefinition due to Solaris5.6's definition in /usr/include/sys/euc.h.
+       redefinition due to Solaris 2.6's definition in /usr/include/sys/euc.h.
 
 2002-06-22  Paul Eggert  <address@hidden>
 
@@ -1551,7 +1551,7 @@
 2001-11-18  Jim Meyering  <address@hidden>
 
        * tempname.c [!HAVE_DECL_GETENV]: Declare getenv to avoid warning
-       on SunOS4.
+       on SunOS 4.
 
        * Makefile.am (Makefile): Depend on $(BUILT_SOURCES), so those
        files will be created before anything else.
@@ -1782,7 +1782,7 @@
        * Makefile.am (libfetish_a_SOURCES): Add xreadlink.c and xreadlink.h.
 
        * regex.c (uintptr_t) [!_LIBC]: Define to private_uintptr_t, so it
-       doesn't conflict with sparc-sun-solaris2.7's definition in
+       doesn't conflict with sparc Solaris 7's definition in
        /usr/include/sys/int_types.h.
 
        * exclude.c: Use `""', not `<>' to #include non-system header files.
@@ -2251,7 +2251,7 @@
 
 2001-01-16  Jim Meyering  <address@hidden>
 
-       * basename.c: Include <stdio.h>, needed by assert on SunOS4.
+       * basename.c: Include <stdio.h>, needed by assert on SunOS 4.
        From Bruno Haible.
 
 2001-01-14  Jim Meyering  <address@hidden>
@@ -2803,7 +2803,7 @@
 
 2000-07-05  Bruno Haible  <address@hidden>
 
-       * xgethostname.c (xgethostname): Protect against the SunOS5.5 bug
+       * xgethostname.c (xgethostname): Protect against the SunOS 5.5 bug
        by allocating a larger buffer. Test the gethostname return value for
        being >= 0, not == 0, for BeOS.  Don't exhaust memory if gethostname
        returns an error and ENAMETOOLONG isn't defined.
@@ -2998,7 +2998,7 @@
 2000-06-04  Jim Meyering  <address@hidden>
 
        * getugroups.c (getugroups): Cast -1 to gid_t, for systems like
-       SunOS4.1.4 for which gid_t is an unsigned type.
+       SunOS 4.1.4 for which gid_t is an unsigned type.
 
 2000-06-03  Jim Meyering  <address@hidden>
 
@@ -3371,7 +3371,7 @@
        Reported by Christian Krackowizer.
 
        * quotearg.c (ISASCII): Add #undef and move definition to follow
-       inclusion of wctype.h to work around solaris2.6 namespace pollution.
+       inclusion of wctype.h to work around Solaris 2.6 namespace pollution.
        (ISPRINT): Likewise.
        Reported by Tom Tromey.
 
Index: lib/lstat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/lstat.c,v
retrieving revision 1.5
diff -p -u -r1.5 lstat.c
--- lib/lstat.c 4 Dec 2002 10:11:39 -0000       1.5
+++ lib/lstat.c 22 Jul 2003 22:45:51 -0000
@@ -1,7 +1,9 @@
 /* Work around the bug in some systems whereby lstat succeeds when
-   given the zero-length file name argument.  The lstat from SunOS4.1.4
+   given the zero-length file name argument.  The lstat from SunOS 4.1.4
    has this bug.
-   Copyright (C) 1997-2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 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
Index: lib/save-cwd.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/save-cwd.c,v
retrieving revision 1.13
diff -p -u -r1.13 save-cwd.c
--- lib/save-cwd.c      14 Jul 2003 18:54:52 -0000      1.13
+++ lib/save-cwd.c      22 Jul 2003 22:45:51 -0000
@@ -62,7 +62,7 @@ extern int errno;
    support for fchdir, and getcwd is not robust or as efficient.
    So, we prefer to use the open/fchdir approach, but fall back on
    getcwd if necessary.  Some systems lack fchdir altogether: OS/2,
-   Cygwin (as of March 2003), SCO Xenix.  At least SunOS4 and Irix 5.3
+   Cygwin (as of March 2003), SCO Xenix.  At least SunOS 4 and Irix 5.3
    provide the function, yet it doesn't work for partitions on which
    auditing is enabled.  */
 
Index: lib/stat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/stat.c,v
retrieving revision 1.7
diff -p -u -r1.7 stat.c
--- lib/stat.c  11 Jun 2003 08:50:33 -0000      1.7
+++ lib/stat.c  22 Jul 2003 22:45:52 -0000
@@ -1,8 +1,10 @@
 /* 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
+   given the zero-length file name argument.  The stat/lstat from SunOS 4.1.4
    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.
+   least Solaris 9) regarding the semantics of `lstat ("symlink/", sbuf).'
+
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 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
@@ -102,7 +104,7 @@ slash_aware_lstat (const char *file, str
    Otherwise, return the result of calling the real stat/lstat.
 
    This works 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
+   given the zero-length file name argument.  The stat/lstat from SunOS 4.1.4
    has this bug.  */
 
 /* This function also provides a version of lstat with consistent semantics
Index: lib/utime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/utime.c,v
retrieving revision 1.8
diff -p -u -r1.8 utime.c
--- lib/utime.c 31 Dec 2002 13:02:48 -0000      1.8
+++ lib/utime.c 22 Jul 2003 22:45:52 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2001-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001, 2002, 2003 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
@@ -61,7 +61,7 @@ utime_null (const char *file)
       || safe_read (fd, &c, sizeof c) == SAFE_READ_ERROR
       || lseek (fd, (off_t) 0, SEEK_SET) < 0
       || full_write (fd, &c, sizeof c) != sizeof c
-      /* Maybe do this -- it's necessary on SunOS4.1.3 with some combination
+      /* Maybe do this -- it's necessary on SunOS 4.1.3 with some combination
         of patches, but that system doesn't use this code: it has utimes.
         || fsync (fd) < 0
       */
Index: lib/xgethostname.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xgethostname.c,v
retrieving revision 1.12
diff -p -u -r1.12 xgethostname.c
--- lib/xgethostname.c  9 Dec 2001 21:01:15 -0000       1.12
+++ lib/xgethostname.c  22 Jul 2003 22:45:52 -0000
@@ -1,5 +1,5 @@
 /* xgethostname.c -- return current hostname with unlimited length
-   Copyright (C) 1992, 1996, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000, 2001, 2003 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
@@ -53,7 +53,7 @@ xgethostname ()
 
   size = INITIAL_HOSTNAME_LENGTH;
   /* Use size + 1 here rather than size to work around the bug
-     in SunOS5.5's gethostname whereby it NUL-terminates HOSTNAME
+     in SunOS 5.5's gethostname whereby it NUL-terminates HOSTNAME
      even when the name is longer than the supplied buffer.  */
   hostname = xmalloc (size + 1);
   while (1)
Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/ChangeLog,v
retrieving revision 1.465
diff -p -u -r1.465 ChangeLog
--- m4/ChangeLog        18 Jul 2003 16:58:06 -0000      1.465
+++ m4/ChangeLog        22 Jul 2003 22:45:56 -0000
@@ -961,7 +961,7 @@
 2001-11-20  Jim Meyering  <address@hidden>
 
        * mkstemp.m4 (UTILS_FUNC_MKSTEMP): Update comment to reflect that
-       SunOS4.1.4 and solaris2.5.1 lose, too.
+       SunOS 4.1.4 and Solaris 2.5.1 lose, too.
 
 2001-11-19  Jim Meyering  <address@hidden>
 
@@ -1050,7 +1050,7 @@
 
        * ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS)
        [one-argument getmntent function]): Include stdio.h before mntent.h.
-       SunOS4.1.x needs it for the declaration of `FILE'.
+       SunOS 4.1.x needs it for the declaration of `FILE'.
        Patch by Volker Borchert.
 
        * ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS)
@@ -1875,7 +1875,7 @@
 
        * search-libs.m4: Update from autoconf.
 
-       su doesn't work on Solaris2.6.
+       su doesn't work on Solaris 2.6.
        * lib-check.m4: When checking for struct spwd.sp_pwdp, also include
        <shadow.h>.  Reported by Dragos Harabor.
 
Index: m4/canon-host.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/canon-host.m4,v
retrieving revision 1.1
diff -p -u -r1.1 canon-host.m4
--- m4/canon-host.m4    31 Dec 2002 13:42:06 -0000      1.1
+++ m4/canon-host.m4    22 Jul 2003 22:45:56 -0000
@@ -1,5 +1,5 @@
 # canon-host.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -13,10 +13,10 @@ AC_DEFUN([gl_CANON_HOST],
   AC_CHECK_HEADERS(netdb.h sys/socket.h netinet/in.h arpa/inet.h)
 
   dnl Add any libraries as early as possible.
-  dnl In particular, inet_ntoa needs -lnsl at least on Solaris5.5.1,
+  dnl In particular, inet_ntoa needs -lnsl at least on Solaris 2.5.1,
   dnl so we have to add -lnsl to LIBS before checking for that function.
   AC_SEARCH_LIBS(gethostbyname, [inet nsl])
 
-  dnl These come from -lnsl on Solaris5.5.1.
+  dnl These come from -lnsl on Solaris 2.5.1.
   AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
 ])
Index: m4/lstat.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/lstat.m4,v
retrieving revision 1.14
diff -p -u -r1.14 lstat.m4
--- m4/lstat.m4 31 Dec 2002 13:43:06 -0000      1.14
+++ m4/lstat.m4 22 Jul 2003 22:45:56 -0000
@@ -2,7 +2,7 @@
 
 dnl From Jim Meyering.
 dnl Determine whether lstat has the bug that it succeeds when given the
-dnl zero-length file name argument.  The lstat from SunOS4.1.4 and the Hurd
+dnl zero-length file name argument.  The lstat from SunOS 4.1.4 and the Hurd
 dnl (as of 1998-11-01) do this.
 dnl
 dnl If it does, then define HAVE_LSTAT_EMPTY_STRING_BUG and arrange to
Index: m4/mkstemp.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/mkstemp.m4,v
retrieving revision 1.5
diff -p -u -r1.5 mkstemp.m4
--- m4/mkstemp.m4       31 Dec 2002 13:43:06 -0000      1.5
+++ m4/mkstemp.m4       22 Jul 2003 22:45:56 -0000
@@ -1,6 +1,6 @@
 #serial 2
 
-# On some systems (e.g., HPUX-10.20, SunOS4.1.4, solaris2.5.1), mkstemp has the
+# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
 # silly limit that it can create no more than 26 files from a given template.
 # Other systems lack mkstemp altogether.  On either type of system, arrange
 # to use the replacement function.
Index: m4/regex.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/regex.m4,v
retrieving revision 1.29
diff -p -u -r1.29 regex.m4
--- m4/regex.m4 2 Feb 2003 18:27:48 -0000       1.29
+++ m4/regex.m4 22 Jul 2003 22:45:56 -0000
@@ -103,7 +103,7 @@ AC_DEFUN([jm_INCLUDED_REGEX],
 # Prerequisites of lib/regex.c.
 AC_DEFUN([jm_PREREQ_REGEX],
 [
-  dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it.
+  dnl FIXME: Maybe provide a btowc replacement someday: Solaris 2.5.1 lacks it.
   dnl FIXME: Check for wctype and iswctype, and and add -lw if necessary
   dnl to get them.
 
Index: m4/stat.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/stat.m4,v
retrieving revision 1.14
diff -p -u -r1.14 stat.m4
--- m4/stat.m4  31 Dec 2002 13:43:06 -0000      1.14
+++ m4/stat.m4  22 Jul 2003 22:45:56 -0000
@@ -2,7 +2,7 @@
 
 dnl From Jim Meyering.
 dnl Determine whether stat has the bug that it succeeds when given the
-dnl zero-length file name argument.  The stat from SunOS4.1.4 and the Hurd
+dnl zero-length file name argument.  The stat from SunOS 4.1.4 and the Hurd
 dnl (as of 1998-11-01) do this.
 dnl
 dnl If it does, then define HAVE_STAT_EMPTY_STRING_BUG and arrange to