root/trunk/texinfo/texinfo-4.7-segfault-1.patch

texinfo-4.7/info/echo-area.c

@@ -936 +936 @@
-      printf_to_message_buffer (completions_found_index == 1
-                                ? (char *) _("One completion:\n")
-                                : (char *) _("%d completions:\n"),
- *) completions_found_index
+*)((intptr_t)completions_found_index)
-
-      /* Find the maximum length of a label. */
-      for (i = 0; i < completions_found_index; i++)
@@ -1499 +1499 @@
-   for input or a couple of seconds, whichever comes first.  Then flush the
-   informational message that was printed. */
-void
-
+onst c
-{
-register 
+
-  char *text;
+  int avail = EA_MAX_INPUT + 1 - input_line_end;
-
-  text = xstrdup (message);
-
+ && i < avail
-    ;
-  text[i] = 0;
-

texinfo-4.7/info/echo-area.h

@@ -33 +33 @@
-   killed some text. */
-extern int echo_area_last_command_was_kill;
-
-
+onst c
-extern void echo_area_inform_of_deleted_window (WINDOW *window);
-extern void echo_area_prep_read (void);
-extern VFunction *ea_last_executed_command;

texinfo-4.7/info/filesys.c

@@ -281 +281 @@
-  if (!string || i >= strlen (string))
-    return NULL;
-
+  if (!string[i]) /* end of string */
+    return NULL;
+
-  /* Advance to next PATH_SEP.  */
-  while (string[i] && string[i] != PATH_SEP[0])
-    i++;
-
-  if (!string[i] && i == start) /* end of string, and didn't advance */
-    return NULL;
-
-  {
-    char *value = xmalloc ((i - start) + 1);
-    strncpy (value, &string[start], (i - start));

texinfo-4.7/info/infokey.c

@@ -639 +639 @@
-                {
-                  syntax_error (filename, lnum,
-                      (char *) _("NUL character (^%c) not permitted"),
- c
+((intptr_t)c)
-                  error = 1;
-                }
-              seqstate = normal;
@@ -663 +663 @@
-              if (alen == 0)
-                {
-                  syntax_error (filename, lnum, (char *) _("missing action name"),
- c
+((intptr_t)c)
-                  error = 1;
-                }
-              else

texinfo-4.7/info/infomap.c

@@ -704 +704 @@
-  map['H'].function = info_get_help_window;
-  map['i'].function = info_index_search;
-  map['I'].function = info_goto_invocation_node;
-down
-up
+next
+prev
-  map['l'].function = info_history_node;
-  map['m'].function = info_menu_item;
-  map['n'].function = info_search_next;
@@ -1182 +1182 @@
-        'H', NUL,                       A_info_get_help_window,
-        'i', NUL,                       A_info_index_search,
-        'I', NUL,                       A_info_goto_invocation_node,
-down
-up
+next
+prev
-        'l', NUL,                       A_info_history_node,
-        'm', NUL,                       A_info_menu_item,
-        'n', NUL,                       A_info_search_next,

texinfo-4.7/info/session.c

@@ -962 +962 @@
-                     same as the first menu item found in this node. */
-                  window_message_in_echo_area
-                    ((char *) _("Moving Up %d time(s), then Next."),
- up_counter
+((intptr_t)up_counter)
-
-                  info_handle_pointer ("Next", window);
-                  return;
@@ -1944 +1944 @@
-DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item"))
-{
-  register int i, item;
-entry = NULL, *
+
-
-  menu = info_menu_of_node (window->node);
-
@@ -1962 +1962 @@
-    for (i = 0; menu[i + 1]; i++);
-  else
-    {
-(entry = menu[i])
+menu[i]
-        if (i == item - 1)
-          break;
-    }
@@ -1970 +1970 @@
-  if (menu[i])
-    {
-      info_select_reference (window, menu[i]);
-entry
-entry
+menu[i]
+menu[i]
-    }
-  else
-    info_error ((char *) _("There aren't %d items in this menu."),
- item
+((intptr_t)item)
-
-  info_free_references (menu);
-  return;