branch release/7.0 updated: * info/man.c (check_manpage_node): Disable this code if __sun is defined, to avoid clash with man program on Solaris, where -w means to update the whatis database. Test failure on OpenSolaris 2022.10 reported by Bruno Haible.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch release/7.0
in repository texinfo.

The following commit(s) were added to refs/heads/release/7.0 by this push:
     new 91c4f282af * info/man.c (check_manpage_node): Disable this code if 
__sun is defined, to avoid clash with man program on Solaris, where -w means to 
update the whatis database.  Test failure on OpenSolaris 2022.10 reported by 
Bruno Haible.
91c4f282af is described below

commit 91c4f282aff4c325a6a73a1debdf77b275ed3b96
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Jan 9 20:27:55 2023 +0000

    * info/man.c (check_manpage_node):
    Disable this code if __sun is defined, to avoid clash with
    man program on Solaris, where -w means to update the whatis
    database.  Test failure on OpenSolaris 2022.10 reported by
    Bruno Haible.
---
 ChangeLog  | 8 ++++++++
 info/man.c | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b7fe29752c..7ac9fe867b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-01-02  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * info/man.c (check_manpage_node):
+       Disable this code if __sun is defined, to avoid clash with
+       man program on Solaris, where -w means to update the whatis
+       database.  Test failure on OpenSolaris 2022.10 reported by
+       Bruno Haible.
+
 2023-01-09  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * install-info/install-info.c (split_entry):
diff --git a/info/man.c b/info/man.c
index c4877ac860..49a0d0636f 100644
--- a/info/man.c
+++ b/info/man.c
@@ -1,6 +1,6 @@
 /* man.c: How to read and format man files.
 
-   Copyright 1995-2022 Free Software Foundation, Inc.
+   Copyright 1995-2023 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
@@ -63,7 +63,7 @@ static NODE **manpage_nodes = 0;
 size_t manpage_node_index = 0;
 size_t manpage_node_slots = 0;
 
-#if PIPE_USE_FORK
+#if PIPE_USE_FORK && !defined(__sun)
 
 /* Check if a man page exists.  Use "man -w" for this rather than getting
    the contents of the man page.  This is faster if we are running
@@ -109,7 +109,9 @@ check_manpage_node (char *pagename)
   return 0;
 }
 
-#else /* !PIPE_USE_FORK */
+#else /* !PIPE_USE_FORK || defined(__sun) */
+/* We check __sun because 'man -w' has a different meaning on
+   Solaris (update whatis database). */
 
 int
 check_manpage_node (char *pagename)