 @@ -1,15 +1,15 @@
 /* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.2 2011/11/11 23:45:21 joerg Exp $
+   $Id: install-info.c,v 1.3 2013/09/08 16:31:13 joerg Exp $
    Copyright (C) 1996, 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
    the Free Software Foundation; either version 2 of the License, 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.
 @@ -128,49 +128,46 @@ struct option longopts[] =
   { "quiet",     no_argument, NULL, 'q' },
   { "remove",    no_argument, NULL, 'r' },
   { "section",   required_argument, NULL, 's' },
   { "version",   no_argument, NULL, 'V' },
   { 0 }
 };
 /* Error message functions.  */
 /* Print error message.  S1 is printf control string, S2 and S3 args for it. */
 /* VARARGS1 */
 void
-error (s1, s2, s3)
+error (const char *s1, const char *s2, const char *s3)
      char *s1, *s2, *s3;
+{
   fprintf (stderr, "%s: ", progname);
   fprintf (stderr, s1, s2, s3);
   putc ('\n', stderr);
+}
 /* VARARGS1 */
 void
-warning (s1, s2, s3)
+warning (const char *s1, const char *s2, const char *s3)
      char *s1, *s2, *s3;
+{
   fprintf (stderr, _("%s: warning: "), progname);
   fprintf (stderr, s1, s2, s3);
   putc ('\n', stderr);
+}
 /* Print error message and exit.  */
 void
-fatal (s1, s2, s3)
+fatal (const char *s1, const char *s2, const char *s3)
      char *s1, *s2, *s3;
+{
   error (s1, s2, s3);
   xexit (1);
+}
 /* Memory allocation and string operations.  */
 /* Like malloc but get fatal error if memory is exhausted.  */
 void *
 xmalloc (size)
      unsigned int size;
+{
   extern void *malloc ();
 @@ -186,61 +183,57 @@ xrealloc (obj, size)
      void *obj;
      unsigned int size;
+{
   extern void *realloc ();
   void *result = realloc (obj, size);
   if (result == NULL)
     fatal (_("virtual memory exhausted"), 0, 0);
   return result;
+}
 /* Return a newly-allocated string
    whose contents concatenate those of S1, S2, S3.  */
 char *
-concat (s1, s2, s3)
+concat (const char *s1, const char *s2, const char *s3)
      char *s1, *s2, *s3;
+{
   int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
   char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
   strcpy (result, s1);
   strcpy (result + len1, s2);
   strcpy (result + len1 + len2, s3);
   *(result + len1 + len2 + len3) = 0;
   return result;
+}
 /* Return a string containing SIZE characters
    copied from starting at STRING.  */
 char *
-copy_string (string, size)
+copy_string (const char *string, int size)
      char *string;
      int size;
+{
   int i;
   char *copy = (char *) xmalloc (size + 1);
   for (i = 0; i < size; i++)
     copy[i] = string[i];
   copy[size] = 0;
   return copy;
+}
 /* Print fatal error message based on errno, with file name NAME.  */
 void
-pfatal_with_name (name)
+pfatal_with_name (const char *name)
      char *name;
+{
   char *s = concat ("", strerror (errno), _(" for %s"));
   fatal (s, name, 0);
+}
 /* Given the full text of a menu entry, null terminated,
    return just the menu item name (copied).  */
 char *
 extract_menu_item_name (item_text)
      char *item_text;
+{
   char *p;
 @@ -338,50 +331,47 @@ strip_info_suffix (fname)
       ret[len] = 0;
+    }
 #endif /* __MSDOS__ */
   return ret;
+}
 /* Return true if ITEM matches NAME and is followed by TERM_CHAR.  ITEM
    can also be followed by `.gz', `.info.gz', or `.info' (and then
    TERM_CHAR) and still match.  */
 static int
-menu_item_equal (item, term_char, name)
+menu_item_equal (const char *item, char term_char, const char *name)
      char *item;
      char term_char;
      char *name;
+{
   unsigned name_len = strlen (name);
   /* First, ITEM must actually match NAME (usually it won't).  */
   int ret = strncasecmp (item, name, name_len) == 0;
   if (ret)
+    {
       /* Then, `foobar' doesn't match `foo', so be sure we've got all of
          ITEM.  The various suffixes should never actually appear in the
          dir file, but sometimes people put them in.  */
-      static char *suffixes[]
+      static const char *suffixes[]
         = { "", ".info.gz", ".info", ".inf", ".gz",
 #ifdef __MSDOS__
             ".inz", ".igz",
 #endif
             NULL };
       unsigned i;
       ret = 0;
       for (i = 0; !ret && suffixes[i]; i++)
+        {
-          char *suffix = suffixes[i];
+          const char *suffix = suffixes[i];
           unsigned suffix_len = strlen (suffix);
           ret = strncasecmp (item + name_len, suffix, suffix_len) == 0
                 && item[name_len + suffix_len] == term_char;
+        }
+    }
   return ret;
+}
 void
 suggest_asking_for_help ()