texinfo update (Sun Feb 24 18:53:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.828
retrieving revision 1.830
diff -u -r1.828 -r1.830
--- ChangeLog   22 Feb 2008 23:40:17 -0000      1.828
+++ ChangeLog   24 Feb 2008 23:52:56 -0000      1.830
@@ -1,3 +1,13 @@
+2008-02-24  Karl Berry  <address@hidden>
+
+       * install-info/install-info.c (munge_old_style_debian_options):
+       avoid use of asprintf, just xmalloc ourselves.
+       In report from Juan Manuel Guerrero, 24 Feb 2008 22:06:35.      
+
+       * install-info/install-info.c (spec_entry) <text_len>: declare
+       as size_t instead of int, to avoid warning.
+       In report from Juan Manuel Guerrero, 24 Feb 2008 22:06:35.
+
 2008-02-22  Karl Berry  <address@hidden>
 
        * pretest 4.11.90.
Index: install-info/install-info.c
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/install-info.c,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -r1.3 -r1.5
--- install-info/install-info.c 22 Feb 2008 19:18:25 -0000      1.3
+++ install-info/install-info.c 24 Feb 2008 23:52:56 -0000      1.5
@@ -1,5 +1,5 @@
 /* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.3 2008/02/22 19:18:25 karl Exp $
+   $Id: install-info.c,v 1.5 2008/02/24 23:52:56 karl Exp $
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    2005, 2007, 2008 Free Software Foundation, Inc.
@@ -77,7 +77,7 @@
 {
   struct spec_entry *next;
   char *text;
-  int text_len;
+  size_t text_len;
   /* A pointer to the list of sections to which this entry should be
      added.  */
   struct spec_section *entry_sections;
@@ -1715,13 +1715,15 @@
        
          /* Okay, we munge the options to look like this:
             --regex=REGEX --section=TITLE --add-once */
-         if (asprintf (&opt, "--regex=%s", regex) == -1)
+          opt = xmalloc (strlen (regex) + sizeof ("--regex="));
+         if (sprintf (opt, "--regex=%s", regex) == -1)
            err = 1;
          if (!err)
            err = argz_add (&argz, &argz_len, opt);
          free (opt); opt = NULL;
 
-         if (asprintf (&opt, "--section=%s", title) == -1)
+          opt = xmalloc (strlen (regex) + sizeof ("--section="));
+         if (sprintf (opt, "--section=%s", title) == -1)
            err = 1;
          if (!err)
            err = argz_add (&argz, &argz_len, opt);
P ChangeLog
P install-info/install-info.c