* mpw-make.in (VERSION): Update to 4.12.3.

	(SiowGDB): New target, GDB using SIOW library.
	(init-new.c): New target, attempt to generate init.c from sources.
	(main.c.o, top.c.o): Put each in its own segment.
	* main.c (main) [MPW]: Always call mac_init.
	* utils.c (query) [MPW]: Always return "yes" if in MacGDB, output
	an extra newline otherwise.
	* mac-xdep.c: More comments in various places, remove junk.
	(mac_init): Add tests for MPW and SIOW.
	(use_wne, has_color_qd): Renamed.
	(use_color_qd): New variable.
	(grow_window): Only do console resizing to console window,
	call resize_console_window.
	(zoom_window): Call resize_console_window.
	(resize_console_window, scroll_text): New functions.
	(adjust_console_sizes): Always align viewrect to even multiples of
	text lines.
	(adjust_console_text): Always scroll by whole lines.
	(hacked_vfprintf, hacked_puts, hacked_fputc, hacked_putc): Force a
	recalculation of scroll positions if a newline was output.
	(hacked_fflush): Similarly, for flushing.
	(hacked_fgetc): New function, aborts if called in MacGDB.
	* ser-mac.c (mac_readchar): Rename starttime to start_time,
	remove debugging printf.
	(mac_write): Sleep on first 4 writes.
	(sec_sleep): New function, works like standard sleep.
	* macgdb.r: Adjust positioning and contents of About box.
	Set minimum size to 2000K, preferred size to 5000K.
	* config/m68k/xm-mpw.h (fgetc): Define as a macro.

7 files changed, 259 insertions, 2581 deletions

diff --git a/gdb/ChangeLog.mpw b/gdb/ChangeLog.mpw
index a31a596..1e4c6ad 100644
--- a/gdb/ChangeLog.mpw
+++ b/gdb/ChangeLog.mpw
@@ -1,3 +1,35 @@
+Wed Jun 22 11:10:27 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mpw-make.in (VERSION): Update to 4.12.3.
+	(SiowGDB): New target, GDB using SIOW library.
+	(init-new.c): New target, attempt to generate init.c from sources.
+	(main.c.o, top.c.o): Put each in its own segment.
+	* main.c (main) [MPW]: Always call mac_init.
+	* utils.c (query) [MPW]: Always return "yes" if in MacGDB, output
+	an extra newline otherwise.
+	* mac-xdep.c: More comments in various places, remove junk.
+	(mac_init): Add tests for MPW and SIOW.
+	(use_wne, has_color_qd): Renamed.
+	(use_color_qd): New variable.
+	(grow_window): Only do console resizing to console window,
+	call resize_console_window.
+	(zoom_window): Call resize_console_window.
+	(resize_console_window, scroll_text): New functions.
+	(adjust_console_sizes): Always align viewrect to even multiples of
+	text lines.
+	(adjust_console_text): Always scroll by whole lines.
+	(hacked_vfprintf, hacked_puts, hacked_fputc, hacked_putc): Force a
+	recalculation of scroll positions if a newline was output.
+	(hacked_fflush): Similarly, for flushing.
+	(hacked_fgetc): New function, aborts if called in MacGDB.
+	* ser-mac.c (mac_readchar): Rename starttime to start_time,
+	remove debugging printf.
+	(mac_write): Sleep on first 4 writes.
+	(sec_sleep): New function, works like standard sleep.
+	* macgdb.r: Adjust positioning and contents of About box.
+	Set minimum size to 2000K, preferred size to 5000K.
+	* config/m68k/xm-mpw.h (fgetc): Define as a macro.
+
 Wed Jun 15 17:36:07 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* mpw-make.in (.c.o, .gc.o): Prefix segment names with gdb_.
diff --git a/gdb/config/m68k/xm-mpw.h b/gdb/config/m68k/xm-mpw.h
index 653b6ba..c2485f8 100644
--- a/gdb/config/m68k/xm-mpw.h
+++ b/gdb/config/m68k/xm-mpw.h
@@ -61,6 +61,9 @@ void mpw_abort ();
 #define fseek mpw_fseek
 #define abort mpw_abort
 
+/* Map these standard functions to versions that can do I/O in a console
+   window. */
+
 #define printf hacked_printf
 #define fprintf hacked_fprintf
 #define vprintf hacked_vfprintf
@@ -70,6 +73,8 @@ void mpw_abort ();
 #define putc hacked_putc
 #define fflush hacked_fflush
 
+#define fgetc hacked_fgetc
+
 /* Define as macros so as to mask the previous enum. */
 
 #ifndef BFD_TRUE_FALSE
diff --git a/gdb/mac-xdep.c b/gdb/mac-xdep.c
index 8b1cb6e..5921906 100644
--- a/gdb/mac-xdep.c
+++ b/gdb/mac-xdep.c
@@ -81,11 +81,21 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "mac-defs.h"
 
+/* This is true if we are running as a standalone application.  */
+
 int mac_app;
 
-int useWNE;
+/* This is true if we are using WaitNextEvent.  */
+
+int use_wne;
+
+/* This is true if we have Color Quickdraw.  */
+
+int has_color_qd;
 
-int hasColorQD;
+/* This is true if we are using Color Quickdraw. */
+
+int use_color_qd;
 
 int inbackground;
 
@@ -109,7 +119,6 @@ Rect console_text_rect;
 /* This will go away eventually. */
 gdb_has_a_terminal () { return 1; }
 
-
 mac_init ()
 {
   SysEnvRec se;
@@ -122,6 +131,24 @@ mac_init ()
   int i;
   Handle menubar;
   MenuHandle menu;
+  Handle siow_resource;
+
+  mac_app = 0;
+
+  /* Don't do anything if we`re running under MPW. */
+  if (!StandAlone)
+    return;
+
+  /* Don't do anything if we're using SIOW. */
+  /* This test requires that the siow 0 resource, as defined in
+     {RIncludes}siow.r, not be messed with.  If it is, then the
+     standard Mac setup below will step on SIOW's Mac setup and
+     most likely crash the machine. */
+  siow_resource = GetResource('siow', 0);
+  if (siow_resource != nil)
+    return;
+
+  mac_app = 1;
 
   /* Do the standard Mac environment setup. */
   InitGraf (&QD (thePort));
@@ -135,7 +162,9 @@ mac_init ()
 
   /* Color Quickdraw is different from Classic QD. */
   SysEnvirons(2, &se);
-  hasColorQD = se.hasColorQD;
+  has_color_qd = se.hasColorQD;
+  /* Use it if we got it. */
+  use_color_qd = has_color_qd;
 
   sizerect.top = 50;
   sizerect.left = 50;
@@ -157,14 +186,12 @@ mac_init ()
   DrawMenuBar ();
 
   new_console_window ();
-
-  return 1;
 }
 
 new_console_window ()
 {
   /* Create the main window we're going to play in. */
-  if (hasColorQD)
+  if (has_color_qd)
     console_window = GetNewCWindow (wConsole, NULL, (WindowPtr) -1L);
   else
     console_window = GetNewWindow (wConsole, NULL, (WindowPtr) -1L);
@@ -201,24 +228,25 @@ mac_command_loop()
   EventRecord event;
   WindowPtr win;
   RgnHandle cursorRgn;
-  int i;
+  int i, tm;
   Handle menubar;
   MenuHandle menu;
 
-  /* Figure out if the WaitNextEvent Trap is available. */
-  useWNE =
+  /* Figure out if the WaitNextEvent Trap is available.  */
+  use_wne =
     (NGetTrapAddress (0x60, ToolTrap) != NGetTrapAddress (0x9f, ToolTrap));
-  /* Pass WNE an empty region the 1st time thru. */
+  /* Pass WaitNextEvent an empty region the first time through.  */
   cursorRgn = NewRgn ();
-  /* Go into the main event-handling loop. */
+  /* Go into the main event-handling loop.  */
   while (!eventloopdone)
     {
-      /* Use WaitNextEvent if it is available, otherwise GetNextEvent. */
-      if (useWNE)
+      /* Use WaitNextEvent if it is available, otherwise GetNextEvent.  */
+      if (use_wne)
 	{
 	  get_global_mouse (&mouse);
 	  adjust_cursor (mouse, cursorRgn);
-	  gotevent = WaitNextEvent (everyEvent, &event, GetCaretTime(), cursorRgn);
+	  tm = GetCaretTime();
+	  gotevent = WaitNextEvent (everyEvent, &event, tm, cursorRgn);
 	}
       else
 	{
@@ -249,6 +277,8 @@ mac_command_loop()
     }
 }
 
+/* Collect the global coordinates of the mouse pointer.  */
+
 get_global_mouse (mouse)
 Point *mouse;
 {
@@ -258,13 +288,16 @@ Point *mouse;
   *mouse = evt.where;
 }
 
+/* Change the cursor's appearance to be appropriate for the given mouse
+   location.  */
+
 adjust_cursor (mouse, region)
 Point mouse;
 RgnHandle region;
 {
 }
 
-/* Decipher an event, maybe do something with it. */
+/* Decipher an event, maybe do something with it.  */
 
 do_event (evt)
 EventRecord *evt;
@@ -395,18 +428,19 @@ Point where;
   GrafPtr oldport;
 
   winsize = GrowWindow (win, where, &sizerect);
+  /* Only do anything if it actually changed size. */
   if (winsize != 0)
     {
       GetPort (&oldport);
       SetPort (win);
-      EraseRect (&win->portRect);
-      h = LoWord (winsize);
-      v = HiWord (winsize);
-      SizeWindow (win, h, v, 1);
-      adjust_console_sizes ();
-      adjust_console_scrollbars ();
-      adjust_console_text ();
-      InvalRect (&win->portRect);
+      if (win == console_window)
+	{
+	  EraseRect (&win->portRect);
+	  h = LoWord (winsize);
+	  v = HiWord (winsize);
+	  SizeWindow (win, h, v, 1);
+	  resize_console_window ();
+	}
       SetPort (oldport);
     }
 }
@@ -417,10 +451,18 @@ Point where;
 short part;
 {
   ZoomWindow (win, part, (win == FrontWindow ()));
+  if (win == console_window)
+    {
+      resize_console_window ();
+    }
+}
+
+resize_console_window ()
+{
   adjust_console_sizes ();
   adjust_console_scrollbars ();
   adjust_console_text ();
-  InvalRect (&(win->portRect));
+  InvalRect (&console_window->portRect);
 }
 
 close_window (win)
@@ -501,6 +543,11 @@ do_mouse_down (WindowPtr win, EventRecord *event)
     }
 }
 
+scroll_text (hlines, vlines)
+int hlines, vlines;
+{
+}
+
 activate_window (win, activate)
 WindowPtr win;
 int activate;
@@ -717,27 +764,22 @@ int key;
 	  bpstat_do_actions (&stop_bpstat);
 	}
     }
-  else if (0 /* editing chars... */)
-    {
-    }
   else
     {
-      /* A self-inserting character. */
+      /* A self-inserting character.  This includes delete.  */
       TEKey (key, console_text);
     }
 }
 
+/* Draw all graphical stuff in the console window.  */
+
 draw_console ()
 {
   SetPort (console_window);
   TEUpdate (&(console_window->portRect), console_text);
-#if 0
-  FrameRect (&((*console_text)->viewRect));
-  FrameRect (&((*console_text)->destRect));
-#endif
 }
 
-/* Cause an update of a window's entire contents. */
+/* Cause an update of a given window's entire contents.  */
 
 force_update (win)
 WindowPtr win;
@@ -757,15 +799,20 @@ adjust_console_sizes ()
   Rect tmprect;
 
   tmprect = console_window->portRect;
+  /* Move and size the scrollbar. */
   MoveControl (console_v_scrollbar, tmprect.right - sbarwid, 0);
   SizeControl (console_v_scrollbar, sbarwid + 1, tmprect.bottom - sbarwid + 1);
+  /* Move and size the text. */
   tmprect.left += 7;
   tmprect.right -= sbarwid;
   tmprect.bottom -= sbarwid;
   InsetRect(&tmprect, 1, 1);
-  (*console_text)->viewRect = tmprect;
   (*console_text)->destRect = tmprect;
-  /* (should fiddle bottom of viewrect to be even multiple of lines?) */
+  /* Fiddle bottom of viewrect to be even multiple of text lines. */
+  tmprect.bottom = tmprect.top
+    + ((tmprect.bottom - tmprect.top) / (*console_text)->lineHeight)
+      * (*console_text)->lineHeight;
+  (*console_text)->viewRect = tmprect;
 }
 
 adjust_console_scrollbars ()
