Tue Dec 15 10:05:56 1992 Ian Lance Taylor (ian@cygnus.com)

[deliverable/binutils-gdb.git] / gdb / utils.c

diff --git a/gdb/utils.c b/gdb/utils.c
index b99e4f942467ea8d4a060491d7056dd48a52ed14..b087b52420f9530502399d8639642270622265a6 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -52,9 +52,6 @@ prompt_for_continue PARAMS ((void));
 static void 
 set_width_command PARAMS ((char *, int, struct cmd_list_element *));
 
-static void
-vfprintf_filtered PARAMS ((FILE *, char *, va_list));
-
 /* If this definition isn't overridden by the header files, assume
    that isatty and fileno exist on this system.  */
 #ifndef ISATTY
@@ -811,11 +808,13 @@ parse_escape (string_ptr)
     }
 }
 \f
-/* Print the character C on STREAM as part of the contents
-   of a literal string whose delimiter is QUOTER.  */
+/* Print the character C on STREAM as part of the contents of a literal
+   string whose delimiter is QUOTER.  Note that this routine should only
+   be call for printing things which are independent of the language
+   of the program being debugged. */
 
 void
-printchar (c, stream, quoter)
+gdb_printchar (c, stream, quoter)
      register int c;
      FILE *stream;
      int quoter;
@@ -903,17 +902,29 @@ set_width_command (args, from_tty, c)
   wrap_pointer = wrap_buffer;  /* Start it at the beginning */
 }
 
+/* Wait, so the user can read what's on the screen.  Prompt the user
+   to continue by pressing RETURN.  */
+
 static void
 prompt_for_continue ()
 {
   char *ignore;
 
+  /* We must do this *before* we call gdb_readline, else it will eventually
+     call us -- thinking that we're trying to print beyond the end of the 
+     screen.  */
+  reinitialize_more_filter ();
+
   immediate_quit++;
   ignore = gdb_readline ("---Type <return> to continue---");
   if (ignore)
     free (ignore);
-  chars_printed = lines_printed = 0;
   immediate_quit--;
+
+  /* Now we have to do this again, so that GDB will know that it doesn't
+     need to save the ---Type <return>--- line at the top of the screen.  */
+  reinitialize_more_filter ();
+
   dont_repeat ();              /* Forget prev cmd -- CR won't repeat it. */
 }
 
@@ -971,6 +982,20 @@ wrap_here(indent)
     }
 }
 
+/* Ensure that whatever gets printed next, using the filtered output
+   commands, starts at the beginning of the line.  I.E. if there is
+   any pending output for the current line, flush it and start a new
+   line.  Otherwise do nothing. */
+
+void
+begin_line ()
+{
+  if (chars_printed > 0)
+    {
+      puts_filtered ("\n");
+    }
+}
+
 /* Like fputs but pause after every screenful, and can wrap at points
    other than the final character of a line.
    Unlike fputs, fputs_filtered does not return a value.
@@ -1154,7 +1179,7 @@ fputs_demangled (linebuffer, stream, arg_mode)
 
 /* Print a variable number of ARGS using format FORMAT.  If this
    information is going to put the amount written (since the last call
-   to INITIALIZE_MORE_FILTER or the last page break) over the page size,
+   to REINITIALIZE_MORE_FILTER or the last page break) over the page size,
    print out a pause message and do a gdb_readline to get the users
    permision to continue.
 
@@ -1175,36 +1200,26 @@ fputs_demangled (linebuffer, stream, arg_mode)
    (since prompt_for_continue may do so) so this routine should not be
    called when cleanups are not in place.  */
 
-static void
+#define        MIN_LINEBUF     255
+
+void
 vfprintf_filtered (stream, format, args)
      FILE *stream;
      char *format;
      va_list args;
 {
-  static char *linebuffer = (char *) 0;
-  static int line_size;
+  char line_buf[MIN_LINEBUF+10];
+  char *linebuffer = line_buf;
   int format_length;
 
   format_length = strlen (format);
 
-  /* Allocated linebuffer for the first time.  */
-  if (!linebuffer)
-    {
-      linebuffer = (char *) xmalloc (255);
-      line_size = 255;
-    }
-
   /* Reallocate buffer to a larger size if this is necessary.  */
-  if (format_length * 2 > line_size)
+  if (format_length * 2 > MIN_LINEBUF)
     {
-      line_size = format_length * 2;
-
-      /* You don't have to copy.  */
-      free (linebuffer);
-      linebuffer = (char *) xmalloc (line_size);
+      linebuffer = alloca (10 + format_length * 2);
     }
 
-
   /* This won't blow up if the restrictions described above are
      followed.   */
   vsprintf (linebuffer, format, args);
@@ -1212,6 +1227,14 @@ vfprintf_filtered (stream, format, args)
   fputs_filtered (linebuffer, stream);
 }
 
+void
+vprintf_filtered (format, args)
+     char *format;
+     va_list args;
+{
+  vfprintf_filtered (stdout, format, args);
+}
+
 /* VARARGS */
 void
 fprintf_filtered (va_alist)
@@ -1291,7 +1314,10 @@ printfi_filtered (va_alist)
   va_end (args);
 }
 
-/* Easy */
+/* Easy -- but watch out!
+
+   This routine is *not* a replacement for puts()!  puts() appends a newline.
+   This one doesn't, and had better not!  */
 
 void
 puts_filtered (string)
@@ -1379,7 +1405,7 @@ fprint_symbol (stream, name)
    when searching for matching C++ function names (such as if the
    user types 'break FOO', where FOO is a mangled C++ function). */
 
-static int
+int
 strcmp_iw (string1, string2)
      const char *string1;
      const char *string2;