* infrun.c (child_attach): Don't allow gdb to attach to itself.

It gets permanently stuck in many OSes.
* breakpoint.c, infcmd.c, infrun.c, utils.c:  Change many printfs
to printf_filtered.
* breakpoint.c: Improve	help text for info breakpoints.

2 files changed, 12 insertions, 9 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 20864a6..4e8e7b5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -2,7 +2,8 @@ Tue May 12 14:15:48 1992  Stu Grossman  (grossman at cygnus.com)
 
 	* infrun.c (child_attach):  Don't allow gdb to attach to itself.
 	It gets permanently stuck in many OSes.
-	* breakpoint.c, infcmd.c, infrun.c:  Change many printfs to printf_filtered.
+	* breakpoint.c, infcmd.c, infrun.c, utils.c:  Change many printfs
+	to printf_filtered.
 	* breakpoint.c: Improve	help text for info breakpoints.
 
 Mon May 11 14:17:18 1992  John Gilmore  (gnu at cygnus.com)
diff --git a/gdb/utils.c b/gdb/utils.c
index bb01776..bdadedb 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -31,6 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "terminal.h"
 #include "bfd.h"
 #include "target.h"
+#include "demangle.h"
 
 /* Prototypes for local functions */
 
@@ -251,10 +252,10 @@ error (va_alist)
   wrap_here("");			/* Force out any buffered output */
   fflush (stdout);
   if (error_pre_print)
-    fprintf (stderr, error_pre_print);
+    fprintf_filtered (stderr, error_pre_print);
   string = va_arg (args, char *);
-  vfprintf (stderr, string, args);
-  fprintf (stderr, "\n");
+  vfprintf_filtered (stderr, string, args);
+  fprintf_filtered (stderr, "\n");
   va_end (args);
   return_to_top_level ();
 }
@@ -391,7 +392,7 @@ print_sys_errmsg (string, errcode)
   strcat (combined, ": ");
   strcat (combined, err);
 
-  printf ("%s.\n", combined);
+  fprintf (stderr, "%s.\n", combined);
 }
 
 /* Control C eventually causes this to be called, at a convenient time.  */
@@ -697,9 +698,9 @@ query (va_alist)
     {
       va_start (args);
       ctlstr = va_arg (args, char *);
-      vfprintf (stdout, ctlstr, args);
+      vfprintf_filtered (stdout, ctlstr, args);
       va_end (args);
-      printf ("(y or n) ");
+      printf_filtered ("(y or n) ");
       fflush (stdout);
       answer = fgetc (stdin);
       clearerr (stdin);		/* in case of C-d */
@@ -718,7 +719,7 @@ query (va_alist)
 	return 1;
       if (answer == 'N')
 	return 0;
-      printf ("Please answer y or n.\n");
+      printf_filtered ("Please answer y or n.\n");
     }
 }
 
@@ -1291,7 +1292,8 @@ fprint_symbol (stream, name)
      char *name;
 {
   char *demangled;
-  if ((!demangle) || NULL == (demangled = cplus_demangle (name, 1)))
+  if ((!demangle)
+      || NULL == (demangled = cplus_demangle (name, DMGL_PARAMS | DMGL_ANSI)))
     fputs_filtered (name, stream);
   else
     {