@@ -793,8 +840,8 @@ adjust_console_text ()
   TEScroll (((*console_text)->viewRect.left
 	     - (*console_text)->destRect.left)
 	    - 0 /* get h scroll value */,
-	    (((*console_text)->viewRect.top
-	      - (*console_text)->destRect.top)
+	    ((((*console_text)->viewRect.top - (*console_text)->destRect.top)
+	      / (*console_text)->lineHeight)
 	     - GetCtlValue (console_v_scrollbar))
 	    * (*console_text)->lineHeight,
 	    console_text);
@@ -890,7 +937,6 @@ hacked_fprintf (FILE *fp, const char *fmt, ...)
       char buf[1000];
 
       ret = vsprintf(buf, fmt, ap);
-      TESetSelect (40000, 40000, console_text);
       TEInsert (buf, strlen(buf), console_text);
     }
   else
@@ -908,12 +954,7 @@ hacked_printf (const char *fmt, ...)
   va_list ap;
 
   va_start (ap, fmt);
-  if (mac_app)
-    {
-      ret = hacked_vfprintf(stdout, fmt, ap);
-    }
-  else
-    ret = vfprintf (stdout, fmt, ap);
+  ret = hacked_vfprintf(stdout, fmt, ap);
   va_end (ap);
   return ret;
 }
@@ -929,8 +970,13 @@ hacked_vfprintf (FILE *fp, const char *format, va_list args)
       int ret;
 
       ret = vsprintf(buf, format, args);
-      TESetSelect (40000, 40000, console_text);
       TEInsert (buf, strlen(buf), console_text);
+      if (strchr(buf, '\n'))
+	{
+	  adjust_console_sizes ();
+	  adjust_console_scrollbars ();
+	  adjust_console_text ();
+	}
       return ret;
     }
   else
