For sparc64 target, use sparc cpu files and add sparcv9 to extra_defs. No

[binutils.git] / gdb / main.c

diff --git a/gdb/main.c b/gdb/main.c
index 825a6b68ccba79d39a68e2547bafd2b28f1f0b11..56a34ad8a35888974ba580c46c45071134f9efe6 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1,5 +1,5 @@
 /* Top level `main' program for GDB, the GNU debugger.
 /* Top level `main' program for GDB, the GNU debugger.

-   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992
+   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994

    Free Software Foundation, Inc.
 
 This file is part of GDB.
    Free Software Foundation, Inc.
 
 This file is part of GDB.


@@ -29,6 +29,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "gdbtypes.h"
 #include "expression.h"
 #include "language.h"
 #include "gdbtypes.h"
 #include "expression.h"
 #include "language.h"

+#include "terminal.h" /* For job_control.  */
+#include "annotate.h"

 
 #include "getopt.h"
 
 
 #include "getopt.h"
 


@@ -39,8 +41,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* readline defines this.  */
 #undef savestring
 
 /* readline defines this.  */
 #undef savestring
 

-#ifdef USG

 #include <sys/types.h>
 #include <sys/types.h>

+#ifdef USG
+/* What is this for?  X_OK?  */

 #include <unistd.h>
 #endif
 
 #include <unistd.h>
 #endif
 


@@ -53,13 +56,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include <sys/stat.h>
 #include <ctype.h>
 

-#ifdef SET_STACK_LIMIT_HUGE
-#include <sys/time.h>
-#include <sys/resource.h>
-
-int original_stack_limit;
-#endif
-

 /* Prototypes for local functions */
 
 static char *
 /* Prototypes for local functions */
 
 static char *


@@ -72,19 +68,19 @@ static void
 command_loop_marker PARAMS ((int));
 
 static void
 command_loop_marker PARAMS ((int));
 
 static void

-print_gdb_version PARAMS ((void));
+print_gdb_version PARAMS ((GDB_FILE *));

 
 static void
 quit_command PARAMS ((char *, int));
 
 static void
 
 static void
 quit_command PARAMS ((char *, int));
 
 static void

-initialize_main PARAMS ((void));
+init_main PARAMS ((void));

 
 static void
 
 static void

-initialize_history PARAMS ((void));
+init_history PARAMS ((void));

 
 static void
 
 static void

-initialize_cmd_lists PARAMS ((void));
+init_cmd_lists PARAMS ((void));

 
 static void
 float_handler PARAMS ((int));
 
 static void
 float_handler PARAMS ((int));


@@ -92,8 +88,7 @@ float_handler PARAMS ((int));
 static void
 source_command PARAMS ((char *, int));
 
 static void
 source_command PARAMS ((char *, int));
 

-static void
-cd_command PARAMS ((char *, int));
+static void cd_command PARAMS ((char *, int));

 
 static void
 print_gnu_advertisement PARAMS ((void));
 
 static void
 print_gnu_advertisement PARAMS ((void));


@@ -146,6 +141,9 @@ show_command PARAMS ((char *, int));
 static void
 info_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 void
 do_nothing PARAMS ((int));
 


@@ -169,7 +167,8 @@ source_cleanup PARAMS ((FILE *));
 #ifndef        GDBINIT_FILENAME
 #define        GDBINIT_FILENAME        ".gdbinit"
 #endif
 #ifndef        GDBINIT_FILENAME
 #define        GDBINIT_FILENAME        ".gdbinit"
 #endif

-char gdbinit[] = GDBINIT_FILENAME;
+static char gdbinit[] = GDBINIT_FILENAME;
+static int inhibit_gdbinit = 0;

 
 #define        ALL_CLEANUPS    ((struct cleanup *)0)
 
 
 #define        ALL_CLEANUPS    ((struct cleanup *)0)
 


@@ -177,20 +176,16 @@ char gdbinit[] = GDBINIT_FILENAME;
 
 extern char *version;
 
 
 extern char *version;
 

-/* Message to be printed before the error message, when an error occurs.  */
+/* Canonical host name as a string. */

 
 

-extern char *error_pre_print;
+extern char *host_name;

 
 

-/* Message to be printed before the warning message, when a warning occurs.  */
+/* Canonical target name as a string. */

 
 

-extern char *warning_pre_print;
+extern char *target_name;

 
 extern char lang_frame_mismatch_warn[];                /* language.c */
 
 
 extern char lang_frame_mismatch_warn[];                /* language.c */
 

-/* Whether GDB's stdin is on a terminal.  */
-
-extern int gdb_has_a_terminal;                 /* inflow.c */
-

 /* Flag for whether we want all the "from_tty" gubbish printed.  */
 
 int caution = 1;                       /* Default is yes, sigh. */
 /* Flag for whether we want all the "from_tty" gubbish printed.  */
 
 int caution = 1;                       /* Default is yes, sigh. */


@@ -273,7 +268,9 @@ struct cmd_list_element *setchecklist;
 
 struct cmd_list_element *showchecklist;
 
 
 struct cmd_list_element *showchecklist;
 

-/* stdio stream that command input is being read from.  */
+/* 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;
 
 
 FILE *instream;
 


@@ -290,7 +287,6 @@ static char dirbuf[1024];
 
 void (*window_hook) PARAMS ((FILE *, char *));
 
 
 void (*window_hook) PARAMS ((FILE *, char *));
 

-extern int frame_file_full_name;

 extern int mapped_symbol_files;
 extern int readnow_symbol_files;
 
 extern int mapped_symbol_files;
 extern int readnow_symbol_files;
 


@@ -306,10 +302,24 @@ static char *prompt;
 char *line;
 int linesize = 100;
 
 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
 /* Baud rate specified for talking to serial target systems.  Default

-   is left as a zero pointer, so targets can choose their own defaults.  */
+   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;

 
 

-char *baud_rate;
+/* 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.  */
 
 
 /* Signal to catch ^Z typed while reading a command: SIGTSTP or SIGCONT.  */
 


@@ -322,40 +332,95 @@ static void stop_sig PARAMS ((int));
 
 /* Some System V have job control but not sigsetmask(). */
 #if !defined (HAVE_SIGSETMASK)
 
 /* Some System V have job control but not sigsetmask(). */
 #if !defined (HAVE_SIGSETMASK)

-#define HAVE_SIGSETMASK !defined (USG)
+#if !defined (USG)
+#define HAVE_SIGSETMASK 1
+#else
+#define HAVE_SIGSETMASK 0
+#endif

 #endif
 
 #if 0 == (HAVE_SIGSETMASK)
 #define sigsetmask(n)
 #endif
 \f
 #endif
 
 #if 0 == (HAVE_SIGSETMASK)
 #define sigsetmask(n)
 #endif
 \f

