diff options
Diffstat (limited to 'macros/texinfo/texinfo/info')
-rw-r--r-- | macros/texinfo/texinfo/info/info.c | 2 | ||||
-rw-r--r-- | macros/texinfo/texinfo/info/man.c | 8 | ||||
-rw-r--r-- | macros/texinfo/texinfo/info/util.c | 11 |
3 files changed, 10 insertions, 11 deletions
diff --git a/macros/texinfo/texinfo/info/info.c b/macros/texinfo/texinfo/info/info.c index 26713f3e03..e6f2d68bb5 100644 --- a/macros/texinfo/texinfo/info/info.c +++ b/macros/texinfo/texinfo/info/info.c @@ -860,7 +860,7 @@ main (int argc, char *argv[]) License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\ This is free software: you are free to change and redistribute it.\n\ There is NO WARRANTY, to the extent permitted by law.\n"), - "2022"); + "2023"); exit (EXIT_SUCCESS); } diff --git a/macros/texinfo/texinfo/info/man.c b/macros/texinfo/texinfo/info/man.c index c4877ac860..49a0d0636f 100644 --- a/macros/texinfo/texinfo/info/man.c +++ b/macros/texinfo/texinfo/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) diff --git a/macros/texinfo/texinfo/info/util.c b/macros/texinfo/texinfo/info/util.c index 10be93bae1..46af4ce385 100644 --- a/macros/texinfo/texinfo/info/util.c +++ b/macros/texinfo/texinfo/info/util.c @@ -350,11 +350,11 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t iconv_state, size_t iconv_ret; size_t extra_alloc = 1; - outptr = text_buffer_base (buf) + text_buffer_off (buf); - out_bytes_left = text_buffer_space_left (buf); - while (1) { + outptr = text_buffer_base (buf) + text_buffer_off (buf); + out_bytes_left = text_buffer_space_left (buf); + iconv_ret = iconv (iconv_state, inbuf, inbytesleft, &outptr, &out_bytes_left); if (iconv_ret != (size_t) -1) @@ -362,10 +362,7 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t iconv_state, /* If we ran out of space, allocate more and try again. */ if (errno == E2BIG) - { - text_buffer_alloc (buf, (extra_alloc *= 4)); - out_bytes_left = text_buffer_space_left (buf); - } + text_buffer_alloc (buf, (extra_alloc *= 4)); else break; /* let calling code deal with it */ } |