* top.c (command_line_input): If annotation suffix is NULL,

	replace it with an empty string.
	(read_next_line): Pass "command" as annotation suffix to
	command_line_input.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e13b12d028d9d58d1a5b2398fc6f60d71bead88..ff9080eb0cd621db1e41af630abff64efdd2ba84 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 28 14:53:21 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+       * top.c (command_line_input): If annotation suffix is NULL,
+       replace it with an empty string.
+       (read_next_line): Pass "command" as annotation suffix to
+       command_line_input.
+
 Mon Nov 28 11:03:14 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
 
        * config/rs6000/tm-rs6000.h (setpgrp): move defn from here...

diff --git a/gdb/top.c b/gdb/top.c
index d4a9bb835a8968f84c7496347b67ab1065d57897..e28b9bbb3780502a889d9b4bffe6647ab2977c0a 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1565,6 +1565,10 @@ command_line_input (prrompt, repeat, annotation_suffix)
   char *nline;
   char got_eof = 0;
 
+  /* The annotation suffix must be non-NULL.  */
+  if (annotation_suffix == NULL)
+    annotation_suffix = "";
+
   if (annotation_level > 1 && instream == stdin)
     {
       local_prompt = alloca ((prrompt == NULL ? 0 : strlen (prrompt))
@@ -1841,7 +1845,7 @@ read_next_line (command)
   else
     prompt_ptr = NULL;
 
-  p = command_line_input (prompt_ptr, instream == stdin, NULL);
+  p = command_line_input (prompt_ptr, instream == stdin, "command");
 
   /* Not sure what to do here.  */
   if (p == NULL)