-/* This is how `error' returns to command level.  */
+/* 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;

 
 

-jmp_buf to_top_level;
+/* Do a setjmp on error_return and quit_return.  catch_errors is
+   generally a cleaner way to do this, but main() would look pretty
+   ugly if it had to use catch_errors each time.  */
+
+#define SET_TOP_LEVEL() \
+  (((top_level_val = setjmp (error_return)) \
+    ? (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
 
 NORETURN void

-return_to_top_level ()
+return_to_top_level (reason)
+     enum return_reason reason;

 {
   quit_flag = 0;
   immediate_quit = 0;
 {
   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 */
   bpstat_clear_actions(stop_bpstat);   /* Clear queued breakpoint commands */

+

   disable_current_display ();
   do_cleanups (ALL_CLEANUPS);
   disable_current_display ();
   do_cleanups (ALL_CLEANUPS);

-  (NORETURN void) longjmp (to_top_level, 1);
+
+  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.  */
+/* 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
 
 int

-catch_errors (func, args, errstring)
+catch_errors (func, args, errstring, mask)

      int (*func) PARAMS ((char *));
      int (*func) PARAMS ((char *));

-     char *args;
+     PTR args;

      char *errstring;
      char *errstring;

+     return_mask mask;

 {
 {

-  jmp_buf saved;
+  jmp_buf saved_error;
+  jmp_buf saved_quit;
+  jmp_buf tmp_jmp;

   int val;
   struct cleanup *saved_cleanup_chain;
   char *saved_error_pre_print;
   int val;
   struct cleanup *saved_cleanup_chain;
   char *saved_error_pre_print;


@@ -363,18 +428,30 @@ catch_errors (func, args, errstring)
   saved_cleanup_chain = save_cleanups ();
   saved_error_pre_print = error_pre_print;
 
   saved_cleanup_chain = save_cleanups ();
   saved_error_pre_print = error_pre_print;
 

-  memcpy ((char *)saved, (char *)to_top_level, sizeof (jmp_buf));
+  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;
 
   error_pre_print = errstring;
 

-  if (setjmp (to_top_level) == 0)
-    val = (*func) (args);
+  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;
   else
     val = 0;
 
   restore_cleanups (saved_cleanup_chain);
 
   error_pre_print = saved_error_pre_print;

-  memcpy ((char *)to_top_level, (char *)saved, sizeof (jmp_buf));
+  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;
 }
 
   return val;
 }
 


@@ -384,7 +461,8 @@ static void
 disconnect (signo)
 int signo;
 {
 disconnect (signo)
 int signo;
 {

-  catch_errors (quit_cover, NULL, "Could not kill inferior process");
+  catch_errors (quit_cover, NULL,
+               "Could not kill the program being debugged", RETURN_MASK_ALL);

   signal (SIGHUP, SIG_DFL);
   kill (getpid (), SIGHUP);
 }
   signal (SIGHUP, SIG_DFL);
   kill (getpid (), SIGHUP);
 }


@@ -401,6 +479,21 @@ char *s;
   return 0;
 }
 \f
   return 0;
 }
 \f

+/* 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).  */
 
 /* Clean up on error during a "source" command (or execution of a
    user-defined command).  */
 


@@ -425,13 +518,34 @@ read_command_file (stream)
   do_cleanups (cleanups);
 }
 \f
   do_cleanups (cleanups);
 }
 \f

+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;
      char **argv;
 {
   int count;
 int
 main (argc, argv)
      int argc;
      char **argv;
 {
   int count;

-  static int inhibit_gdbinit = 0;

   static int quiet = 0;
   static int batch = 0;
 
   static int quiet = 0;
   static int batch = 0;
 


@@ -442,14 +556,18 @@ main (argc, argv)
   char *cdarg = NULL;
   char *ttyarg = NULL;
 
   char *cdarg = NULL;
   char *ttyarg = NULL;
 

-  /* Pointers to all arguments of +command option.  */
+  /* These are static so that we can take their address in an initializer.  */
+  static int print_help;
+  static int print_version;
+
+  /* Pointers to all arguments of --command option.  */

   char **cmdarg;
   /* Allocated size of cmdarg.  */
   int cmdsize;
   /* Number of elements of cmdarg used.  */
   int ncmd;
 
   char **cmdarg;
   /* Allocated size of cmdarg.  */
   int cmdsize;
   /* Number of elements of cmdarg used.  */
   int ncmd;
 

-  /* Indices of all arguments of +directory option.  */
+  /* Indices of all arguments of --directory option.  */

   char **dirarg;
   /* Allocated size.  */
   int dirsize;
   char **dirarg;
   /* Allocated size.  */
   int dirsize;


@@ -461,6 +579,16 @@ main (argc, argv)
 
   register int i;
 
 
   register int i;
 

+/* start-sanitize-mpw */
+#ifdef MPW
+  /* 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 ();
+#endif /* MPW */
+/* end-sanitize-mpw */

   /* This needs to happen before the first use of malloc.  */
   init_malloc ((PTR) NULL);
 
   /* This needs to happen before the first use of malloc.  */
   init_malloc ((PTR) NULL);
 


@@ -471,7 +599,7 @@ main (argc, argv)
 #endif
 
   /* If error() is called from initialization code, just exit */
 #endif
 
   /* If error() is called from initialization code, just exit */

-  if (setjmp (to_top_level)) {
+  if (SET_TOP_LEVEL ()) {

     exit(1);
   }
 
     exit(1);
   }
 


@@ -490,23 +618,9 @@ main (argc, argv)
   getcwd (dirbuf, sizeof (dirbuf));
   current_directory = dirbuf;
 
   getcwd (dirbuf, sizeof (dirbuf));
   current_directory = dirbuf;
 

-#ifdef SET_STACK_LIMIT_HUGE
-  {
-    struct rlimit rlim;
-
-    /* Set the stack limit huge so that alloca (particularly stringtab
-     * in dbxread.c) does not fail. */
-    getrlimit (RLIMIT_STACK, &rlim);
-    original_stack_limit = rlim.rlim_cur;
-    rlim.rlim_cur = rlim.rlim_max;
-    setrlimit (RLIMIT_STACK, &rlim);
-  }
-#endif /* SET_STACK_LIMIT_HUGE */
-

   /* Parse arguments and options.  */
   {
     int c;
   /* Parse arguments and options.  */
   {
     int c;

-    static int print_help;

     /* When var field is 0, use flag field to record the equivalent
        short option (or arbitrary numbers starting at 10 for those
        with no equivalent).  */
     /* When var field is 0, use flag field to record the equivalent
        short option (or arbitrary numbers starting at 10 for those
        with no equivalent).  */


@@ -518,12 +632,19 @@ main (argc, argv)
        {"m", no_argument, &mapped_symbol_files, 1},
        {"quiet", no_argument, &quiet, 1},
        {"q", no_argument, &quiet, 1},
        {"m", no_argument, &mapped_symbol_files, 1},
        {"quiet", no_argument, &quiet, 1},
        {"q", no_argument, &quiet, 1},

+       {"silent", no_argument, &quiet, 1},

        {"nx", no_argument, &inhibit_gdbinit, 1},
        {"n", no_argument, &inhibit_gdbinit, 1},
        {"batch", no_argument, &batch, 1},
        {"epoch", no_argument, &epoch_interface, 1},
        {"nx", no_argument, &inhibit_gdbinit, 1},
        {"n", no_argument, &inhibit_gdbinit, 1},
        {"batch", no_argument, &batch, 1},
        {"epoch", no_argument, &epoch_interface, 1},

-       {"fullname", no_argument, &frame_file_full_name, 1},
-       {"f", no_argument, &frame_file_full_name, 1},
+
+       /* This is a synonym for "--annotate=1".  --annotate is now preferred,
+          but keep this here for a long time because people will be running
+          emacses which use --fullname.  */
+       {"fullname", no_argument, 0, 'f'},
+       {"f", no_argument, 0, 'f'},
+
+       {"annotate", required_argument, 0, 12},

        {"help", no_argument, &print_help, 1},
        {"se", required_argument, 0, 10},
        {"symbols", required_argument, 0, 's'},
        {"help", no_argument, &print_help, 1},
        {"se", required_argument, 0, 10},
        {"symbols", required_argument, 0, 's'},


@@ -533,6 +654,7 @@ main (argc, argv)
        {"core", required_argument, 0, 'c'},
        {"c", required_argument, 0, 'c'},
        {"command", required_argument, 0, 'x'},
        {"core", required_argument, 0, 'c'},
        {"c", required_argument, 0, 'c'},
        {"command", required_argument, 0, 'x'},

+       {"version", no_argument, &print_version, 1},

        {"x", required_argument, 0, 'x'},
        {"directory", required_argument, 0, 'd'},
        {"cd", required_argument, 0, 11},
        {"x", required_argument, 0, 'x'},
        {"directory", required_argument, 0, 'd'},
        {"cd", required_argument, 0, 11},


@@ -571,6 +693,13 @@ main (argc, argv)
          case 11:
            cdarg = optarg;
            break;
          case 11:
            cdarg = optarg;
            break;

+         case 12:
+           /* FIXME: what if the syntax is wrong (e.g. not digits)?  */
+           annotation_level = atoi (optarg);
+           break;
+         case 'f':
+           annotation_level = 1;
+           break;

          case 's':
            symarg = optarg;
            break;
          case 's':
            symarg = optarg;
            break;


@@ -605,56 +734,35 @@ main (argc, argv)
            quiet = 1;
            break;
          case 'b':
            quiet = 1;
            break;
          case 'b':

-           baud_rate = optarg;
+           {
+             int i;
+             char *p;
+
+             i = strtol (optarg, &p, 0);
+             if (i == 0 && p == optarg)
+
+               /* Don't use *_filtered or warning() (which relies on
+                   current_target) until after initialize_all_files(). */
+
+               fprintf_unfiltered
+                 (gdb_stderr,
+                  "warning: could not set baud rate to `%s'.\n", optarg);
+             else
+               baud_rate = i;
+           }

            break;
            break;

+

 #ifdef ADDITIONAL_OPTION_CASES
          ADDITIONAL_OPTION_CASES
 #endif
          case '?':
 #ifdef ADDITIONAL_OPTION_CASES
          ADDITIONAL_OPTION_CASES
 #endif
          case '?':

-           fprintf (stderr,
-                    "Use `%s +help' for a complete list of options.\n",
+           fprintf_unfiltered (gdb_stderr,
+                    "Use `%s --help' for a complete list of options.\n",

                     argv[0]);
            exit (1);
          }
                     argv[0]);
            exit (1);
          }

-
-      }
-    if (print_help)
-      {
-       fputs ("\
-This is GDB, the GNU debugger.  Use the command\n\
-    gdb [options] [executable [core-file]]\n\
-to enter the debugger.\n\
-\n\
-Options available are:\n\
-  -help             Print this message.\n\
-  -quiet            Do not print version number on startup.\n\
-  -fullname         Output information used by emacs-GDB interface.\n\
-  -epoch            Output information used by epoch emacs-GDB interface.\n\
-  -batch            Exit after processing options.\n\
-  -nx               Do not read .gdbinit file.\n\
-  -tty=TTY          Use TTY for input/output by the program being debugged.\n\
-  -cd=DIR           Change current directory to DIR.\n\
-  -directory=DIR    Search for source files in DIR.\n\
-  -command=FILE     Execute GDB commands from FILE.\n\
-  -symbols=SYMFILE  Read symbols from SYMFILE.\n\
-  -exec=EXECFILE    Use EXECFILE as the executable.\n\
-  -se=FILE          Use FILE as symbol file and executable file.\n\
-  -core=COREFILE    Analyze the core dump COREFILE.\n\
-  -b BAUDRATE       Set serial port baud rate used for remote debugging.\n\
-  -mapped           Use mapped symbol files if supported on this system.\n\
-  -readnow          Fully read symbol files on first access.\n\
-", stderr);
-#ifdef ADDITIONAL_OPTION_HELP
-       fputs (ADDITIONAL_OPTION_HELP, stderr);
-#endif
-       fputs ("\n\
-For more information, type \"help\" from within GDB, or consult the\n\
-GDB manual (available as on-line info or a printed manual).\n", stderr);
-       /* Exiting after printing this message seems like
-          the most useful thing to do.  */
-       exit (0);

       }
       }

-    
+

     /* OK, that's all the options.  The other arguments are filenames.  */
     count = 0;
     for (; optind < argc; optind++)
     /* OK, that's all the options.  The other arguments are filenames.  */
     count = 0;
     for (; optind < argc; optind++)


@@ -668,7 +776,7 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
          corearg = argv[optind];
          break;
        case 3:
          corearg = argv[optind];
          break;
        case 3:

-         fprintf (stderr,
+         fprintf_unfiltered (gdb_stderr,

                   "Excess command line arguments ignored. (%s%s)\n",
                   argv[optind], (optind == argc - 1) ? "" : " ...");
          break;
                   "Excess command line arguments ignored. (%s%s)\n",
                   argv[optind], (optind == argc - 1) ? "" : " ...");
          break;


@@ -677,34 +785,87 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
       quiet = 1;
   }
 
       quiet = 1;
   }
 

-  /* Run the init function of each source file */
+  gdb_init ();

 
 

-  initialize_cmd_lists ();     /* This needs to be done first */
-  initialize_all_files ();
-  initialize_main ();          /* But that omits this file!  Do it now */
-  init_signals ();
+  /* Do these (and anything which might call wrap_here or *_filtered)
+     after initialize_all_files.  */
+  if (print_version)
+    {
+      print_gdb_version (gdb_stdout);
+      wrap_here ("");
+      printf_filtered ("\n");
+      exit (0);
+    }

 
 

+  if (print_help)
+    {
+      /* --version is intentionally not documented here, because we
+        are printing the version here, and the help is long enough
+        already.  */
+
+      print_gdb_version (gdb_stdout);
+      /* Make sure the output gets printed.  */
+      wrap_here ("");
+      printf_filtered ("\n");
+
+      /* But don't use *_filtered here.  We don't want to prompt for continue
+        no matter how small the screen or how much we're going to print.  */
+/* start-sanitize-mpw */
+/* For reasons too ugly to describe... */
+#ifdef MPW_C
+      fputs_unfiltered ("This is the GNU debugger.\n", gdb_stdout);
+#else
+/* end-sanitize-mpw */
+      fputs_unfiltered ("\
+This is the GNU debugger.  Usage:\n\
+    gdb [options] [executable-file [core-file or process-id]]\n\
+Options:\n\
+  --help             Print this message.\n\
+  --quiet            Do not print version number on startup.\n\
+  --fullname         Output information used by emacs-GDB interface.\n\
+  --epoch            Output information used by epoch emacs-GDB interface.\n\
+  --batch            Exit after processing options.\n\
+  --nx               Do not read .gdbinit file.\n\
+  --tty=TTY          Use TTY for input/output by the program being debugged.\n\
+  --cd=DIR           Change current directory to DIR.\n\
+  --directory=DIR    Search for source files in DIR.\n\
+  --command=FILE     Execute GDB commands from FILE.\n\
+  --symbols=SYMFILE  Read symbols from SYMFILE.\n\
+  --exec=EXECFILE    Use EXECFILE as the executable.\n\
+  --se=FILE          Use FILE as symbol file and executable file.\n\
+  --core=COREFILE    Analyze the core dump COREFILE.\n\
+  -b BAUDRATE        Set serial port baud rate used for remote debugging.\n\
+  --mapped           Use mapped symbol files if supported on this system.\n\
+  --readnow          Fully read symbol files on first access.\n\
+", gdb_stdout);
+/* start-sanitize-mpw */
+#endif /* MPW_C */
+/* end-sanitize-mpw */
+#ifdef ADDITIONAL_OPTION_HELP
+      fputs_unfiltered (ADDITIONAL_OPTION_HELP, gdb_stdout);
+#endif
+      fputs_unfiltered ("\n\
+For more information, type \"help\" from within GDB, or consult the\n\
+GDB manual (available as on-line info or a printed manual).\n", gdb_stdout);
+      exit (0);
+    }
+    

   if (!quiet)
     {
       /* Print all the junk at the top, with trailing "..." if we are about
         to read a symbol file (possibly slowly).  */
       print_gnu_advertisement ();
   if (!quiet)
     {
       /* Print all the junk at the top, with trailing "..." if we are about
         to read a symbol file (possibly slowly).  */
       print_gnu_advertisement ();

-      print_gdb_version ();
+      print_gdb_version (gdb_stdout);

       if (symarg)
        printf_filtered ("..");
       wrap_here("");
       if (symarg)
        printf_filtered ("..");
       wrap_here("");

-      fflush (stdout);         /* Force to screen during slow operations */
+      gdb_flush (gdb_stdout);          /* Force to screen during slow operations */

     }
 
   error_pre_print = "\n\n";
   /* We may get more than one warning, don't double space all of them... */
   warning_pre_print = "\nwarning: ";
 
     }
 
   error_pre_print = "\n\n";
   /* We may get more than one warning, don't double space all of them... */
   warning_pre_print = "\nwarning: ";
 

-  /* 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);
-

   /* Read and execute $HOME/.gdbinit file, if it exists.  This is done
      *before* all the command line arguments are processed; it sets
      global parameters, which are independent of what file you are
   /* Read and execute $HOME/.gdbinit file, if it exists.  This is done
      *before* all the command line arguments are processed; it sets
      global parameters, which are independent of what file you are


@@ -719,7 +880,7 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
       strcat (homeinit, gdbinit);
       if (!inhibit_gdbinit && access (homeinit, R_OK) == 0)
        {
       strcat (homeinit, gdbinit);
       if (!inhibit_gdbinit && access (homeinit, R_OK) == 0)
        {

-         if (!setjmp (to_top_level))
+         if (!SET_TOP_LEVEL ())

            source_command (homeinit, 0);
        }
       do_cleanups (ALL_CLEANUPS);
            source_command (homeinit, 0);
        }
       do_cleanups (ALL_CLEANUPS);


@@ -740,27 +901,26 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
   /* Now perform all the actions indicated by the arguments.  */
   if (cdarg != NULL)
     {
   /* Now perform all the actions indicated by the arguments.  */
   if (cdarg != NULL)
     {

-      if (!setjmp (to_top_level))
+      if (!SET_TOP_LEVEL ())

        {
          cd_command (cdarg, 0);
        {
          cd_command (cdarg, 0);

-         init_source_path ();

        }
     }
   do_cleanups (ALL_CLEANUPS);
 
   for (i = 0; i < ndir; i++)
        }
     }
   do_cleanups (ALL_CLEANUPS);
 
   for (i = 0; i < ndir; i++)

-    if (!setjmp (to_top_level))
+    if (!SET_TOP_LEVEL ())

       directory_command (dirarg[i], 0);
   free ((PTR)dirarg);
   do_cleanups (ALL_CLEANUPS);
 
   if (execarg != NULL
       && symarg != NULL
       directory_command (dirarg[i], 0);
   free ((PTR)dirarg);
   do_cleanups (ALL_CLEANUPS);
 
   if (execarg != NULL
       && symarg != NULL

-      && strcmp (execarg, symarg) == 0)
+      && STREQ (execarg, symarg))

     {
       /* The exec file and the symbol-file are the same.  If we can't open
         it, better only print one error message.  */
     {
       /* The exec file and the symbol-file are the same.  If we can't open
         it, better only print one error message.  */

-      if (!setjmp (to_top_level))
+      if (!SET_TOP_LEVEL ())

        {
          exec_file_command (execarg, !batch);
          symbol_file_command (symarg, 0);
        {
          exec_file_command (execarg, !batch);
          symbol_file_command (symarg, 0);


@@ -769,10 +929,10 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
   else
     {
       if (execarg != NULL)
   else
     {
       if (execarg != NULL)

-       if (!setjmp (to_top_level))
+       if (!SET_TOP_LEVEL ())

          exec_file_command (execarg, !batch);
       if (symarg != NULL)
          exec_file_command (execarg, !batch);
       if (symarg != NULL)

-       if (!setjmp (to_top_level))
+       if (!SET_TOP_LEVEL ())

          symbol_file_command (symarg, 0);
     }
   do_cleanups (ALL_CLEANUPS);
          symbol_file_command (symarg, 0);
     }
   do_cleanups (ALL_CLEANUPS);


@@ -786,14 +946,14 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
   warning_pre_print = "\nwarning: ";
 
   if (corearg != NULL)
   warning_pre_print = "\nwarning: ";
 
   if (corearg != NULL)

-    if (!setjmp (to_top_level))
+    if (!SET_TOP_LEVEL ())

       core_file_command (corearg, !batch);
       core_file_command (corearg, !batch);

-    else if (isdigit (corearg[0]) && !setjmp (to_top_level))
+    else if (isdigit (corearg[0]) && !SET_TOP_LEVEL ())

       attach_command (corearg, !batch);
   do_cleanups (ALL_CLEANUPS);
 
   if (ttyarg != NULL)
       attach_command (corearg, !batch);
   do_cleanups (ALL_CLEANUPS);
 
   if (ttyarg != NULL)

-    if (!setjmp (to_top_level))
+    if (!SET_TOP_LEVEL ())

       tty_command (ttyarg, !batch);
   do_cleanups (ALL_CLEANUPS);
 
       tty_command (ttyarg, !batch);
   do_cleanups (ALL_CLEANUPS);
 


@@ -812,14 +972,14 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
       || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat)))
     if (!inhibit_gdbinit && access (gdbinit, R_OK) == 0)
       {
       || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat)))
     if (!inhibit_gdbinit && access (gdbinit, R_OK) == 0)
       {

-       if (!setjmp (to_top_level))
+       if (!SET_TOP_LEVEL ())

          source_command (gdbinit, 0);
       }
   do_cleanups (ALL_CLEANUPS);
 
   for (i = 0; i < ncmd; i++)
     {
          source_command (gdbinit, 0);
       }
   do_cleanups (ALL_CLEANUPS);
 
   for (i = 0; i < ncmd; i++)
     {

-      if (!setjmp (to_top_level))
+      if (!SET_TOP_LEVEL ())

        {
          if (cmdarg[i][0] == '-' && cmdarg[i][1] == '\0')
            read_command_file (stdin);
        {
          if (cmdarg[i][0] == '-' && cmdarg[i][1] == '\0')
            read_command_file (stdin);


@@ -831,7 +991,7 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
   free ((PTR)cmdarg);
 
   /* Read in the old history after all the command files have been read. */
   free ((PTR)cmdarg);
 
   /* Read in the old history after all the command files have been read. */

-  initialize_history();
+  init_history();

 
   if (batch)
     {
 
   if (batch)
     {


@@ -850,15 +1010,74 @@ GDB manual (available as on-line info or a printed manual).\n", stderr);
 
   while (1)
     {
 
   while (1)
     {

-      if (!setjmp (to_top_level))
+      if (!SET_TOP_LEVEL ())

        {
          do_cleanups (ALL_CLEANUPS);           /* Do complete cleanup */
        {
          do_cleanups (ALL_CLEANUPS);           /* Do complete cleanup */

+/* start-sanitize-mpw */
+#ifdef MPW
+         /* If we're being a Mac application, go into a Mac-specific
+            event-handling loop instead.  We still want to be inside
+            the outer loop, because that will catch longjmps resulting
+            from some command executions. */
+         if (mac_app)
+           mac_command_loop ();
+         else
+#endif /* MPW */
+/* end-sanitize-mpw */

          command_loop ();
           quit_command ((char *)0, instream == stdin);
        }
     }
   /* No exit -- exit is through quit_command.  */
 }
          command_loop ();
           quit_command ((char *)0, instream == stdin);
        }
     }
   /* No exit -- exit is through quit_command.  */
 }

+\f
+void
+init_proc ()
+{
+}
+
+int
+proc_wait (pid, status)
+     int pid;
+     int *status;
+{
+  return wait (status);
+}
+
+void
+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.  */
 
 /* Execute the line P as a command.
    Pass FROM_TTY as second argument to the defining function.  */


@@ -869,9 +1088,7 @@ execute_command (p, from_tty)
      int from_tty;
 {
   register struct cmd_list_element *c;
      int from_tty;
 {
   register struct cmd_list_element *c;

-  register struct command_line *cmdlines;

   register enum language flang;
   register enum language flang;

-  static const struct language_defn *saved_language = 0;

   static int warned = 0;
 
   free_all_values ();
   static int warned = 0;
 
   free_all_values ();


@@ -888,28 +1105,13 @@ execute_command (p, from_tty)
       c = lookup_cmd (&p, cmdlist, "", 0, 1);
       /* Pass null arg rather than an empty one.  */
       arg = *p ? p : 0;
       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)
       if (c->class == class_user)

-       {
-         struct cleanup *old_chain;
-         
-         if (*p)
-           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_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)
       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)


@@ -919,13 +1121,11 @@ execute_command (p, from_tty)
    }
 
   /* Tell the user if the language has changed (except first time).  */
    }
 
   /* Tell the user if the language has changed (except first time).  */

-  if (current_language != saved_language)
+  if (current_language != expected_language)

   {
     if (language_mode == language_mode_auto) {
   {
     if (language_mode == language_mode_auto) {

-      if (saved_language)
-       language_info (1);      /* Print what changed.  */
+      language_info (1);       /* Print what changed.  */

     }
     }

-    saved_language = current_language;

     warned = 0;
   }
 
     warned = 0;
   }
 


@@ -973,7 +1173,7 @@ command_loop ()
        reinitialize_more_filter ();
       old_chain = make_cleanup (command_loop_marker, 0);
       command = command_line_input (instream == stdin ? prompt : (char *) NULL,
        reinitialize_more_filter ();
       old_chain = make_cleanup (command_loop_marker, 0);
       command = command_line_input (instream == stdin ? prompt : (char *) NULL,

-                                     instream == stdin);
+                                   instream == stdin, "prompt");

       if (command == 0)
        return;
       execute_command (command, instream == stdin);
       if (command == 0)
        return;
       execute_command (command, instream == stdin);


@@ -988,6 +1188,9 @@ command_loop ()
 void
 dont_repeat ()
 {
 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 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.  */


@@ -1016,8 +1219,15 @@ gdb_readline (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.  */
       /* 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 (prrompt, stdout);
-      fflush (stdout);
+      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);
     }
   
   result = (char *) xmalloc (result_size);


@@ -1030,6 +1240,11 @@ gdb_readline (prrompt)
 
       if (c == EOF)
        {
 
       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;
        }
          free (result);
          return NULL;
        }


@@ -1058,6 +1273,17 @@ static int write_history_p;
 static int history_size;
 static char *history_filename;
 
 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!@#$%^&*()+=|~`}{[]\"';:?/>.<,-";
 /* Variables which are necessary for fancy command line editing.  */
 char *gdb_completer_word_break_characters =
   " \t\n!@#$%^&*()+=|~`}{[]\"';:?/>.<,-";


@@ -1082,16 +1308,120 @@ char *gdb_completer_quote_characters =
    but don't want to complete on anything else either.  */
 /* ARGSUSED */
 char **
    but don't want to complete on anything else either.  */
 /* ARGSUSED */
 char **

-noop_completer (text)
+noop_completer (text, prefix)

      char *text;
      char *text;

+     char *prefix;

 {
   return NULL;
 }
 
 {
   return NULL;
 }
 

-/* Generate symbol names one by one for the completer.  Each time we are
-   called return another potential completion to the caller.
+/* 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;

 
 

-   TEXT is what we expect the symbol to start with.
+      {
+       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,
 
    MATCHES is the number of matches that have currently been collected from
    calling this completion function.  When zero, then we need to initialize,


@@ -1104,7 +1434,7 @@ noop_completer (text)
    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. */
    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;
 static char *
 symbol_completion_function (text, matches)
      char *text;


@@ -1114,9 +1444,9 @@ symbol_completion_function (text, matches)
   static int index;                            /* Next cached completion */
   char *output = NULL;
   char *tmp_command, *p;
   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;
   struct cmd_list_element *c, *result_list;

-  extern char *rl_line_buffer;
-  extern int rl_point;

 
   if (matches == 0)
     {
 
   if (matches == 0)
     {


@@ -1138,7 +1468,7 @@ symbol_completion_function (text, matches)
         (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
         (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. */
+        '-' character used in some commands.  */

 
       rl_completer_word_break_characters =
          gdb_completer_word_break_characters;
 
       rl_completer_word_break_characters =
          gdb_completer_word_break_characters;


@@ -1146,9 +1476,13 @@ symbol_completion_function (text, matches)
       /* Decide whether to complete on a list of gdb commands or on symbols. */
       tmp_command = (char *) alloca (rl_point + 1);
       p = tmp_command;
       /* 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';
       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)
        {
 
       if (rl_point == 0)
        {


@@ -1170,80 +1504,117 @@ symbol_completion_function (text, matches)
 
       if (!c)
        {
 
       if (!c)
        {

-         /* He's typed something unrecognizable.  Sigh.  */
+         /* It is an unrecognized command.  So there are no
+            possible completions.  */

          list = NULL;
        }
       else if (c == (struct cmd_list_element *) -1)
        {
          list = NULL;
        }
       else if (c == (struct cmd_list_element *) -1)
        {

-         /* If we didn't recognize everything up to the thing that
-            needs completing, and we don't know what command it is
-            yet, we are in trouble. */
-
-         if (p + strlen(text) != tmp_command + rl_point)
-           {
-             /* This really should not produce an error.  Better would
-                be to pretend to hit RETURN here; this would produce a
-                response like "Ambiguous command: foo, foobar, etc",
-                and leave the line available for re-entry with ^P.
-                Instead, this error blows away the user's typed input
-                without any way to get it back.  */
-             error ("  Unrecognized command.");
-           }
-         
-         /* He's typed something ambiguous.  This is easier.  */
-         if (result_list)
+         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)

            {
            {

-             list = complete_on_cmdlist (*result_list->prefixlist, text);
+             /* 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
            {
            }
          else
            {

-             list = complete_on_cmdlist (cmdlist, text);
+             /* 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;

            }
            }

-         rl_completer_word_break_characters =
-             gdb_completer_command_word_break_characters;

        }
       else
        {
        }
       else
        {

-         /* If we've gotten this far, gdb has recognized a full
-            command.  There are several possibilities:
+         /* We've recognized a full command.  */

 
 

-            1) We need to complete on the command.
-            2) We need to complete on the possibilities coming after
-            the command.
-            2) We need to complete the text of what comes after the
-            command.   */
-
-         if (!*p && *text)
-           {
-             /* Always (might be longer versions of thie command).  */
-             list = complete_on_cmdlist (result_list, text);
-             rl_completer_word_break_characters =
-                 gdb_completer_command_word_break_characters;
-           }
-         else if (!*p && !*text)
+         if (p == tmp_command + rl_point)

            {
            {

-             if (c->prefixlist)
+             /* There is no non-whitespace in the line beyond the command.  */
+
+             if (p[-1] == ' ' || p[-1] == '\t')

                {
                {

-                 list = complete_on_cmdlist (*c->prefixlist, "");
-                 rl_completer_word_break_characters =
-                     gdb_completer_command_word_break_characters;
+                 /* 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
                {
                }
              else
                {

-                 list = (*c->completer) ("");
+                 /* 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
            {
                }
            }
          else
            {

+             /* There is non-whitespace beyond the command.  */
+

              if (c->prefixlist && !c->allow_unknown)
                {
              if (c->prefixlist && !c->allow_unknown)
                {

-                 /* Something like "info adsfkdj".  But error() is not the
-                    proper response; just return no completions instead. */
+                 /* It is an unrecognized subcommand of a prefix command,
+                    e.g. "info adsfkdj".  */

                  list = NULL;
                }
              else
                {
                  list = NULL;
                }
              else
                {

-                 list = (*c->completer) (text);
+                 /* It is a normal command.  */
+                 list = (*c->completer) (p, word);

                }
            }
        }
                }
            }
        }


@@ -1264,6 +1635,16 @@ symbol_completion_function (text, matches)
        }
     }
 
        }
     }
 

+#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);
 }
 
   return (output);
 }
 


