diff options
Diffstat (limited to 'macros/texinfo/texinfo/install-info/install-info.c')
-rw-r--r-- | macros/texinfo/texinfo/install-info/install-info.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/macros/texinfo/texinfo/install-info/install-info.c b/macros/texinfo/texinfo/install-info/install-info.c index 8950288f6b..636cf58d8c 100644 --- a/macros/texinfo/texinfo/install-info/install-info.c +++ b/macros/texinfo/texinfo/install-info/install-info.c @@ -1,6 +1,6 @@ /* install-info -- merge Info directory entries from an Info file. - Copyright 1996-2022 Free Software Foundation, Inc. + Copyright 1996-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 @@ -214,7 +214,9 @@ vdiag (const char *fmt, const char *diagtype, va_list ap) putc ('\n', stderr); } -void +/* declare as static to avoid clash with glibc error function, called from + gnulib. */ +static void error (const char *fmt, ...) { va_list ap; @@ -1601,9 +1603,8 @@ split_entry (const char *entry, char **name, size_t *name_len, else { /* Just show the rest when there's no newline. */ - size_t length = strlen (ptr); - strncat (*description, ptr, length); - ptr += length; + strcat (*description, ptr); + ptr += strlen (ptr); } } /* Descriptions end in a new line. */ @@ -2207,7 +2208,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); case 'W': |