@@ -943,8 +989,13 @@ hacked_fputs (const char *s, FILE *fp)
 {
   if (mac_app && (fp == stdout || fp == stderr))
     {
-      TESetSelect (40000, 40000, console_text);
       TEInsert (s, strlen(s), console_text);
+      if (strchr(s, '\n'))
+	{
+	  adjust_console_sizes ();
+	  adjust_console_scrollbars ();
+	  adjust_console_text ();
+	}
       return 0;
     }
   else
@@ -957,12 +1008,17 @@ hacked_fputc (const char c, FILE *fp)
 {
   if (mac_app && (fp == stdout || fp == stderr))
     {
-      char buf[2];
+      char buf[1];
 
       buf[0] = c;
-      TESetSelect (40000, 40000, console_text);
       TEInsert (buf, 1, console_text);
-      return 0;
+      if (c == '\n')
+	{
+	  adjust_console_sizes ();
+	  adjust_console_scrollbars ();
+	  adjust_console_text ();
+	}
+      return c;
     }
   else
     return fputc (c, fp);
@@ -974,11 +1030,17 @@ hacked_putc (const char c, FILE *fp)
 {
   if (mac_app && (fp == stdout || fp == stderr))
     {
-      char buf[2];
+      char buf[1];
 
       buf[0] = c;
-      TESetSelect (40000, 40000, console_text);
       TEInsert (buf, 1, console_text);
+      if (c == '\n')
+	{
+	  adjust_console_sizes ();
+	  adjust_console_scrollbars ();
+	  adjust_console_text ();
+	}
+      return c;
     }
   else
     return fputc (c, fp);
@@ -989,6 +1051,24 @@ hacked_putc (const char c, FILE *fp)
 hacked_fflush (FILE *fp)
 {
   if (mac_app && (fp == stdout || fp == stderr))
-    return 0;
+    {
+      adjust_console_sizes ();
+      adjust_console_scrollbars ();
+      adjust_console_text ();
+      return 0;
+    }
   return fflush (fp);
 }
+
+#undef fgetc
+
+hacked_fgetc (FILE *fp)
+{
+  if (mac_app && (fp == stdin))
+    {
+      /* Catch any attempts to use this.  */
+      DebugStr("\pShould not be reading from stdin!");
+      return '\n';
+    }
+  return fgetc (fp);
+}
diff --git a/gdb/macgdb.r b/gdb/macgdb.r
index 07b6882..548ba0f 100644
--- a/gdb/macgdb.r
+++ b/gdb/macgdb.r
@@ -75,7 +75,7 @@ resource 'MENU' (mDebug, preload) {
 };
 
 resource 'ALRT' (128) {
-	{40, 40, 229, 363},
+	{40, 40, 180, 420},
 	128,
 	{	/* array: 4 elements */
 		/* [1] */
@@ -90,33 +90,20 @@ resource 'ALRT' (128) {
 };
 
 resource 'DITL' (128) {
-	{	/* array DITLarray: 4 elements */
+	{	/* array DITLarray: 2 elements */
 		/* [1] */
-		{164, 115, 184, 185},
+		{110, 150, 128, 200},
 		Button {
 			enabled,
 			"OK"
 		},
 		/* [2] */
-		{5, 10, 43, 290},
+		{10, 10, 100, 370},
 		StaticText {
 			disabled,
-			"MacGDB"
+			"GDB 4.12.3\n"
+			"Copyright ©  1994 Free Software Foundation, Inc.\n"
 		},
-		/* [3] */
-		{76, 3, 154, 301},
-		StaticText {
-			disabled,
-			"GNU Debugger"
-			"\nCopyright ©  1994 Free Software Foundation Inc.\n"
-			"Written by Stan Shebs."
-		},
-		/* [4] */
-		{53, 82, 71, 227},
-		StaticText {
-			disabled,
-			"version 4.12.1"
-		}
 	}
 };
 
@@ -146,8 +133,8 @@ resource 'SIZE' (-1) {
 	reserved,
 	reserved,
 	reserved,
-	4000*1024,
-	4000*1024
+	5000*1024,
+	2000*1024
 };
 
 resource 'DLOG' (128) {
diff --git a/gdb/main.c b/gdb/main.c
index 56a34ad..eb0b8e2 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1,4 +1,4 @@
-/* Top level `main' program for GDB, the GNU debugger.
+/* Top level stuff for GDB, the GNU debugger.
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994
    Free Software Foundation, Inc.
 
@@ -19,334 +19,23 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "defs.h"
-#include "gdbcmd.h"
-#include "call-cmds.h"
-#include "symtab.h"
-#include "inferior.h"
-#include "signals.h"
+#include <setjmp.h>
+#include "top.h"
 #include "target.h"
-#include "breakpoint.h"
-#include "gdbtypes.h"
-#include "expression.h"
-#include "language.h"
-#include "terminal.h" /* For job_control.  */
-#include "annotate.h"
 
 #include "getopt.h"
 
-/* readline include files */
-#include "readline.h"
-#include "history.h"
-
-/* readline defines this.  */
-#undef savestring
-
 #include <sys/types.h>
+#include <sys/stat.h>
+
+#include <string.h>
+/* R_OK lives in either unistd.h or sys/file.h.  */
 #ifdef USG
-/* What is this for?  X_OK?  */
 #include <unistd.h>
 #endif
-
-#include <string.h>
 #ifndef	NO_SYS_FILE
 #include <sys/file.h>
 #endif
-#include <setjmp.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <ctype.h>
-
-/* Prototypes for local functions */
-
-static char *
-symbol_completion_function PARAMS ((char *, int));
-
-static void
-command_loop PARAMS ((void));
-
-static void
-command_loop_marker PARAMS ((int));
-
-static void
-print_gdb_version PARAMS ((GDB_FILE *));
-
-static void
-quit_command PARAMS ((char *, int));
-
-static void
-init_main PARAMS ((void));
-
-static void
-init_history PARAMS ((void));
-
-static void
-init_cmd_lists PARAMS ((void));
-
-static void
-float_handler PARAMS ((int));
-
-static void
-source_command PARAMS ((char *, int));
-
-static void cd_command PARAMS ((char *, int));
-
-static void
-print_gnu_advertisement PARAMS ((void));
-
-static void
-init_signals PARAMS ((void));
-
-static void
-read_command_file PARAMS ((FILE *));
-
-static void 
-set_verbose PARAMS ((char *, int, struct cmd_list_element *));
-
-static void
-show_history PARAMS ((char *, int));
-
-static void
-set_history PARAMS ((char *, int));
-
-static void
-set_history_size_command PARAMS ((char *, int, struct cmd_list_element *));
-
-static void
-show_commands PARAMS ((char *, int));
-
-static void
-echo_command PARAMS ((char *, int));
-
-static void
-pwd_command PARAMS ((char *, int));
-
-static void
-show_version PARAMS ((char *, int));
-
-static void
-document_command PARAMS ((char *, int));
-
-static void
-define_command PARAMS ((char *, int));
-
-static void
-validate_comname PARAMS ((char *));
-
-static void
-help_command PARAMS ((char *, int));
-
-static void
-show_command PARAMS ((char *, int));
-
-static void
-info_command PARAMS ((char *, int));
-
-static void
-complete_command PARAMS ((char *, int));
-
-static void
-do_nothing PARAMS ((int));
-
-static int
-quit_cover PARAMS ((char *));
-
-static void
-disconnect PARAMS ((int));
-
-static void
-source_cleanup PARAMS ((FILE *));
-
-/* If this definition isn't overridden by the header files, assume
-   that isatty and fileno exist on this system.  */
-#ifndef ISATTY
-#define ISATTY(FP)	(isatty (fileno (FP)))
-#endif
-
-/* Initialization file name for gdb.  This is overridden in some configs.  */
-
-#ifndef	GDBINIT_FILENAME
-#define	GDBINIT_FILENAME	".gdbinit"
-#endif
-static char gdbinit[] = GDBINIT_FILENAME;
-static int inhibit_gdbinit = 0;
-
-#define	ALL_CLEANUPS	((struct cleanup *)0)
-
-/* Version number of GDB, as a string.  */
-
-extern char *version;
-
-/* Canonical host name as a string. */
-
-extern char *host_name;
-
-/* Canonical target name as a string. */
-
-extern char *target_name;
-
-extern char lang_frame_mismatch_warn[];		/* language.c */
-
-/* Flag for whether we want all the "from_tty" gubbish printed.  */
-
-int caution = 1;			/* Default is yes, sigh. */
-
-/*
- * Define all cmd_list_element's
- */
-
-/* Chain containing all defined commands.  */
-
-struct cmd_list_element *cmdlist;
-
-/* Chain containing all defined info subcommands.  */
-
-struct cmd_list_element *infolist;
-
-/* Chain containing all defined enable subcommands. */
-
-struct cmd_list_element *enablelist;
-
-/* Chain containing all defined disable subcommands. */
-
-struct cmd_list_element *disablelist;
-
-/* Chain containing all defined delete subcommands. */
-
-struct cmd_list_element *deletelist;
-
-/* Chain containing all defined "enable breakpoint" subcommands. */
-
-struct cmd_list_element *enablebreaklist;
-
-/* Chain containing all defined set subcommands */
-
-struct cmd_list_element *setlist;
-
-/* Chain containing all defined unset subcommands */
-
-struct cmd_list_element *unsetlist;
-
-/* Chain containing all defined show subcommands.  */
-
-struct cmd_list_element *showlist;
-
-/* Chain containing all defined \"set history\".  */
-
-struct cmd_list_element *sethistlist;
-
-/* Chain containing all defined \"show history\".  */
-
-struct cmd_list_element *showhistlist;
-
-/* Chain containing all defined \"unset history\".  */
-
-struct cmd_list_element *unsethistlist;
-
-/* Chain containing all defined maintenance subcommands. */
-
-#if MAINTENANCE_CMDS
-struct cmd_list_element *maintenancelist;
-#endif
-
-/* Chain containing all defined "maintenance info" subcommands. */
-
-#if MAINTENANCE_CMDS
-struct cmd_list_element *maintenanceinfolist;
-#endif
-
-/* Chain containing all defined "maintenance print" subcommands. */
-
-#if MAINTENANCE_CMDS
-struct cmd_list_element *maintenanceprintlist;
-#endif
-
-struct cmd_list_element *setprintlist;
-
-struct cmd_list_element *showprintlist;
-
-struct cmd_list_element *setchecklist;
-
-struct cmd_list_element *showchecklist;
-
-/* stdio stream that command input is being read from.  Set to stdin normally.
-   Set by source_command to the file we are sourcing.  Set to NULL if we are
-   executing a user-defined command.  */
-
-FILE *instream;
-
-/* Current working directory.  */
-
-char *current_directory;
-
-/* The directory name is actually stored here (usually).  */
-static char dirbuf[1024];
-
-/* Function to call before reading a command, if nonzero.
-   The function receives two args: an input stream,
-   and a prompt string.  */
-
-void (*window_hook) PARAMS ((FILE *, char *));
-
-extern int mapped_symbol_files;
-extern int readnow_symbol_files;
-
-int epoch_interface;
-int xgdb_verbose;
-
-/* gdb prints this when reading a command interactively */
-static char *prompt;
-
-/* Buffer used for reading command lines, and the size
-   allocated for it so far.  */
-
-char *line;
-int linesize = 100;
-
-/* Nonzero if the current command is modified by "server ".  This
-   affects things like recording into the command history, comamnds
-   repeating on RETURN, etc.  This is so a user interface (emacs, GUI,
-   whatever) can issue its own commands and also send along commands
-   from the user, and have the user not notice that the user interface
-   is issuing commands too.  */
-int server_command;
-
-/* Baud rate specified for talking to serial target systems.  Default
-   is left as -1, so targets can choose their own defaults.  */
-/* FIXME: This means that "show remotebaud" and gr_files_info can print -1
-   or (unsigned int)-1.  This is a Bad User Interface.  */
-
-int baud_rate = -1;
-
-/* Non-zero tells remote* modules to output debugging info.  */
-
-int remote_debug = 0;
-
-/* Signal to catch ^Z typed while reading a command: SIGTSTP or SIGCONT.  */
-
-#ifndef STOP_SIGNAL
-#ifdef SIGTSTP
-#define STOP_SIGNAL SIGTSTP
-static void stop_sig PARAMS ((int));
-#endif
-#endif
-
-/* Some System V have job control but not sigsetmask(). */
-#if !defined (HAVE_SIGSETMASK)
-#if !defined (USG)
-#define HAVE_SIGSETMASK 1
-#else
-#define HAVE_SIGSETMASK 0
-#endif
-#endif
-
-#if 0 == (HAVE_SIGSETMASK)
-#define sigsetmask(n)
-#endif
-
-/* Where to go for return_to_top_level (RETURN_ERROR).  */
-static jmp_buf error_return;
-/* Where to go for return_to_top_level (RETURN_QUIT).  */
-static jmp_buf quit_return;
 
 /* Temporary variable for SET_TOP_LEVEL.  */
 static int top_level_val;
@@ -360,186 +49,6 @@ static int top_level_val;
     ? (PTR) 0 : (PTR) memcpy (quit_return, error_return, sizeof (jmp_buf))) \
    , top_level_val)
 
-/* Return for reason REASON.  This generally gets back to the command
-   loop, but can be caught via catch_errors.  */
-
-NORETURN void
-return_to_top_level (reason)
-     enum return_reason reason;
-{
-  quit_flag = 0;
-  immediate_quit = 0;
-
-  /* Perhaps it would be cleaner to do this via the cleanup chain (not sure
-     I can think of a reason why that is vital, though).  */
-  bpstat_clear_actions(stop_bpstat);	/* Clear queued breakpoint commands */
-
-  disable_current_display ();
-  do_cleanups (ALL_CLEANUPS);
-
-  if (annotation_level > 1)
-    switch (reason)
-      {
-      case RETURN_QUIT:
-	annotate_quit ();
-	break;
-      case RETURN_ERROR:
-	annotate_error ();
-	break;
-      }
-
-  (NORETURN void) longjmp
-    (reason == RETURN_ERROR ? error_return : quit_return, 1);
-}
-
-/* Call FUNC with arg ARGS, catching any errors.  If there is no
-   error, return the value returned by FUNC.  If there is an error,
-   print ERRSTRING, print the specific error message, then return
-   zero.
-
-   Must not be called with immediate_quit in effect (bad things might
-   happen, say we got a signal in the middle of a memcpy to quit_return).
-   This is an OK restriction; with very few exceptions immediate_quit can
-   be replaced by judicious use of QUIT.
-
-   MASK specifies what to catch; it is normally set to
-   RETURN_MASK_ALL, if for no other reason than that the code which
-   calls catch_errors might not be set up to deal with a quit which
-   isn't caught.  But if the code can deal with it, it generally
-   should be RETURN_MASK_ERROR, unless for some reason it is more
-   useful to abort only the portion of the operation inside the
-   catch_errors.  Note that quit should return to the command line
-   fairly quickly, even if some further processing is being done.  */
-
-int
-catch_errors (func, args, errstring, mask)
-     int (*func) PARAMS ((char *));
-     PTR args;
-     char *errstring;
-     return_mask mask;
-{
-  jmp_buf saved_error;
-  jmp_buf saved_quit;
-  jmp_buf tmp_jmp;
-  int val;
-  struct cleanup *saved_cleanup_chain;
-  char *saved_error_pre_print;
-
-  saved_cleanup_chain = save_cleanups ();
-  saved_error_pre_print = error_pre_print;
-
-  if (mask & RETURN_MASK_ERROR)
-    memcpy ((char *)saved_error, (char *)error_return, sizeof (jmp_buf));
-  if (mask & RETURN_MASK_QUIT)
-    memcpy (saved_quit, quit_return, sizeof (jmp_buf));
-  error_pre_print = errstring;
-
-  if (setjmp (tmp_jmp) == 0)
-    {
-      if (mask & RETURN_MASK_ERROR)
-	memcpy (error_return, tmp_jmp, sizeof (jmp_buf));
-      if (mask & RETURN_MASK_QUIT)
-	memcpy (quit_return, tmp_jmp, sizeof (jmp_buf));
-      val = (*func) (args);
-    }
-  else
-    val = 0;
-
-  restore_cleanups (saved_cleanup_chain);
-
-  error_pre_print = saved_error_pre_print;
-  if (mask & RETURN_MASK_ERROR)
-    memcpy (error_return, saved_error, sizeof (jmp_buf));
-  if (mask & RETURN_MASK_QUIT)
-    memcpy (quit_return, saved_quit, sizeof (jmp_buf));
-  return val;
-}
-
-/* Handler for SIGHUP.  */
-
-static void
-disconnect (signo)
-int signo;
-{
-  catch_errors (quit_cover, NULL,
-		"Could not kill the program being debugged", RETURN_MASK_ALL);
-  signal (SIGHUP, SIG_DFL);
-  kill (getpid (), SIGHUP);
-}
-
-/* Just a little helper function for disconnect().  */
-
-static int
-quit_cover (s)
-char *s;
-{
-  caution = 0;		/* Throw caution to the wind -- we're exiting.
-			   This prevents asking the user dumb questions.  */
-  quit_command((char *)0, 0);
-  return 0;
-}
-
-/* Line number we are currently in in a file which is being sourced.  */
-static int source_line_number;
-
-/* Name of the file we are sourcing.  */
-static char *source_file_name;
-
-/* Buffer containing the error_pre_print used by the source stuff.
-   Malloc'd.  */
-static char *source_error;
-static int source_error_allocated;
-
-/* Something to glom on to the start of error_pre_print if source_file_name
-   is set.  */
-static char *source_pre_error;
-
-/* Clean up on error during a "source" command (or execution of a
-   user-defined command).  */
-
-static void
-source_cleanup (stream)
-     FILE *stream;
-{
-  /* Restore the previous input stream.  */
-  instream = stream;
-}
-
-/* Read commands from STREAM.  */
-static void
-read_command_file (stream)
-     FILE *stream;
-{
-  struct cleanup *cleanups;
-
-  cleanups = make_cleanup (source_cleanup, instream);
-  instream = stream;
-  command_loop ();
-  do_cleanups (cleanups);
-}
-
-extern void init_proc ();
-
-void
-gdb_init ()
-{
-  /* Run the init function of each source file */
-
-  init_cmd_lists ();	/* This needs to be done first */
-  initialize_all_files ();
-  init_main ();		/* But that omits this file!  Do it now */
-  init_signals ();
-
-  init_proc ();
-
-  /* We need a default language for parsing expressions, so simple things like
-     "set width 0" won't fail if no language is explicitly set in a config file
-     or implicitly set by reading an executable during startup. */
-  set_language (language_c);
-  expected_language = current_language;	/* don't warn about the change.  */
-}
-
-#ifndef MAIN_OVERRIDE
 int
 main (argc, argv)
      int argc;
@@ -584,9 +93,8 @@ main (argc, argv)
   /* Drop into MacsBug, but only if the executable is specially named. */
   if (strcmp(argv[0], "DEBUGGDB") == 0)
     DebugStr("\pat start of GDB main");
-
-  if (StandAlone)
-    mac_app = mac_init ();
+  /* Do all Mac-specific setup. */
+  mac_init ();
 #endif /* MPW */
 /* end-sanitize-mpw */
   /* This needs to happen before the first use of malloc.  */
@@ -1049,2000 +557,11 @@ proc_remove_foreign (pid)
      int pid;
 {
 }
-#endif /* MAIN_OVERRIDE */
-
-void
-execute_user_command (c, args)
-     struct cmd_list_element *c;
-     char *args;
-{
-  register struct command_line *cmdlines;
-  struct cleanup *old_chain;
-  
-  if (args)
-    error ("User-defined commands cannot take arguments.");
-
-  cmdlines = c->user_commands;
-  if (cmdlines == 0)
-    /* Null command */
-    return;
-
-  /* Set the instream to 0, indicating execution of a
-     user-defined function.  */
-  old_chain = make_cleanup (source_cleanup, instream);
-  instream = (FILE *) 0;
-  while (cmdlines)
-    {
-      execute_command (cmdlines->line, 0);
-      cmdlines = cmdlines->next;
-    }
-  do_cleanups (old_chain);
-}
-
-/* Execute the line P as a command.
-   Pass FROM_TTY as second argument to the defining function.  */
-
-void
-execute_command (p, from_tty)
-     char *p;
-     int from_tty;
-{
-  register struct cmd_list_element *c;
-  register enum language flang;
-  static int warned = 0;
-
-  free_all_values ();
-
-  /* This can happen when command_line_input hits end of file.  */
-  if (p == NULL)
-      return;
-  
-  while (*p == ' ' || *p == '\t') p++;
-  if (*p)
-    {
-      char *arg;
-      
-      c = lookup_cmd (&p, cmdlist, "", 0, 1);
-      /* Pass null arg rather than an empty one.  */
-      arg = *p ? p : 0;
-
-      /* If this command has been hooked, run the hook first. */
-      if (c->hook)
-	execute_user_command (c->hook, (char *)0);
-
-      if (c->class == class_user)
-	execute_user_command (c, arg);
-      else if (c->type == set_cmd || c->type == show_cmd)
-	do_setshow_command (arg, from_tty & caution, c);
-      else if (c->function.cfunc == NO_FUNCTION)
-	error ("That is not a command, just a help topic.");
-      else
-	(*c->function.cfunc) (arg, from_tty & caution);
-   }
-
-  /* Tell the user if the language has changed (except first time).  */
-  if (current_language != expected_language)
-  {
-    if (language_mode == language_mode_auto) {
-      language_info (1);	/* Print what changed.  */
-    }
-    warned = 0;
-  }
-
-  /* Warn the user if the working language does not match the
-     language of the current frame.  Only warn the user if we are
-     actually running the program, i.e. there is a stack. */
-  /* FIXME:  This should be cacheing the frame and only running when
-     the frame changes.  */
-  if (target_has_stack)
-  {
-    flang = get_frame_language ();
-    if (!warned
-        && flang != language_unknown
-	&& flang != current_language->la_language)
-    {
-      printf_filtered ("%s\n", lang_frame_mismatch_warn);
-      warned = 1;
-    }
-  }
-}
-
-/* ARGSUSED */
-static void
-command_loop_marker (foo)
-     int foo;
-{
-}
-
-/* Read commands from `instream' and execute them
-   until end of file or error reading instream.  */
-static void
-command_loop ()
-{
-  struct cleanup *old_chain;
-  char *command;
-  int stdin_is_tty = ISATTY (stdin);
-
-  while (!feof (instream))
-    {
-      if (window_hook && instream == stdin)
-	(*window_hook) (instream, prompt);
-
-      quit_flag = 0;
-      if (instream == stdin && stdin_is_tty)
-	reinitialize_more_filter ();
-      old_chain = make_cleanup (command_loop_marker, 0);
-      command = command_line_input (instream == stdin ? prompt : (char *) NULL,
-				    instream == stdin, "prompt");
-      if (command == 0)
-	return;
-      execute_command (command, instream == stdin);
-      /* Do any commands attached to breakpoint we stopped at.  */
-      bpstat_do_actions (&stop_bpstat);
-      do_cleanups (old_chain);
-    }
-}
-
-/* Commands call this if they do not want to be repeated by null lines.  */
-
-void
-dont_repeat ()
-{
-  if (server_command)
-    return;
-
-  /* If we aren't reading from standard input, we are saving the last
-     thing read from stdin in line and don't want to delete it.  Null lines
-     won't repeat here in any case.  */
-  if (instream == stdin)
-    *line = 0;
-}
-
-/* Read a line from the stream "instream" without command line editing.
-
-   It prints PRROMPT once at the start.
-   Action is compatible with "readline", e.g. space for the result is 
-   malloc'd and should be freed by the caller.
-
-   A NULL return means end of file.  */
-char *
-gdb_readline (prrompt)
-     char *prrompt;
-{
-  int c;
-  char *result;
-  int input_index = 0;
-  int result_size = 80;
-
-  if (prrompt)
-    {
-      /* Don't use a _filtered function here.  It causes the assumed
-	 character position to be off, since the newline we read from
-	 the user is not accounted for.  */
-      fputs_unfiltered (prrompt, gdb_stdout);
-/* start-sanitize-mpw */
-#ifdef MPW
-      /* Move to a new line so the entered line doesn't have a prompt
-	 on the front of it. */
-      fputs_unfiltered ("\n", gdb_stdout);
-#endif /* MPW */
-/* end-sanitize-mpw */
-      gdb_flush (gdb_stdout);
-    }
-  
-  result = (char *) xmalloc (result_size);
-
-  while (1)
-    {
-      /* Read from stdin if we are executing a user defined command.
-	 This is the right thing for prompt_for_continue, at least.  */
-      c = fgetc (instream ? instream : stdin);
-
-      if (c == EOF)
-	{
-	  if (input_index > 0)
-	    /* The last line does not end with a newline.  Return it, and
-	       if we are called again fgetc will still return EOF and
-	       we'll return NULL then.  */
-	    break;
-	  free (result);
-	  return NULL;
-	}
-
-      if (c == '\n')
-	break;
-
-      result[input_index++] = c;
-      while (input_index >= result_size)
-	{
-	  result_size *= 2;
-	  result = (char *) xrealloc (result, result_size);
-	}
-    }
-
-  result[input_index++] = '\0';
-  return result;
-}
-
-/* Variables which control command line editing and history
-   substitution.  These variables are given default values at the end
-   of this file.  */
-static int command_editing_p;
-static int history_expansion_p;
-static int write_history_p;
-static int history_size;
-static char *history_filename;
-
-/* readline uses the word breaks for two things:
-   (1) In figuring out where to point the TEXT parameter to the
-   rl_completion_entry_function.  Since we don't use TEXT for much,
-   it doesn't matter a lot what the word breaks are for this purpose, but
-   it does affect how much stuff M-? lists.
-   (2) If one of the matches contains a word break character, readline
-   will quote it.  That's why we switch between
-   gdb_completer_word_break_characters and
-   gdb_completer_command_word_break_characters.  I'm not sure when
-   we need this behavior (perhaps for funky characters in C++ symbols?).  */
-
-/* Variables which are necessary for fancy command line editing.  */
-char *gdb_completer_word_break_characters =
-  " \t\n!@#$%^&*()+=|~`}{[]\"';:?/>.<,-";
-
-/* When completing on command names, we remove '-' from the list of
-   word break characters, since we use it in command names.  If the
-   readline library sees one in any of the current completion strings,
-   it thinks that the string needs to be quoted and automatically supplies
-   a leading quote. */
-char *gdb_completer_command_word_break_characters =
-  " \t\n!@#$%^&*()+=|~`}{[]\"';:?/>.<,";
-
-/* Characters that can be used to quote completion strings.  Note that we
-   can't include '"' because the gdb C parser treats such quoted sequences
-   as strings. */
-char *gdb_completer_quote_characters =
-  "'";
-
-/* Functions that are used as part of the fancy command line editing.  */
-
-/* This can be used for functions which don't want to complete on symbols
-   but don't want to complete on anything else either.  */
-/* ARGSUSED */
-char **
-noop_completer (text, prefix)
-     char *text;
-     char *prefix;
-{
-  return NULL;
-}
-
-/* Complete on filenames.  */
-char **
-filename_completer (text, word)
-     char *text;
-     char *word;
-{
-  /* From readline.  */
-  extern char *filename_completion_function ();
-  int subsequent_name;
-  char **return_val;
-  int return_val_used;
-  int return_val_alloced;
-
-  return_val_used = 0;
-  /* Small for testing.  */
-  return_val_alloced = 1;
-  return_val = (char **) xmalloc (return_val_alloced * sizeof (char *));
-
-  subsequent_name = 0;
-  while (1)
-    {
-      char *p;
-      p = filename_completion_function (text, subsequent_name);
-      if (return_val_used >= return_val_alloced)
-	{
-	  return_val_alloced *= 2;
-	  return_val =
-	    (char **) xrealloc (return_val,
-				return_val_alloced * sizeof (char *));
-	}
-      if (p == NULL)
-	{
-	  return_val[return_val_used++] = p;
-	  break;
-	}
-      /* Like emacs, don't complete on old versions.  Especially useful
-	 in the "source" command.  */
-      if (p[strlen (p) - 1] == '~')
-	continue;
-
-      {
-	char *q;
-	if (word == text)
-	  /* Return exactly p.  */
-	  return_val[return_val_used++] = p;
-	else if (word > text)
-	  {
-	    /* Return some portion of p.  */
-	    q = xmalloc (strlen (p) + 5);
-	    strcpy (q, p + (word - text));
-	    return_val[return_val_used++] = q;
-	    free (p);
-	  }
-	else
-	  {
-	    /* Return some of TEXT plus p.  */
-	    q = xmalloc (strlen (p) + (text - word) + 5);
-	    strncpy (q, word, text - word);
-	    q[text - word] = '\0';
-	    strcat (q, p);
-	    return_val[return_val_used++] = q;
-	    free (p);
-	  }
-      }
-      subsequent_name = 1;
-    }
-#if 0
-  /* There is no way to do this just long enough to affect quote inserting
-     without also affecting the next completion.  This should be fixed in
-     readline.  FIXME.  */
-  /* Insure that readline does the right thing
-     with respect to inserting quotes.  */
-  rl_completer_word_break_characters = "";
-#endif
-  return return_val;
-}
-
-/* Here are some useful test cases for completion.  FIXME: These should
-   be put in the test suite.  They should be tested with both M-? and TAB.
-
-   "show output-" "radix"
-   "show output" "-radix"
-   "p" ambiguous (commands starting with p--path, print, printf, etc.)
-   "p "  ambiguous (all symbols)
-   "info t foo" no completions
-   "info t " no completions
-   "info t" ambiguous ("info target", "info terminal", etc.)
-   "info ajksdlfk" no completions
-   "info ajksdlfk " no completions
-   "info" " "
-   "info " ambiguous (all info commands)
-   "p \"a" no completions (string constant)
-   "p 'a" ambiguous (all symbols starting with a)
-   "p b-a" ambiguous (all symbols starting with a)
-   "p b-" ambiguous (all symbols)
-   "file Make" "file" (word break hard to screw up here)
-   "file ../gdb.stabs/we" "ird" (needs to not break word at slash)
-   */
-
-/* Generate completions one by one for the completer.  Each time we are
-   called return another potential completion to the caller.  The function
-   is misnamed; it just completes on commands or passes the buck to the
-   command's completer function; the stuff specific to symbol completion
-   is in make_symbol_completion_list.
-
-   TEXT is readline's idea of the "word" we are looking at; we don't really
-   like readline's ideas about word breaking so we ignore it.
-
-   MATCHES is the number of matches that have currently been collected from
-   calling this completion function.  When zero, then we need to initialize,
-   otherwise the initialization has already taken place and we can just
-   return the next potential completion string.
-
-   Returns NULL if there are no more completions, else a pointer to a string
-   which is a possible completion.
-
-   RL_LINE_BUFFER is available to be looked at; it contains the entire text
-   of the line.  RL_POINT is the offset in that line of the cursor.  You
-   should pretend that the line ends at RL_POINT. */
-
-static char *
-symbol_completion_function (text, matches)
-     char *text;
-     int matches;
-{
-  static char **list = (char **)NULL;		/* Cache of completions */
-  static int index;				/* Next cached completion */
-  char *output = NULL;
-  char *tmp_command, *p;
-  /* Pointer within tmp_command which corresponds to text.  */
-  char *word;
-  struct cmd_list_element *c, *result_list;
-
-  if (matches == 0)
-    {
-      /* The caller is beginning to accumulate a new set of completions, so
-	 we need to find all of them now, and cache them for returning one at
-	 a time on future calls. */
-
-      if (list)
-	{
-	  /* Free the storage used by LIST, but not by the strings inside.
-	     This is because rl_complete_internal () frees the strings. */
-	  free ((PTR)list);
-	}
-      list = 0;
-      index = 0;
-
-      /* Choose the default set of word break characters to break completions.
-	 If we later find out that we are doing completions on command strings
-	 (as opposed to strings supplied by the individual command completer
-	 functions, which can be any string) then we will switch to the
-	 special word break set for command strings, which leaves out the
-	 '-' character used in some commands.  */
-
-      rl_completer_word_break_characters =
-	  gdb_completer_word_break_characters;
-
-      /* Decide whether to complete on a list of gdb commands or on symbols. */
-      tmp_command = (char *) alloca (rl_point + 1);
-      p = tmp_command;
-
-      strncpy (tmp_command, rl_line_buffer, rl_point);
-      tmp_command[rl_point] = '\0';
-      /* Since text always contains some number of characters leading up
-	 to rl_point, we can find the equivalent position in tmp_command
-	 by subtracting that many characters from the end of tmp_command.  */
-      word = tmp_command + rl_point - strlen (text);
-
-      if (rl_point == 0)
-	{
-	  /* An empty line we want to consider ambiguous; that is, it
-	     could be any command.  */
-	  c = (struct cmd_list_element *) -1;
-	  result_list = 0;
-	}
-      else
-	{
-	  c = lookup_cmd_1 (&p, cmdlist, &result_list, 1);
-	}
-
-      /* Move p up to the next interesting thing.  */
-      while (*p == ' ' || *p == '\t')
-	{
-	  p++;
-	}
-
-      if (!c)
-	{
-	  /* It is an unrecognized command.  So there are no
-	     possible completions.  */
-	  list = NULL;
-	}
-      else if (c == (struct cmd_list_element *) -1)
-	{
-	  char *q;
-
-	  /* lookup_cmd_1 advances p up to the first ambiguous thing, but
-	     doesn't advance over that thing itself.  Do so now.  */
-	  q = p;
-	  while (*q && (isalnum (*q) || *q == '-' || *q == '_'))
-	    ++q;
-	  if (q != tmp_command + rl_point)
-	    {
-	      /* There is something beyond the ambiguous
-		 command, so there are no possible completions.  For
-		 example, "info t " or "info t foo" does not complete
-		 to anything, because "info t" can be "info target" or
-		 "info terminal".  */
-	      list = NULL;
-	    }
-	  else
-	    {
-	      /* We're trying to complete on the command which was ambiguous.
-		 This we can deal with.  */
-	      if (result_list)
-		{
-		  list = complete_on_cmdlist (*result_list->prefixlist, p,
-					      word);
-		}
-	      else
-		{
-		  list = complete_on_cmdlist (cmdlist, p, word);
-		}
-	      /* Insure that readline does the right thing with respect to
-		 inserting quotes.  */
-	      rl_completer_word_break_characters =
-		gdb_completer_command_word_break_characters;
-	    }
-	}
-      else
-	{
-	  /* We've recognized a full command.  */
-
-	  if (p == tmp_command + rl_point)
-	    {
-	      /* There is no non-whitespace in the line beyond the command.  */
-
-	      if (p[-1] == ' ' || p[-1] == '\t')
-		{
-		  /* The command is followed by whitespace; we need to complete
-		     on whatever comes after command.  */
-		  if (c->prefixlist)
-		    {
-		      /* It is a prefix command; what comes after it is
-			 a subcommand (e.g. "info ").  */
-		      list = complete_on_cmdlist (*c->prefixlist, p, word);
-
-		      /* Insure that readline does the right thing
-			 with respect to inserting quotes.  */
-		      rl_completer_word_break_characters =
-			gdb_completer_command_word_break_characters;
-		    }
-		  else
-		    {
-		      /* It is a normal command; what comes after it is
-			 completed by the command's completer function.  */
-		      list = (*c->completer) (p, word);
-		    }
-		}
-	      else
-		{
-		  /* The command is not followed by whitespace; we need to
-		     complete on the command itself.  e.g. "p" which is a
-		     command itself but also can complete to "print", "ptype"
-		     etc.  */
-		  char *q;
-
-		  /* Find the command we are completing on.  */
-		  q = p;
-		  while (q > tmp_command)
-		    {
-		      if (isalnum (q[-1]) || q[-1] == '-' || q[-1] == '_')
-			--q;
-		      else
-			break;
-		    }
-
-		  list = complete_on_cmdlist (result_list, q, word);
-
-		  /* Insure that readline does the right thing
-		     with respect to inserting quotes.  */
-		  rl_completer_word_break_characters =
-		    gdb_completer_command_word_break_characters;
-		}
-	    }
-	  else
-	    {
-	      /* There is non-whitespace beyond the command.  */
-
-	      if (c->prefixlist && !c->allow_unknown)
-		{
-		  /* It is an unrecognized subcommand of a prefix command,
-		     e.g. "info adsfkdj".  */
-		  list = NULL;
-		}
-	      else
-		{
-		  /* It is a normal command.  */
-		  list = (*c->completer) (p, word);
-		}
-	    }
-	}
-    }
-
-  /* If we found a list of potential completions during initialization then
-     dole them out one at a time.  The vector of completions is NULL
-     terminated, so after returning the last one, return NULL (and continue
-     to do so) each time we are called after that, until a new list is
-     available. */
-
-  if (list)
-    {
-      output = list[index];
-      if (output)
-	{
-	  index++;
-	}
-    }
-
-#if 0
-  /* Can't do this because readline hasn't yet checked the word breaks
-     for figuring out whether to insert a quote.  */
-  if (output == NULL)
-    /* Make sure the word break characters are set back to normal for the
-       next time that readline tries to complete something.  */
-    rl_completer_word_break_characters =
-      gdb_completer_word_break_characters;
-#endif
-
-  return (output);
-}
-
-/* Skip over a possibly quoted word (as defined by the quote characters
-   and word break characters the completer uses).  Returns pointer to the
-   location after the "word". */
-
-char *
-skip_quoted (str)
-     char *str;
-{
-  char quote_char = '\0';
-  char *scan;
-
-  for (scan = str; *scan != '\0'; scan++)
-    {
-      if (quote_char != '\0')
-	{
-	  /* Ignore everything until the matching close quote char */
-	  if (*scan == quote_char)
-	    {
-	      /* Found matching close quote. */
-	      scan++;
-	      break;
-	    }
-	}
-      else if (strchr (gdb_completer_quote_characters, *scan))
-	{
-	  /* Found start of a quoted string. */
-	  quote_char = *scan;
-	}
-      else if (strchr (gdb_completer_word_break_characters, *scan))
-	{
-	  break;
-	}
-    }
-  return (scan);
-}
-
-
-#ifdef STOP_SIGNAL
-static void
-stop_sig (signo)
-int signo;
-{
-#if STOP_SIGNAL == SIGTSTP
-  signal (SIGTSTP, SIG_DFL);
-  sigsetmask (0);
-  kill (getpid (), SIGTSTP);
-  signal (SIGTSTP, stop_sig);
-#else
-  signal (STOP_SIGNAL, stop_sig);
-#endif
-  printf_unfiltered ("%s", prompt);
-  gdb_flush (gdb_stdout);
-
-  /* Forget about any previous command -- null line now will do nothing.  */
-  dont_repeat ();
-}
-#endif /* STOP_SIGNAL */
-
-/* Initialize signal handlers. */
-static void
-do_nothing (signo)
-int signo;
-{
-}
-
-static void
-init_signals ()
-{
-  signal (SIGINT, request_quit);
-
-  /* If we initialize SIGQUIT to SIG_IGN, then the SIG_IGN will get
-     passed to the inferior, which we don't want.  It would be
-     possible to do a "signal (SIGQUIT, SIG_DFL)" after we fork, but
-     on BSD4.3 systems using vfork, that can affect the
-     GDB process as well as the inferior (the signal handling tables
-     might be in memory, shared between the two).  Since we establish
-     a handler for SIGQUIT, when we call exec it will set the signal
-     to SIG_DFL for us.  */
-  signal (SIGQUIT, do_nothing);
-  if (signal (SIGHUP, do_nothing) != SIG_IGN)
-    signal (SIGHUP, disconnect);
-  signal (SIGFPE, float_handler);
-
-#if defined(SIGWINCH) && defined(SIGWINCH_HANDLER)
-  signal (SIGWINCH, SIGWINCH_HANDLER);
-#endif
-}
-
-/* Read one line from the command input stream `instream'
-   into the local static buffer `linebuffer' (whose current length
-   is `linelength').
-   The buffer is made bigger as necessary.
-   Returns the address of the start of the line.
-
-   NULL is returned for end of file.
-
-   *If* the instream == stdin & stdin is a terminal, the line read
-   is copied into the file line saver (global var char *line,
-   length linesize) so that it can be duplicated.
-
-   This routine either uses fancy command line editing or
-   simple input as the user has requested.  */
-
-char *
-command_line_input (prrompt, repeat, annotation_suffix)
-     char *prrompt;
-     int repeat;
-     char *annotation_suffix;
-{
-  static char *linebuffer = 0;
-  static unsigned linelength = 0;
-  register char *p;
-  char *p1;
-  char *rl;
-  char *local_prompt = prrompt;
-  register int c;
-  char *nline;
-  char got_eof = 0;
-
-  if (annotation_level > 1 && instream == stdin)
-    {
-      local_prompt = alloca ((prrompt == NULL ? 0 : strlen (prrompt))
-			     + strlen (annotation_suffix) + 40);
-      if (prrompt == NULL)
-	local_prompt[0] = '\0';
-      else
-	strcpy (local_prompt, prrompt);
-      strcat (local_prompt, "\n\032\032");
-      strcat (local_prompt, annotation_suffix);
-      strcat (local_prompt, "\n");
-    }
-
-  if (linebuffer == 0)
-    {
-      linelength = 80;
-      linebuffer = (char *) xmalloc (linelength);
-    }
-
-  p = linebuffer;
-
-  /* Control-C quits instantly if typed while in this loop
-     since it should not wait until the user types a newline.  */
-  immediate_quit++;
-#ifdef STOP_SIGNAL
-  if (job_control)
-    signal (STOP_SIGNAL, stop_sig);
-#endif
-
-  while (1)
-    {
-      /* Make sure that all output has been output.  Some machines may let
-	 you get away with leaving out some of the gdb_flush, but not all.  */
-      wrap_here ("");
-      gdb_flush (gdb_stdout);
-      gdb_flush (gdb_stderr);
-
-      if (source_file_name != NULL)
-	{
-	  ++source_line_number;
-	  sprintf (source_error,
-		   "%s%s:%d: Error in sourced command file:\n",
-		   source_pre_error,
-		   source_file_name,
-		   source_line_number);
-	  error_pre_print = source_error;
-	}
-
-      if (annotation_level > 1 && instream == stdin)
-	{
-	  printf_unfiltered ("\n\032\032pre-");
-	  printf_unfiltered (annotation_suffix);
-	  printf_unfiltered ("\n");
-	}
-
-      /* Don't use fancy stuff if not talking to stdin.  */
-      if (command_editing_p && instream == stdin
-	  && ISATTY (instream))
-	rl = readline (local_prompt);
-      else
-	rl = gdb_readline (local_prompt);
-
-      if (annotation_level > 1 && instream == stdin)
-	{
-	  printf_unfiltered ("\n\032\032post-");
-	  printf_unfiltered (annotation_suffix);
-	  printf_unfiltered ("\n");
-	}
-
-      if (!rl || rl == (char *) EOF)
-	{
-	  got_eof = 1;
-	  break;
-	}
-      if (strlen(rl) + 1 + (p - linebuffer) > linelength)
-	{
-	  linelength = strlen(rl) + 1 + (p - linebuffer);
-	  nline = (char *) xrealloc (linebuffer, linelength);
-	  p += nline - linebuffer;
-	  linebuffer = nline;
-	}
-      p1 = rl;
-      /* Copy line.  Don't copy null at end.  (Leaves line alone
-         if this was just a newline)  */
-      while (*p1)
-	*p++ = *p1++;
-
-      free (rl);			/* Allocated in readline.  */
-
-      if (p == linebuffer || *(p - 1) != '\\')
-	break;
-
-      p--;			/* Put on top of '\'.  */
-      local_prompt = (char *) 0;
-  }
-
-#ifdef STOP_SIGNAL
-  if (job_control)
-    signal (STOP_SIGNAL, SIG_DFL);
-#endif
-  immediate_quit--;
-
-  if (got_eof)
-    return NULL;
-
-#define SERVER_COMMAND_LENGTH 7
-  server_command =
-    (p - linebuffer > SERVER_COMMAND_LENGTH)
-      && STREQN (linebuffer, "server ", SERVER_COMMAND_LENGTH);
-  if (server_command)
-    {
-      /* Note that we don't set `line'.  Between this and the check in
-	 dont_repeat, this insures that repeating will still do the
-	 right thing.  */
-      *p = '\0';
-      return linebuffer + SERVER_COMMAND_LENGTH;
-    }
-
-  /* Do history expansion if that is wished.  */
-  if (history_expansion_p && instream == stdin
-      && ISATTY (instream))
-    {
-      char *history_value;
-      int expanded;
-
-      *p = '\0';		/* Insert null now.  */
-      expanded = history_expand (linebuffer, &history_value);
-      if (expanded)
-	{
-	  /* Print the changes.  */
-	  printf_unfiltered ("%s\n", history_value);
-
-	  /* If there was an error, call this function again.  */
-	  if (expanded < 0)
-	    {
-	      free (history_value);
-	      return command_line_input (prrompt, repeat, annotation_suffix);
-	    }
-	  if (strlen (history_value) > linelength)
-	    {
-	      linelength = strlen (history_value) + 1;
-	      linebuffer = (char *) xrealloc (linebuffer, linelength);
-	    }
-	  strcpy (linebuffer, history_value);
-	  p = linebuffer + strlen(linebuffer);
-	  free (history_value);
-	}
-    }
-
-  /* If we just got an empty line, and that is supposed
-     to repeat the previous command, return the value in the
-     global buffer.  */
-  if (repeat)
-    {
-      if (p == linebuffer)
-	return line;
-      p1 = linebuffer;
-      while (*p1 == ' ' || *p1 == '\t')
-	p1++;
-      if (!*p1)
-	return line;
-    }
-
-  *p = 0;
-
-  /* Add line to history if appropriate.  */
-  if (instream == stdin
-      && ISATTY (stdin) && *linebuffer)
-    add_history (linebuffer);
-
-  /* Note: lines consisting solely of comments are added to the command
-     history.  This is useful when you type a command, and then
-     realize you don't want to execute it quite yet.  You can comment
-     out the command and then later fetch it from the value history
-     and remove the '#'.  The kill ring is probably better, but some
-     people are in the habit of commenting things out.  */
-  p1 = linebuffer;
-  while ((c = *p1++) != '\0')
-    {
-      if (c == '"')
-	while ((c = *p1++) != '"')
-	  {
-	    /* Make sure an escaped '"' doesn't make us think the string
-	       is ended.  */
-	    if (c == '\\')
-	      parse_escape (&p1);
-	    if (c == '\0')
-	      break;
-	  }
-      else if (c == '\'')
-	while ((c = *p1++) != '\'')
-	  {
-	    /* Make sure an escaped '\'' doesn't make us think the string
-	       is ended.  */
-	    if (c == '\\')
-	      parse_escape (&p1);
-	    if (c == '\0')
-	      break;
-	  }
-      else if (c == '#')
-	{
-	  /* Found a comment.  */
-	  p1[-1] = '\0';
-	  break;
-	}
-    }
-
-  /* Save into global buffer if appropriate.  */
-  if (repeat)
-    {
-      if (linelength > linesize)
-	{
-	  line = xrealloc (line, linelength);
-	  linesize = linelength;
-	}
-      strcpy (line, linebuffer);
-      return line;
-    }
-
-  return linebuffer;
-}
-
-/* Read lines from the input stream
-   and accumulate them in a chain of struct command_line's
-   which is then returned.  */
-
-struct command_line *
-read_command_lines ()
-{
-  struct command_line *first = 0;
-  register struct command_line *next, *tail = 0;
-  register char *p, *p1;
-  struct cleanup *old_chain = 0;
-
-  while (1)
-    {
-      dont_repeat ();
-      p = command_line_input ((char *) NULL, instream == stdin, "commands");
-      if (p == NULL)
-	/* Treat end of file like "end".  */
-	break;
-      
-      /* Remove leading and trailing blanks.  */
-      while (*p == ' ' || *p == '\t') p++;
-      p1 = p + strlen (p);
-      while (p1 != p && (p1[-1] == ' ' || p1[-1] == '\t')) p1--;
-
-      /* Is this "end"?  */
-      if (p1 - p == 3 && !strncmp (p, "end", 3))
-	break;
-
-      /* No => add this line to the chain of command lines.  */
-      next = (struct command_line *) xmalloc (sizeof (struct command_line));
-      next->line = savestring (p, p1 - p);
-      next->next = 0;
-      if (tail)
-	{
-	  tail->next = next;
-	}
-      else
-	{
-	  /* We just read the first line.
-	     From now on, arrange to throw away the lines we have
-	     if we quit or get an error while inside this function.  */
-	  first = next;
-	  old_chain = make_cleanup (free_command_lines, &first);
-	}
-      tail = next;
-    }
-
-  dont_repeat ();
-
-  /* Now we are about to return the chain to our caller,
-     so freeing it becomes his responsibility.  */
-  if (first)
-    discard_cleanups (old_chain);
-  return first;
-}
-
-/* Free a chain of struct command_line's.  */
-
-void
-free_command_lines (lptr)
-      struct command_line **lptr;
-{
-  register struct command_line *l = *lptr;
-  register struct command_line *next;
-
-  while (l)
-    {
-      next = l->next;
-      free (l->line);
-      free ((PTR)l);
-      l = next;
-    }
-}
-
-/* Add an element to the list of info subcommands.  */
-
-void
-add_info (name, fun, doc)
-     char *name;
-     void (*fun) PARAMS ((char *, int));
-     char *doc;
-{
-  add_cmd (name, no_class, fun, doc, &infolist);
-}
-
-/* Add an alias to the list of info subcommands.  */
-
-void
-add_info_alias (name, oldname, abbrev_flag)
-     char *name;
-     char *oldname;
-     int abbrev_flag;
-{
-  add_alias_cmd (name, oldname, 0, abbrev_flag, &infolist);
-}
-
-/* The "info" command is defined as a prefix, with allow_unknown = 0.
-   Therefore, its own definition is called only for "info" with no args.  */
-
-/* ARGSUSED */
-static void
-info_command (arg, from_tty)
-     char *arg;
-     int from_tty;
-{
-  printf_unfiltered ("\"info\" must be followed by the name of an info command.\n");
-  help_list (infolist, "info ", -1, gdb_stdout);
-}
-
-/* The "complete" command is used by Emacs to implement completion.  */
-
-/* ARGSUSED */
-static void
-complete_command (arg, from_tty)
-     char *arg;
-     int from_tty;
-{
-  int i;
-  char *completion;
-
-  dont_repeat ();
-
-  if (arg == NULL)
-    {
-      rl_line_buffer[0] = '\0';
-      rl_point = 0;
-    }
-  else
-    {
-      strcpy (rl_line_buffer, arg);
-      rl_point = strlen (arg);
-    }
-
-  for (completion = symbol_completion_function (rl_line_buffer, i = 0);
-       completion;
-       completion = symbol_completion_function (rl_line_buffer, ++i))
-    printf_unfiltered ("%s\n", completion);
-}
-
-/* The "show" command with no arguments shows all the settings.  */
-
-/* ARGSUSED */
-static void
-show_command (arg, from_tty)
-     char *arg;
-     int from_tty;
-{
-  cmd_show_list (showlist, from_tty, "");
-}
-
-/* Add an element to the list of commands.  */
-
-void
-add_com (name, class, fun, doc)
-     char *name;
-     enum command_class class;
-     void (*fun) PARAMS ((char *, int));
-     char *doc;
-{
-  add_cmd (name, class, fun, doc, &cmdlist);
-}
-
-/* Add an alias or abbreviation command to the list of commands.  */
-
-void
-add_com_alias (name, oldname, class, abbrev_flag)
-     char *name;
-     char *oldname;
-     enum command_class class;
-     int abbrev_flag;
-{
-  add_alias_cmd (name, oldname, class, abbrev_flag, &cmdlist);
-}
-
-void
-error_no_arg (why)
-     char *why;
-{
-  error ("Argument required (%s).", why);
-}
-
-/* ARGSUSED */
-static void
-help_command (command, from_tty)
-     char *command;
-     int from_tty; /* Ignored */
-{
-  help_cmd (command, gdb_stdout);
-}
-
-static void
-validate_comname (comname)
-     char *comname;
-{
-  register char *p;
-
-  if (comname == 0)
-    error_no_arg ("name of command to define");
-
-  p = comname;
-  while (*p)
-    {
-      if (!isalnum(*p) && *p != '-')
-	error ("Junk in argument list: \"%s\"", p);
-      p++;
-    }
-}
-
-/* This is just a placeholder in the command data structures.  */
-static void
-user_defined_command (ignore, from_tty)
-     char *ignore;
-     int from_tty;
-{
-}
-
-static void
-define_command (comname, from_tty)
-     char *comname;
-     int from_tty;
-{
-  register struct command_line *cmds;
-  register struct cmd_list_element *c, *newc, *hookc = 0;
-  char *tem = comname;
-#define	HOOK_STRING	"hook-"
-#define	HOOK_LEN 5
-
-  validate_comname (comname);
-
-  /* Look it up, and verify that we got an exact match.  */
-  c = lookup_cmd (&tem, cmdlist, "", -1, 1);
-  if (c && !STREQ (comname, c->name))
-    c = 0;
-    
-  if (c)
-    {
-      if (c->class == class_user || c->class == class_alias)
-	tem = "Redefine command \"%s\"? ";
-      else
-	tem = "Really redefine built-in command \"%s\"? ";
-      if (!query (tem, c->name))
-	error ("Command \"%s\" not redefined.", c->name);
-    }
-
-  /* If this new command is a hook, then mark the command which it
-     is hooking.  Note that we allow hooking `help' commands, so that
-     we can hook the `stop' pseudo-command.  */
-
-  if (!strncmp (comname, HOOK_STRING, HOOK_LEN))
-    {
-      /* Look up cmd it hooks, and verify that we got an exact match.  */
-      tem = comname+HOOK_LEN;
-      hookc = lookup_cmd (&tem, cmdlist, "", -1, 0);
-      if (hookc && !STREQ (comname+HOOK_LEN, hookc->name))
-	hookc = 0;
-      if (!hookc)
-	{
-	  warning ("Your new `%s' command does not hook any existing command.",
-		   comname);
-	  if (!query ("Proceed? ", (char *)0))
-	    error ("Not confirmed.");
-	}
-    }
-
-  comname = savestring (comname, strlen (comname));
-
-  /* If the rest of the commands will be case insensitive, this one 
-     should behave in the same manner. */
-  for (tem = comname; *tem; tem++)
-    if (isupper(*tem)) *tem = tolower(*tem);
-
-  if (from_tty)
-    {
-      printf_unfiltered ("Type commands for definition of \"%s\".\n\
-End with a line saying just \"end\".\n", comname);
-      gdb_flush (gdb_stdout);
-    }
-
-  cmds = read_command_lines ();
-
-  if (c && c->class == class_user)
-    free_command_lines (&c->user_commands);
-
-  newc = add_cmd (comname, class_user, user_defined_command,
-	   (c && c->class == class_user)
-	   ? c->doc : savestring ("User-defined.", 13), &cmdlist);
-  newc->user_commands = cmds;
-
-  /* If this new command is a hook, then mark both commands as being
-     tied.  */
-  if (hookc)
-    {
-      hookc->hook = newc;	/* Target gets hooked.  */
-      newc->hookee = hookc;	/* We are marked as hooking target cmd.  */
-    }
-}
-
-static void
-document_command (comname, from_tty)
-     char *comname;
-     int from_tty;
-{
-  struct command_line *doclines;
-  register struct cmd_list_element *c;
-  char *tem = comname;
-
-  validate_comname (comname);
-
-  c = lookup_cmd (&tem, cmdlist, "", 0, 1);
-
-  if (c->class != class_user)
-    error ("Command \"%s\" is built-in.", comname);
-
-  if (from_tty)
-    printf_unfiltered ("Type documentation for \"%s\".\n\
-End with a line saying just \"end\".\n", comname);
-
-  doclines = read_command_lines ();
-
-  if (c->doc) free (c->doc);
-
-  {
-    register struct command_line *cl1;
-    register int len = 0;
-
-    for (cl1 = doclines; cl1; cl1 = cl1->next)
-      len += strlen (cl1->line) + 1;
-
-    c->doc = (char *) xmalloc (len + 1);
-    *c->doc = 0;
-
-    for (cl1 = doclines; cl1; cl1 = cl1->next)
-      {
-	strcat (c->doc, cl1->line);
-	if (cl1->next)
-	  strcat (c->doc, "\n");
-      }
-  }
-
-  free_command_lines (&doclines);
-}
-
-static void
-print_gnu_advertisement()
-{
-    printf_unfiltered ("\
-GDB is free software and you are welcome to distribute copies of it\n\
- under certain conditions; type \"show copying\" to see the conditions.\n\
-There is absolutely no warranty for GDB; type \"show warranty\" for details.\n\
-");
-}
-
-static void
-print_gdb_version (stream)
-  GDB_FILE *stream;
-{
-  fprintf_filtered (stream, "\
-GDB %s (%s", version, host_name);
-
-  if (!STREQ (host_name, target_name))
-    fprintf_filtered (stream, " --target %s", target_name);
-
-  fprintf_filtered (stream, "), ");
-  wrap_here("");
-  fprintf_filtered (stream, "Copyright 1994 Free Software Foundation, Inc.");
-}
-
-/* ARGSUSED */
-static void
-show_version (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  immediate_quit++;
-  print_gnu_advertisement ();
-  print_gdb_version (gdb_stdout);
-  printf_filtered ("\n");
-  immediate_quit--;
-}
-
-/* xgdb calls this to reprint the usual GDB prompt.  Obsolete now that xgdb
-   is obsolete.  */
 
 void
-print_prompt ()
-{
-  printf_unfiltered ("%s", prompt);
-  gdb_flush (gdb_stdout);
-}
-
-static void
-quit_command (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  if (inferior_pid != 0 && target_has_execution)
-    {
-      if (attach_flag)
-	{
-	  if (query ("The program is running.  Quit anyway (and detach it)? "))
-	    target_detach (args, from_tty);
-	  else
-	    error ("Not confirmed.");
-	}
-      else
-	{
-	  if (query ("The program is running.  Quit anyway (and kill it)? "))
-	    target_kill ();
-	  else
-	    error ("Not confirmed.");
-	}
-    }
-  /* UDI wants this, to kill the TIP.  */
-  target_close (1);
-
-  /* Save the history information if it is appropriate to do so.  */
-  if (write_history_p && history_filename)
-    write_history (history_filename);
-
-  exit (0);
-}
-
-/* Returns whether GDB is running on a terminal and whether the user
-   desires that questions be asked of them on that terminal.  */
-
-int
-input_from_terminal_p ()
-{
-  return gdb_has_a_terminal () && (instream == stdin) & caution;
-}
-
-/* ARGSUSED */
-static void
-pwd_command (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  if (args) error ("The \"pwd\" command does not take an argument: %s", args);
-  getcwd (dirbuf, sizeof (dirbuf));
-
-  if (!STREQ (dirbuf, current_directory))
-    printf_unfiltered ("Working directory %s\n (canonically %s).\n",
-	    current_directory, dirbuf);
-  else
-    printf_unfiltered ("Working directory %s.\n", current_directory);
-}
-
-static void
-cd_command (dir, from_tty)
-     char *dir;
-     int from_tty;
-{
-  int len;
-  /* Found something other than leading repetitions of "/..".  */
-  int found_real_path;
-  char *p;
-
-  /* If the new directory is absolute, repeat is a no-op; if relative,
-     repeat might be useful but is more likely to be a mistake.  */
-  dont_repeat ();
-
-  if (dir == 0)
-    error_no_arg ("new working directory");
-
-  dir = tilde_expand (dir);
-  make_cleanup (free, dir);
-
-  if (chdir (dir) < 0)
-    perror_with_name (dir);
-
-  len = strlen (dir);
-  dir = savestring (dir, len - (len > 1 && dir[len-1] == '/'));
-  if (dir[0] == '/')
-    current_directory = dir;
-  else
-    {
-      if (current_directory[0] == '/' && current_directory[1] == '\0')
-	current_directory = concat (current_directory, dir, NULL);
-      else
-	current_directory = concat (current_directory, "/", dir, NULL);
-      free (dir);
-    }
-
-  /* Now simplify any occurrences of `.' and `..' in the pathname.  */
-
-  found_real_path = 0;
-  for (p = current_directory; *p;)
-    {
-      if (p[0] == '/' && p[1] == '.' && (p[2] == 0 || p[2] == '/'))
-	strcpy (p, p + 2);
-      else if (p[0] == '/' && p[1] == '.' && p[2] == '.'
-	       && (p[3] == 0 || p[3] == '/'))
-	{
-	  if (found_real_path)
-	    {
-	      /* Search backwards for the directory just before the "/.."
-		 and obliterate it and the "/..".  */
-	      char *q = p;
-	      while (q != current_directory && q[-1] != '/')
-		--q;
-
-	      if (q == current_directory)
-		/* current_directory is
-		   a relative pathname ("can't happen"--leave it alone).  */
-		++p;
-	      else
-		{
-		  strcpy (q - 1, p + 3);
-		  p = q - 1;
-		}
-	    }
-	  else
-	    /* We are dealing with leading repetitions of "/..", for example
-	       "/../..", which is the Mach super-root.  */
-	    p += 3;
-	}
-      else
-	{
-	  found_real_path = 1;
-	  ++p;
-	}
-    }
-
-  forget_cached_source_info ();
-
-  if (from_tty)
-    pwd_command ((char *) 0, 1);
-}
-
-struct source_cleanup_lines_args {
-  int old_line;
-  char *old_file;
-  char *old_pre_error;
-  char *old_error_pre_print;
-};
-
-static void
-source_cleanup_lines (args)
-     PTR args;
-{
-  struct source_cleanup_lines_args *p =
-    (struct source_cleanup_lines_args *)args;
-  source_line_number = p->old_line;
-  source_file_name = p->old_file;
-  source_pre_error = p->old_pre_error;
-  error_pre_print = p->old_error_pre_print;
-}
-
-/* ARGSUSED */
-static void
-source_command (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  FILE *stream;
-  struct cleanup *old_cleanups;
-  char *file = args;
-  struct source_cleanup_lines_args old_lines;
-  int needed_length;
-
-  if (file == NULL)
-    {
-      error ("source command requires pathname of file to source.");
-    }
-
-  file = tilde_expand (file);
-  old_cleanups = make_cleanup (free, file);
-
-  stream = fopen (file, FOPEN_RT);
-  if (stream == 0)
-    perror_with_name (file);
-
-  make_cleanup (fclose, stream);
-
-  old_lines.old_line = source_line_number;
-  old_lines.old_file = source_file_name;
-  old_lines.old_pre_error = source_pre_error;
-  old_lines.old_error_pre_print = error_pre_print;
-  make_cleanup (source_cleanup_lines, &old_lines);
-  source_line_number = 0;
-  source_file_name = file;
-  source_pre_error = error_pre_print == NULL ? "" : error_pre_print;
-  source_pre_error = savestring (source_pre_error, strlen (source_pre_error));
-  make_cleanup (free, source_pre_error);
-  /* This will get set every time we read a line.  So it won't stay "" for
-     long.  */
-  error_pre_print = "";
-
-  needed_length = strlen (source_file_name) + strlen (source_pre_error) + 80;
-  if (source_error_allocated < needed_length)
-    {
-      source_error_allocated *= 2;
-      if (source_error_allocated < needed_length)
-	source_error_allocated = needed_length;
-      if (source_error == NULL)
-	source_error = xmalloc (source_error_allocated);
-      else
-	source_error = xrealloc (source_error, source_error_allocated);
-    }
-
-  read_command_file (stream);
-
-  do_cleanups (old_cleanups);
-}
-
-/* ARGSUSED */
-static void
-echo_command (text, from_tty)
-     char *text;
-     int from_tty;
-{
-  char *p = text;
-  register int c;
-
-  if (text)
-    while ((c = *p++) != '\0')
-      {
-	if (c == '\\')
-	  {
-	    /* \ at end of argument is used after spaces
-	       so they won't be lost.  */
-	    if (*p == 0)
-	      return;
-
-	    c = parse_escape (&p);
-	    if (c >= 0)
-	      printf_filtered ("%c", c);
-	  }
-	else
-	  printf_filtered ("%c", c);
-      }
-
-  /* Force this output to appear now.  */
-  wrap_here ("");
-  gdb_flush (gdb_stdout);
-}
-
-
-/* Functions to manipulate command line editing control variables.  */
-
-/* Number of commands to print in each call to show_commands.  */
-#define Hist_print 10
-static void
-show_commands (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  /* Index for history commands.  Relative to history_base.  */
-  int offset;
-
-  /* Number of the history entry which we are planning to display next.
-     Relative to history_base.  */
-  static int num = 0;
-
-  /* The first command in the history which doesn't exist (i.e. one more
-     than the number of the last command).  Relative to history_base.  */
-  int hist_len;
-
-  extern HIST_ENTRY *history_get PARAMS ((int));
-
-  /* Print out some of the commands from the command history.  */
-  /* First determine the length of the history list.  */
-  hist_len = history_size;
-  for (offset = 0; offset < history_size; offset++)
-    {
-      if (!history_get (history_base + offset))
-	{
-	  hist_len = offset;
-	  break;
-	}
-    }
-
-  if (args)
-    {
-      if (args[0] == '+' && args[1] == '\0')
-	/* "info editing +" should print from the stored position.  */
-	;
-      else
-	/* "info editing <exp>" should print around command number <exp>.  */
-	num = (parse_and_eval_address (args) - history_base) - Hist_print / 2;
-    }
-  /* "show commands" means print the last Hist_print commands.  */
-  else
-    {
-      num = hist_len - Hist_print;
-    }
-
-  if (num < 0)
-    num = 0;
-
-  /* If there are at least Hist_print commands, we want to display the last
-     Hist_print rather than, say, the last 6.  */
-  if (hist_len - num < Hist_print)
-    {
-      num = hist_len - Hist_print;
-      if (num < 0)
-	num = 0;
-    }
-
-  for (offset = num; offset < num + Hist_print && offset < hist_len; offset++)
-    {
-      printf_filtered ("%5d  %s\n", history_base + offset,
-	      (history_get (history_base + offset))->line);
-    }
-
-  /* The next command we want to display is the next one that we haven't
-     displayed yet.  */
-  num += Hist_print;
-  
-  /* If the user repeats this command with return, it should do what
-     "show commands +" does.  This is unnecessary if arg is null,
-     because "show commands +" is not useful after "show commands".  */
-  if (from_tty && args)
-    {
-      args[0] = '+';
-      args[1] = '\0';
-    }
-}
-
-/* Called by do_setshow_command.  */
-/* ARGSUSED */
-static void
-set_history_size_command (args, from_tty, c)
-     char *args;
-     int from_tty;
-     struct cmd_list_element *c;
-{
-  if (history_size == INT_MAX)
-    unstifle_history ();
-  else if (history_size >= 0)
-    stifle_history (history_size);
-  else
-    {
-      history_size = INT_MAX;
-      error ("History size must be non-negative");
-    }
-}
-
-/* ARGSUSED */
-static void
-set_history (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  printf_unfiltered ("\"set history\" must be followed by the name of a history subcommand.\n");
-  help_list (sethistlist, "set history ", -1, gdb_stdout);
-}
-
-/* ARGSUSED */
-static void
-show_history (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  cmd_show_list (showhistlist, from_tty, "");
-}
-
-int info_verbose = 0;		/* Default verbose msgs off */
-
-/* Called by do_setshow_command.  An elaborate joke.  */
-/* ARGSUSED */
-static void 
-set_verbose (args, from_tty, c)
-     char *args;
-     int from_tty;
-     struct cmd_list_element *c;
-{
-  char *cmdname = "verbose";
-  struct cmd_list_element *showcmd;
-  
-  showcmd = lookup_cmd_1 (&cmdname, showlist, NULL, 1);
-
-  if (info_verbose)
-    {
-      c->doc = "Set verbose printing of informational messages.";
-      showcmd->doc = "Show verbose printing of informational messages.";
-    }
-  else
-    {
-      c->doc = "Set verbosity.";
-      showcmd->doc = "Show verbosity.";
-    }
-}
-
-static void
-float_handler (signo)
-int signo;
-{
-  /* This message is based on ANSI C, section 4.7.  Note that integer
-     divide by zero causes this, so "float" is a misnomer.  */
-  signal (SIGFPE, float_handler);
-  error ("Erroneous arithmetic operation.");
-}
-
-/* Return whether we are running a batch file or from terminal.  */
-int
-batch_mode ()
-{
-  return !(instream == stdin && ISATTY (stdin));
-}
-
-
-static void
-init_cmd_lists ()
-{
-  cmdlist = NULL;
-  infolist = NULL;
-  enablelist = NULL;
-  disablelist = NULL;
-  deletelist = NULL;
-  enablebreaklist = NULL;
-  setlist = NULL;
-  unsetlist = NULL;
-  showlist = NULL;
-  sethistlist = NULL;
-  showhistlist = NULL;
-  unsethistlist = NULL;
-#if MAINTENANCE_CMDS
-  maintenancelist = NULL;
-  maintenanceinfolist = NULL;
-  maintenanceprintlist = NULL;
-#endif
-  setprintlist = NULL;
-  showprintlist = NULL;
-  setchecklist = NULL;
-  showchecklist = NULL;
-}
-
-/* Init the history buffer.  Note that we are called after the init file(s)
- * have been read so that the user can change the history file via his
- * .gdbinit file (for instance).  The GDBHISTFILE environment variable
- * overrides all of this.
- */
-
-static void
-init_history()
-{
-  char *tmpenv;
-
-  tmpenv = getenv ("HISTSIZE");
-  if (tmpenv)
-    history_size = atoi (tmpenv);
-  else if (!history_size)
-    history_size = 256;
-
-  stifle_history (history_size);
-
-  tmpenv = getenv ("GDBHISTFILE");
-  if (tmpenv)
-    history_filename = savestring (tmpenv, strlen(tmpenv));
-  else if (!history_filename) {
-    /* We include the current directory so that if the user changes
-       directories the file written will be the same as the one
-       that was read.  */
-    history_filename = concat (current_directory, "/.gdb_history", NULL);
-  }
-  read_history (history_filename);
-}
-
-static void
-init_main ()
+fputs_unfiltered (linebuffer, stream)
+     const char *linebuffer;
+     FILE *stream;
 {
-  struct cmd_list_element *c;
-  
-#ifdef DEFAULT_PROMPT
-  prompt = savestring (DEFAULT_PROMPT, strlen(DEFAULT_PROMPT));
-#else
-  prompt = savestring ("(gdb) ", 6);
-#endif
-
-  /* Set the important stuff up for command editing.  */
-  command_editing_p = 1;
-  history_expansion_p = 0;
-  write_history_p = 0;
-  
-  /* Setup important stuff for command line editing.  */
-  rl_completion_entry_function = (int (*)()) symbol_completion_function;
-  rl_completer_word_break_characters = gdb_completer_word_break_characters;
-  rl_completer_quote_characters = gdb_completer_quote_characters;
-  rl_readline_name = "gdb";
-
-  /* Define the classes of commands.
-     They will appear in the help list in the reverse of this order.  */
-
-  add_cmd ("internals", class_maintenance, NO_FUNCTION,
-	   "Maintenance commands.\n\
-Some gdb commands are provided just for use by gdb maintainers.\n\
-These commands are subject to frequent change, and may not be as\n\
-well documented as user commands.",
-	   &cmdlist);
-  add_cmd ("obscure", class_obscure, NO_FUNCTION, "Obscure features.", &cmdlist);
-  add_cmd ("aliases", class_alias, NO_FUNCTION, "Aliases of other commands.", &cmdlist);
-  add_cmd ("user-defined", class_user, NO_FUNCTION, "User-defined commands.\n\
-The commands in this class are those defined by the user.\n\
-Use the \"define\" command to define a command.", &cmdlist);
-  add_cmd ("support", class_support, NO_FUNCTION, "Support facilities.", &cmdlist);
-  add_cmd ("status", class_info, NO_FUNCTION, "Status inquiries.", &cmdlist);
-  add_cmd ("files", class_files, NO_FUNCTION, "Specifying and examining files.", &cmdlist);
-  add_cmd ("breakpoints", class_breakpoint, NO_FUNCTION, "Making program stop at certain points.", &cmdlist);
-  add_cmd ("data", class_vars, NO_FUNCTION, "Examining data.", &cmdlist);
-  add_cmd ("stack", class_stack, NO_FUNCTION, "Examining the stack.\n\
-The stack is made up of stack frames.  Gdb assigns numbers to stack frames\n\
-counting from zero for the innermost (currently executing) frame.\n\n\
-At any time gdb identifies one frame as the \"selected\" frame.\n\
-Variable lookups are done with respect to the selected frame.\n\
-When the program being debugged stops, gdb selects the innermost frame.\n\
-The commands below can be used to select other frames by number or address.",
-	   &cmdlist);
-  add_cmd ("running", class_run, NO_FUNCTION, "Running the program.", &cmdlist);
-
-  add_com ("pwd", class_files, pwd_command,
-	   "Print working directory.  This is used for your program as well.");
-  c = add_cmd ("cd", class_files, cd_command,
-	   "Set working directory to DIR for debugger and program being debugged.\n\
-The change does not take effect for the program being debugged\n\
-until the next time it is started.", &cmdlist);
-  c->completer = filename_completer;
-
-  add_show_from_set
-    (add_set_cmd ("prompt", class_support, var_string, (char *)&prompt,
-	   "Set gdb's prompt",
-	   &setlist),
-     &showlist);
-  
-  add_com ("echo", class_support, echo_command,
-	   "Print a constant string.  Give string as argument.\n\
-C escape sequences may be used in the argument.\n\
-No newline is added at the end of the argument;\n\
-use \"\\n\" if you want a newline to be printed.\n\
-Since leading and trailing whitespace are ignored in command arguments,\n\
-if you want to print some you must use \"\\\" before leading whitespace\n\
-to be printed or after trailing whitespace.");
-  add_com ("document", class_support, document_command,
-	   "Document a user-defined command.\n\
-Give command name as argument.  Give documentation on following lines.\n\
-End with a line of just \"end\".");
-  add_com ("define", class_support, define_command,
-	   "Define a new command name.  Command name is argument.\n\
-Definition appears on following lines, one command per line.\n\
-End with a line of just \"end\".\n\
-Use the \"document\" command to give documentation for the new command.\n\
-Commands defined in this way do not take arguments.");
-
-#ifdef __STDC__
-  c = add_cmd ("source", class_support, source_command,
-	   "Read commands from a file named FILE.\n\
-Note that the file \"" GDBINIT_FILENAME "\" is read automatically in this way\n\
-when gdb is started.", &cmdlist);
-#else
-  /* Punt file name, we can't help it easily.  */
-  c = add_cmd ("source", class_support, source_command,
-	   "Read commands from a file named FILE.\n\
-Note that the file \".gdbinit\" is read automatically in this way\n\
-when gdb is started.", &cmdlist);
-#endif
-  c->completer = filename_completer;
-
-  add_com ("quit", class_support, quit_command, "Exit gdb.");
-  add_com ("help", class_support, help_command, "Print list of commands.");
-  add_com_alias ("q", "quit", class_support, 1);
-  add_com_alias ("h", "help", class_support, 1);
-
-
-  c = add_set_cmd ("verbose", class_support, var_boolean, (char *)&info_verbose,
-		   "Set ",
-		   &setlist),
-  add_show_from_set (c, &showlist);
-  c->function.sfunc = set_verbose;
-  set_verbose (NULL, 0, c);
-  
-  add_show_from_set
-    (add_set_cmd ("editing", class_support, var_boolean, (char *)&command_editing_p,
-	   "Set editing of command lines as they are typed.\n\
-Use \"on\" to enable to enable the editing, and \"off\" to disable it.\n\
-Without an argument, command line editing is enabled.  To edit, use\n\
-EMACS-like or VI-like commands like control-P or ESC.", &setlist),
-     &showlist);
-
-  add_prefix_cmd ("history", class_support, set_history,
-		  "Generic command for setting command history parameters.",
-		  &sethistlist, "set history ", 0, &setlist);
-  add_prefix_cmd ("history", class_support, show_history,
-		  "Generic command for showing command history parameters.",
-		  &showhistlist, "show history ", 0, &showlist);
-
-  add_show_from_set
-    (add_set_cmd ("expansion", no_class, var_boolean, (char *)&history_expansion_p,
-	   "Set history expansion on command input.\n\
-Without an argument, history expansion is enabled.", &sethistlist),
-     &showhistlist);
-
-  add_show_from_set
-    (add_set_cmd ("save", no_class, var_boolean, (char *)&write_history_p,
-	   "Set saving of the history record on exit.\n\
-Use \"on\" to enable to enable the saving, and \"off\" to disable it.\n\
-Without an argument, saving is enabled.", &sethistlist),
-     &showhistlist);
-
-  c = add_set_cmd ("size", no_class, var_integer, (char *)&history_size,
-		   "Set the size of the command history, \n\
-ie. the number of previous commands to keep a record of.", &sethistlist);
-  add_show_from_set (c, &showhistlist);
-  c->function.sfunc = set_history_size_command;
-
-  add_show_from_set
-    (add_set_cmd ("filename", no_class, var_filename, (char *)&history_filename,
-	   "Set the filename in which to record the command history\n\
- (the list of previous commands of which a record is kept).", &sethistlist),
-     &showhistlist);
-
-  add_show_from_set
-    (add_set_cmd ("confirm", class_support, var_boolean,
-		  (char *)&caution,
-		  "Set whether to confirm potentially dangerous operations.",
-		  &setlist),
-     &showlist);
-
-  add_prefix_cmd ("info", class_info, info_command,
-        "Generic command for showing things about the program being debugged.",
-		  &infolist, "info ", 0, &cmdlist);
-  add_com_alias ("i", "info", class_info, 1);
-
-  add_com ("complete", class_obscure, complete_command,
-	   "List the completions for the rest of the line as a command.");
-
-  add_prefix_cmd ("show", class_info, show_command,
-		  "Generic command for showing things about the debugger.",
-		  &showlist, "show ", 0, &cmdlist);
-  /* Another way to get at the same thing.  */
-  add_info ("set", show_command, "Show all GDB settings.");
-
-  add_cmd ("commands", no_class, show_commands,
-	   "Show the the history of commands you typed.\n\
-You can supply a command number to start with, or a `+' to start after\n\
-the previous command number shown.",
-	   &showlist);
-
-  add_cmd ("version", no_class, show_version,
-	   "Show what version of GDB this is.", &showlist);
-
-  /* If target is open when baud changes, it doesn't take effect until the
-     next open (I think, not sure).  */
-  add_show_from_set (add_set_cmd ("remotebaud", no_class,
-				  var_zinteger, (char *)&baud_rate,
-				  "Set baud rate for remote serial I/O.\n\
-This value is used to set the speed of the serial port when debugging\n\
-using remote targets.", &setlist),
-		     &showlist);
-
-  add_show_from_set (
-    add_set_cmd ("remotedebug", no_class, var_zinteger, (char *)&remote_debug,
-		   "Set debugging of remote protocol.\n\
-When enabled, each packet sent or received with the remote target\n\
-is displayed.", &setlist),
-		     &showlist);
+  fputs (linebuffer, stream);
 }
diff --git a/gdb/mpw-make.in b/gdb/mpw-make.in
index e5c76c7..779bb81 100644
--- a/gdb/mpw-make.in
+++ b/gdb/mpw-make.in
@@ -211,7 +211,7 @@ CDEPS = {XM_CDEPS} {TM_CDEPS} {NAT_CDEPS} \Option-d
 ADD_FILES = {REGEX} {XM_ADD_FILES} {TM_ADD_FILES} {NAT_ADD_FILES}
 ADD_DEPS = {REGEX1} {XM_ADD_FILES} {TM_ADD_FILES} {NAT_ADD_FILES}
 
-VERSION = 4.12.1
+VERSION = 4.12.3
 DIST=gdb
 
 LINT=:usr:5bin:lint
@@ -678,7 +678,7 @@ YYOBJ = c-exp.tab.c.o m2-exp.tab.c.o ch-exp.tab.c.o
 # .c.o \Option-f 
 #	{CC} -c {INTERNAL_CFLAGS} $<
 
-all \Option-f  gdb MacGDB
+all \Option-f  gdb SiowGDB MacGDB
 #	@{MAKE} {FLAGS_TO_PASS} DO=all "DODIRS=`echo {SUBDIRS} | sed 's:testsuite::'`" subdir_do
 
 # The check target can not use subdir_do, because subdir_do does not
@@ -721,6 +721,35 @@ uninstall \Option-f  force
 :init.c \Option-f  {OBS} {TSOBS}
 	Duplicate -d -y "{s}"mpw-init.c :init.c
 
+:init-new.c \Option-f  {OBS} {TSOBS}
+	Echo Making init.c
+	Delete -i -y init.c-tmp
+	Echo '/* Do not modify this file.  */' >init.c-tmp
+	Echo '/* It is created automatically by the Makefile.  */'>>init.c-tmp
+	Echo 'void initialize_all_files () {' >>init.c-tmp
+	For i in {OBS} {TSOBS}
+	  set filename `Echo {i} | sed \Option-d
+	    -e ',^Onindy.o,d' \Option-d
+	    -e ',^nindy.o,d' \Option-d
+	    -e ',ttyflush.o,d' \Option-d
+	    -e ',xdr_ld.o,d' \Option-d
+	    -e ',xdr_ptrace.o,d' \Option-d
+	    -e ',xdr_rdb.o,d' \Option-d
+	    -e ',udr.o,d' \Option-d
+	    -e ',udip2soc.o,d' \Option-d
+	    -e ',udi2go32.o,d' \Option-d
+	    -e ',version.o,d' \Option-d
+	    -e ',[a-z0-9A-Z_]*-exp.tab.o,d' \Option-d
+	    -e 's,\.gc\.o,.c,' \Option-d
+	    -e 's,\.c\.o,.c,'`
+	  If {filename} != ""
+	    sed <{s}{filename} >>init.c-tmp -n \Option-d
+	    -e ',^_initialize_[a-z_0-9A-Z]* *(,s,^\([a-z_0-9A-Z]*\).*,  {extern void \1 (); \1 ();},p'
+	  End if
+	End For
+	Echo '}' >>init.c-tmp
+	Rename -y init.c-tmp init-new.c
+
 # .PRECIOUS \Option-f  "{s}"init.c
 
 LOADLIBES = {EXTRALIBS}
@@ -748,6 +777,21 @@ saber_gdb \Option-f  {SFILES} {DEPFILES} "{s}"copying.c "{s}"version.c
 	#load `echo " "{DEPFILES} | sed -e 's:\.o:.c:g' -e 's, , ::,g'`
 	echo "Load "{s}".c corresponding to \Option-f " {DEPFILES}
 
+# Version of GDB that uses the SIOW library.
+
+SiowGDB \Option-f  {OBS} {TSOBS} {ADD_DEPS} {CDEPS} "{o}"init.c.o
+	Delete -i -y SiowGDB
+	Rez -o SiowGDB {RIncludes}siow.r -append \Option-d
+		-d __kPrefSize=5000 -d __kMinSize=2000
+	Link -d -model far -o SiowGDB -t 'APPL' -c 'gdb ' \Option-d
+	  "{o}"init.c.o {OBS} {TSOBS} {ADD_FILES} {CLIBS} \Option-d
+	  "{CLibraries}"StdClib.o \Option-d
+	  "{Libraries}"SIOW.o \Option-d
+	  "{Libraries}"Runtime.o \Option-d
+	  "{Libraries}"Interface.o
+
+# Version of GDB that uses a real library.
+
 MacGDB \Option-f  {OBS} {TSOBS} {ADD_DEPS} {CDEPS} "{o}"init.c.o
 	Delete -i -y MacGDB
 	Rez -rd -o MacGDB "{s}"macgdb.r -append
@@ -1249,12 +1293,12 @@ MAKEOVERRIDES=
 "{o}"main.c.o \Option-f  "{s}"main.c {bfd_h} {getopt_h} {readline_headers} "{s}"call-cmds.h \Option-d
 	{defs_h} {gdbcmd_h} {inferior_h} "{s}"language.h "{s}"signals.h \Option-d
 	{remote_utils_h}
-	{CC} "{srcdir}"main.c {INTERNAL_CFLAGS} {READLINE_CFLAGS} -o "{o}"main.c.o
+	{CC} "{srcdir}"main.c {INTERNAL_CFLAGS} {READLINE_CFLAGS} -s gdb_main -o "{o}"main.c.o
 
 "{o}"top.c.o \Option-f  "{s}"top.c {bfd_h} {getopt_h} {readline_headers} "{s}"call-cmds.h \Option-d
 	{defs_h} {gdbcmd_h} {inferior_h} "{s}"language.h "{s}"signals.h \Option-d
 	{remote_utils_h}
-	{CC} "{srcdir}"top.c {INTERNAL_CFLAGS} {READLINE_CFLAGS} -o "{o}"top.c.o
+	{CC} "{srcdir}"top.c {INTERNAL_CFLAGS} {READLINE_CFLAGS} -s gdb_top -o "{o}"top.c.o
 
 "{o}"maint.c.o \Option-f  "{s}"maint.c {defs_h} {gdbcmd_h} {gdbtypes_h} {symtab_h} "{s}"language.h \Option-d
 	{expression_h}
diff --git a/gdb/ser-mac.c b/gdb/ser-mac.c
index 3be1fb3..d502ad1 100644
--- a/gdb/ser-mac.c
+++ b/gdb/ser-mac.c
@@ -152,7 +152,7 @@ mac_readchar (scb, timeout)
      int timeout;
 {
   int status, n;
-  /* time_t */ unsigned long starttime, now;
+  /* time_t */ unsigned long start_time, now;
   OSErr err;
   CntrlParam cb;
   IOParam pb;
@@ -160,7 +160,7 @@ mac_readchar (scb, timeout)
   if (scb->bufcnt-- > 0)
     return *scb->bufp++;
 
-  time (&starttime);
+  time (&start_time);
 
   while (1)
     {
@@ -190,10 +190,8 @@ mac_readchar (scb, timeout)
       else
 	{
 	  time (&now);
-	  if (now > starttime + timeout) {
-	    printf_unfiltered ("start %u, now %u, timeout %d\n", starttime, now, timeout);
+	  if (now > start_time + timeout)
 	    return SERIAL_TIMEOUT;
-	  }
 	}
     }
 }
@@ -257,9 +255,9 @@ mac_write (scb, str, len)
   OSErr err;
   IOParam pb;
 
-  if (first_mac_write++ < 8)
+  if (first_mac_write++ < 4)
     {
-      sleep (1);
+      sec_sleep (1);
     }
   pb.ioRefNum = output_refnum;
   pb.ioBuffer = (Ptr) str;
@@ -272,9 +270,22 @@ mac_write (scb, str, len)
   return 0;
 }
 
+sec_sleep (int timeout)
+{
+  unsigned long start_time, now;
+
+  time (&start_time);
+
+  while (1)
+    {
+      time (&now);
+      if (now > start_time + timeout)
+	return;
+    }
+}
+
 static void
-mac_close (scb)
-     serial_t scb;
+mac_close (serial_t scb)
 {
   if (input_refnum)
     {