@@ -1317,8 +1698,8 @@ int signo;
 #else
   signal (STOP_SIGNAL, stop_sig);
 #endif
 #else
   signal (STOP_SIGNAL, stop_sig);
 #endif

-  printf ("%s", prompt);
-  fflush (stdout);
+  printf_unfiltered ("%s", prompt);
+  gdb_flush (gdb_stdout);

 
   /* Forget about any previous command -- null line now will do nothing.  */
   dont_repeat ();
 
   /* Forget about any previous command -- null line now will do nothing.  */
   dont_repeat ();


@@ -1371,9 +1752,10 @@ init_signals ()
    simple input as the user has requested.  */
 
 char *
    simple input as the user has requested.  */
 
 char *

-command_line_input (prrompt, repeat)
+command_line_input (prrompt, repeat, annotation_suffix)

      char *prrompt;
      int repeat;
      char *prrompt;
      int repeat;

+     char *annotation_suffix;

 {
   static char *linebuffer = 0;
   static unsigned linelength = 0;
 {
   static char *linebuffer = 0;
   static unsigned linelength = 0;


@@ -1385,6 +1767,19 @@ command_line_input (prrompt, repeat)
   char *nline;
   char got_eof = 0;
 
   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;
   if (linebuffer == 0)
     {
       linelength = 80;


@@ -1397,17 +1792,35 @@ command_line_input (prrompt, repeat)
      since it should not wait until the user types a newline.  */
   immediate_quit++;
 #ifdef STOP_SIGNAL
      since it should not wait until the user types a newline.  */
   immediate_quit++;
 #ifdef STOP_SIGNAL

-  signal (STOP_SIGNAL, stop_sig);
+  if (job_control)
+    signal (STOP_SIGNAL, stop_sig);

 #endif
 
   while (1)
     {
 #endif
 
   while (1)
     {

-      /* Reports are that some Sys V's don't flush stdout/err on reads
-        from stdin, when stdin/out are sockets rather than ttys.  So we
-        have to do it ourselves, to make emacs-gdb and xxgdb work.
-        On other machines, doing this once per input should be a cheap nop.  */
-      fflush (stdout);
-      fflush (stderr);
+      /* 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
 
       /* Don't use fancy stuff if not talking to stdin.  */
       if (command_editing_p && instream == stdin


@@ -1416,6 +1829,13 @@ command_line_input (prrompt, repeat)
       else
        rl = gdb_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;
       if (!rl || rl == (char *) EOF)
        {
          got_eof = 1;


@@ -1444,13 +1864,27 @@ command_line_input (prrompt, repeat)
   }
 
 #ifdef STOP_SIGNAL
   }
 
 #ifdef STOP_SIGNAL

-  signal (SIGTSTP, SIG_DFL);
+  if (job_control)
+    signal (STOP_SIGNAL, SIG_DFL);

 #endif
   immediate_quit--;
 
   if (got_eof)
     return NULL;
 
 #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))
   /* Do history expansion if that is wished.  */
   if (history_expansion_p && instream == stdin
       && ISATTY (instream))


@@ -1463,13 +1897,13 @@ command_line_input (prrompt, repeat)
       if (expanded)
        {
          /* Print the changes.  */
       if (expanded)
        {
          /* Print the changes.  */

-         printf ("%s\n", history_value);
+         printf_unfiltered ("%s\n", history_value);

 
          /* If there was an error, call this function again.  */
          if (expanded < 0)
            {
              free (history_value);
 
          /* If there was an error, call this function again.  */
          if (expanded < 0)
            {
              free (history_value);

-             return command_line_input (prrompt, repeat);
+             return command_line_input (prrompt, repeat, annotation_suffix);

            }
          if (strlen (history_value) > linelength)
            {
            }
          if (strlen (history_value) > linelength)
            {


@@ -1503,7 +1937,7 @@ command_line_input (prrompt, repeat)
       && ISATTY (stdin) && *linebuffer)
     add_history (linebuffer);
 
       && ISATTY (stdin) && *linebuffer)
     add_history (linebuffer);
 

-  /* Note: lines consisting soley of comments are added to the command
+  /* 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
      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


@@ -1570,7 +2004,7 @@ read_command_lines ()
   while (1)
     {
       dont_repeat ();
   while (1)
     {
       dont_repeat ();

-      p = command_line_input ((char *) NULL, instream == stdin);
+      p = command_line_input ((char *) NULL, instream == stdin, "commands");

       if (p == NULL)
        /* Treat end of file like "end".  */
        break;
       if (p == NULL)
        /* Treat end of file like "end".  */
        break;


@@ -1661,8 +2095,38 @@ info_command (arg, from_tty)
      char *arg;
      int from_tty;
 {
      char *arg;
      int from_tty;
 {

-  printf ("\"info\" must be followed by the name of an info command.\n");
-  help_list (infolist, "info ", -1, stdout);
+  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.  */
 }
 
 /* The "show" command with no arguments shows all the settings.  */


@@ -1713,7 +2177,7 @@ help_command (command, from_tty)
      char *command;
      int from_tty; /* Ignored */
 {
      char *command;
      int from_tty; /* Ignored */
 {

-  help_cmd (command, stdout);
+  help_cmd (command, gdb_stdout);

 }
 \f
 static void
 }
 \f
 static void


@@ -1748,14 +2212,16 @@ define_command (comname, from_tty)
      int from_tty;
 {
   register struct command_line *cmds;
      int from_tty;
 {
   register struct command_line *cmds;

-  register struct cmd_list_element *c, *newc;
+  register struct cmd_list_element *c, *newc, *hookc = 0;

   char *tem = comname;
   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);
 
   validate_comname (comname);
 
   /* Look it up, and verify that we got an exact match.  */
   c = lookup_cmd (&tem, cmdlist, "", -1, 1);

-  if (c && 0 != strcmp (comname, c->name))
+  if (c && !STREQ (comname, c->name))

     c = 0;
     
   if (c)
     c = 0;
     
   if (c)


@@ -1768,18 +2234,38 @@ define_command (comname, from_tty)
        error ("Command \"%s\" not redefined.", 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));
 
   comname = savestring (comname, strlen (comname));
 

-  /* If the rest of the commands will be case insensetive, this one 
+  /* 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)
     {
      should behave in the same manner. */
   for (tem = comname; *tem; tem++)
     if (isupper(*tem)) *tem = tolower(*tem);
 
   if (from_tty)
     {

-      printf ("Type commands for definition of \"%s\".\n\
+      printf_unfiltered ("Type commands for definition of \"%s\".\n\

 End with a line saying just \"end\".\n", comname);
 End with a line saying just \"end\".\n", comname);

-      fflush (stdout);
+      gdb_flush (gdb_stdout);

     }
 
   cmds = read_command_lines ();
     }
 
   cmds = read_command_lines ();


@@ -1791,6 +2277,14 @@ End with a line saying just \"end\".\n", comname);
           (c && c->class == class_user)
           ? c->doc : savestring ("User-defined.", 13), &cmdlist);
   newc->user_commands = cmds;
           (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
 }
 
 static void


@@ -1810,7 +2304,7 @@ document_command (comname, from_tty)
     error ("Command \"%s\" is built-in.", comname);
 
   if (from_tty)
     error ("Command \"%s\" is built-in.", comname);
 
   if (from_tty)

-    printf ("Type documentation for \"%s\".\n\
+    printf_unfiltered ("Type documentation for \"%s\".\n\

 End with a line saying just \"end\".\n", comname);
 
   doclines = read_command_lines ();
 End with a line saying just \"end\".\n", comname);
 
   doclines = read_command_lines ();


@@ -1841,7 +2335,7 @@ End with a line saying just \"end\".\n", comname);
 static void
 print_gnu_advertisement()
 {
 static void
 print_gnu_advertisement()
 {

-    printf ("\
+    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\
 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\


@@ -1849,11 +2343,18 @@ There is absolutely no warranty for GDB; type \"show warranty\" for details.\n\
 }
 
 static void
 }
 
 static void

-print_gdb_version ()
+print_gdb_version (stream)
+  GDB_FILE *stream;

 {
 {

-  printf_filtered ("\
-GDB %s, Copyright 1992 Free Software Foundation, Inc.",
-         version);
+  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 */
 }
 
 /* ARGSUSED */


@@ -1864,18 +2365,19 @@ show_version (args, from_tty)
 {
   immediate_quit++;
   print_gnu_advertisement ();
 {
   immediate_quit++;
   print_gnu_advertisement ();

-  print_gdb_version ();
+  print_gdb_version (gdb_stdout);

   printf_filtered ("\n");
   immediate_quit--;
 }
 \f
   printf_filtered ("\n");
   immediate_quit--;
 }
 \f

-/* xgdb calls this to reprint the usual GDB prompt.  */
+/* xgdb calls this to reprint the usual GDB prompt.  Obsolete now that xgdb
+   is obsolete.  */

 
 void
 print_prompt ()
 {
 
 void
 print_prompt ()
 {

-  printf ("%s", prompt);
-  fflush (stdout);
+  printf_unfiltered ("%s", prompt);
+  gdb_flush (gdb_stdout);

 }
 \f
 static void
 }
 \f
 static void


@@ -1885,19 +2387,28 @@ quit_command (args, from_tty)
 {
   if (inferior_pid != 0 && target_has_execution)
     {
 {
   if (inferior_pid != 0 && target_has_execution)
     {

-      if (query ("The program is running.  Quit anyway? "))
+      if (attach_flag)

        {
        {

-         if (attach_flag)
+         if (query ("The program is running.  Quit anyway (and detach it)? "))

            target_detach (args, from_tty);
          else
            target_detach (args, from_tty);
          else

-           target_kill ();
+           error ("Not confirmed.");

        }
       else
        }
       else

-       error ("Not confirmed.");
+       {
+         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);
   /* Save the history information if it is appropriate to do so.  */
   if (write_history_p && history_filename)
     write_history (history_filename);

+

   exit (0);
 }
 
   exit (0);
 }
 


@@ -1907,7 +2418,7 @@ quit_command (args, from_tty)
 int
 input_from_terminal_p ()
 {
 int
 input_from_terminal_p ()
 {

-  return gdb_has_a_terminal && (instream == stdin) & caution;
+  return gdb_has_a_terminal () && (instream == stdin) & caution;

 }
 \f
 /* ARGSUSED */
 }
 \f
 /* ARGSUSED */


@@ -1919,11 +2430,11 @@ pwd_command (args, from_tty)
   if (args) error ("The \"pwd\" command does not take an argument: %s", args);
   getcwd (dirbuf, sizeof (dirbuf));
 
   if (args) error ("The \"pwd\" command does not take an argument: %s", args);
   getcwd (dirbuf, sizeof (dirbuf));
 

-  if (strcmp (dirbuf, current_directory))
-    printf ("Working directory %s\n (canonically %s).\n",
+  if (!STREQ (dirbuf, current_directory))
+    printf_unfiltered ("Working directory %s\n (canonically %s).\n",

            current_directory, dirbuf);
   else
            current_directory, dirbuf);
   else

-    printf ("Working directory %s.\n", current_directory);
+    printf_unfiltered ("Working directory %s.\n", current_directory);

 }
 
 static void
 }
 
 static void


@@ -1932,7 +2443,9 @@ cd_command (dir, from_tty)
      int from_tty;
 {
   int len;
      int from_tty;
 {
   int len;

-  int change;
+  /* 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.  */
 
   /* 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.  */


@@ -1953,36 +2466,50 @@ cd_command (dir, from_tty)
     current_directory = dir;
   else
     {
     current_directory = dir;
   else
     {

-      current_directory = concat (current_directory, "/", dir, NULL);
+      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.  */
 
       free (dir);
     }
 
   /* Now simplify any occurrences of `.' and `..' in the pathname.  */
 

-  change = 1;
-  while (change)
+  found_real_path = 0;
+  for (p = current_directory; *p;)

     {
     {

-      char *p;
-      change = 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 (!strncmp (p, "/./", 2)
-             && (p[2] == 0 || p[2] == '/'))
-           strcpy (p, p + 2);
-         else if (!strncmp (p, "/..", 3)
-                  && (p[3] == 0 || p[3] == '/')
-                  && p != current_directory)
+         if (found_real_path)

            {
            {

+             /* Search backwards for the directory just before the "/.."
+                and obliterate it and the "/..".  */

              char *q = p;
              char *q = p;

-             while (q != current_directory && q[-1] != '/') q--;
-             if (q != current_directory)
+             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;
+                 strcpy (q - 1, p + 3);
+                 p = q - 1;

                }
            }
                }
            }

-         else p++;
+         else
+           /* We are dealing with leading repetitions of "/..", for example
+              "/../..", which is the Mach super-root.  */
+           p += 3;
+       }
+      else
+       {
+         found_real_path = 1;
+         ++p;

        }
     }
 
        }
     }
 


@@ -1992,6 +2519,25 @@ cd_command (dir, from_tty)
     pwd_command ((char *) 0, 1);
 }
 \f
     pwd_command ((char *) 0, 1);
 }
 \f

+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)
 /* ARGSUSED */
 static void
 source_command (args, from_tty)


@@ -1999,25 +2545,54 @@ source_command (args, from_tty)
      int from_tty;
 {
   FILE *stream;
      int from_tty;
 {
   FILE *stream;

-  struct cleanup *cleanups;
+  struct cleanup *old_cleanups;

   char *file = args;
   char *file = args;

+  struct source_cleanup_lines_args old_lines;
+  int needed_length;

 
 

-  if (file == 0)
-    /* Let source without arguments read .gdbinit.  */
-    file = gdbinit;
+  if (file == NULL)
+    {
+      error ("source command requires pathname of file to source.");
+    }

 
   file = tilde_expand (file);
 
   file = tilde_expand (file);

-  make_cleanup (free, file);
+  old_cleanups = make_cleanup (free, file);

 
 

-  stream = fopen (file, "r");
+  stream = fopen (file, FOPEN_RT);

   if (stream == 0)
     perror_with_name (file);
 
   if (stream == 0)
     perror_with_name (file);
 

-  cleanups = make_cleanup (fclose, stream);
+  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);
 
 
   read_command_file (stream);
 

-  do_cleanups (cleanups);
+  do_cleanups (old_cleanups);

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -2030,7 +2605,7 @@ echo_command (text, from_tty)
   register int c;
 
   if (text)
   register int c;
 
   if (text)

-    while (c = *p++)
+    while ((c = *p++) != '\0')

       {
        if (c == '\\')
          {
       {
        if (c == '\\')
          {


@@ -2049,7 +2624,7 @@ echo_command (text, from_tty)
 
   /* Force this output to appear now.  */
   wrap_here ("");
 
   /* Force this output to appear now.  */
   wrap_here ("");

-  fflush (stdout);
+  gdb_flush (gdb_stdout);

 }
 
 \f
 }
 
 \f


@@ -2073,8 +2648,7 @@ show_commands (args, from_tty)
      than the number of the last command).  Relative to history_base.  */
   int hist_len;
 
      than the number of the last command).  Relative to history_base.  */
   int hist_len;
 

-  extern struct _hist_entry *history_get PARAMS ((int));
-  extern int history_base;
+  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.  */
 
   /* Print out some of the commands from the command history.  */
   /* First determine the length of the history list.  */


@@ -2143,13 +2717,13 @@ set_history_size_command (args, from_tty, c)
      int from_tty;
      struct cmd_list_element *c;
 {
      int from_tty;
      struct cmd_list_element *c;
 {

-  if (history_size == UINT_MAX)
+  if (history_size == INT_MAX)

     unstifle_history ();
   else if (history_size >= 0)
     stifle_history (history_size);
   else
     {
     unstifle_history ();
   else if (history_size >= 0)
     stifle_history (history_size);
   else
     {

-      history_size = UINT_MAX;
+      history_size = INT_MAX;

       error ("History size must be non-negative");
     }
 }
       error ("History size must be non-negative");
     }
 }


@@ -2160,8 +2734,8 @@ set_history (args, from_tty)
      char *args;
      int from_tty;
 {
      char *args;
      int from_tty;
 {

-  printf ("\"set history\" must be followed by the name of a history subcommand.\n");
-  help_list (sethistlist, "set history ", -1, stdout);
+  printf_unfiltered ("\"set history\" must be followed by the name of a history subcommand.\n");
+  help_list (sethistlist, "set history ", -1, gdb_stdout);

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -2206,6 +2780,7 @@ 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.  */
 {
   /* 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.");
 }
 
   error ("Erroneous arithmetic operation.");
 }
 


@@ -2218,7 +2793,7 @@ batch_mode ()
 
 \f
 static void
 
 \f
 static void

-initialize_cmd_lists ()
+init_cmd_lists ()

 {
   cmdlist = NULL;
   infolist = NULL;
 {
   cmdlist = NULL;
   infolist = NULL;


@@ -2250,7 +2825,7 @@ initialize_cmd_lists ()
  */
 
 static void
  */
 
 static void

-initialize_history()
+init_history()

 {
   char *tmpenv;
 
 {
   char *tmpenv;
 


@@ -2275,7 +2850,7 @@ initialize_history()
 }
 
 static void
 }
 
 static void

-initialize_main ()
+init_main ()

 {
   struct cmd_list_element *c;
   
 {
   struct cmd_list_element *c;
   


@@ -2327,10 +2902,11 @@ The commands below can be used to select other frames by number or address.",
 
   add_com ("pwd", class_files, pwd_command,
           "Print working directory.  This is used for your program as well.");
 
   add_com ("pwd", class_files, pwd_command,
           "Print working directory.  This is used for your program as well.");

-  add_com ("cd", class_files, cd_command,
+  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\
           "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.");
+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,
 
   add_show_from_set
     (add_set_cmd ("prompt", class_support, var_string, (char *)&prompt,


@@ -2358,17 +2934,18 @@ Use the \"document\" command to give documentation for the new command.\n\
 Commands defined in this way do not take arguments.");
 
 #ifdef __STDC__
 Commands defined in this way do not take arguments.");
 
 #ifdef __STDC__

-  add_com ("source", class_support, source_command,
+  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\
           "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.");
+when gdb is started.", &cmdlist);

 #else
   /* Punt file name, we can't help it easily.  */
 #else
   /* Punt file name, we can't help it easily.  */

-  add_com ("source", class_support, source_command,
+  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\
           "Read commands from a file named FILE.\n\
 Note that the file \".gdbinit\" is read automatically in this way\n\

-when gdb is started.");
+when gdb is started.", &cmdlist);

 #endif
 #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 ("quit", class_support, quit_command, "Exit gdb.");
   add_com ("help", class_support, help_command, "Print list of commands.");


@@ -2411,7 +2988,7 @@ Use \"on\" to enable to enable the saving, and \"off\" to disable it.\n\
 Without an argument, saving is enabled.", &sethistlist),
      &showhistlist);
 
 Without an argument, saving is enabled.", &sethistlist),
      &showhistlist);
 

-  c = add_set_cmd ("size", no_class, var_uinteger, (char *)&history_size,
+  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);
                   "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);


@@ -2435,6 +3012,9 @@ ie. the number of previous commands to keep a record of.", &sethistlist);
                  &infolist, "info ", 0, &cmdlist);
   add_com_alias ("i", "info", class_info, 1);
 
                  &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);
   add_prefix_cmd ("show", class_info, show_command,
                  "Generic command for showing things about the debugger.",
                  &showlist, "show ", 0, &cmdlist);


@@ -2449,4 +3029,20 @@ the previous command number shown.",
 
   add_cmd ("version", no_class, show_version,
           "Show what version of GDB this is.", &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);

 }
 }