btrace: fix test build error in gdb.btrace/instruction_history.c

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

diff --git a/gdb/source.c b/gdb/source.c
index ef2ea0319e347a5f752ec4bc3ead7b45c04ad33b..a1f55b29c4329f7db755d6e140822138063253f7 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1,5 +1,5 @@
 /* List lines of source files for GDB, the GNU debugger.
 /* List lines of source files for GDB, the GNU debugger.

-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2016 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -26,11 +26,10 @@
 #include "gdbcmd.h"
 #include "frame.h"
 #include "value.h"
 #include "gdbcmd.h"
 #include "frame.h"
 #include "value.h"

-#include "gdb_assert.h"
+#include "filestuff.h"

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

-#include "gdb_string.h"
-#include "gdb_stat.h"
+#include <sys/stat.h>

 #include <fcntl.h>
 #include "gdbcore.h"
 #include "gdb_regex.h"
 #include <fcntl.h>
 #include "gdbcore.h"
 #include "gdb_regex.h"


@@ -43,9 +42,7 @@
 #include "completer.h"
 #include "ui-out.h"
 #include "readline/readline.h"
 #include "completer.h"
 #include "ui-out.h"
 #include "readline/readline.h"

-
-#include "psymtab.h"
-
+#include "common/enum-flags.h"

 
 #define OPEN_MODE (O_RDONLY | O_BINARY)
 #define FDOPEN_MODE FOPEN_RB
 
 #define OPEN_MODE (O_RDONLY | O_BINARY)
 #define FDOPEN_MODE FOPEN_RB


@@ -98,7 +95,7 @@ static struct program_space *current_source_pspace;
    and friends should be rewritten to count characters and see where
    things are wrapping, but that would be a fair amount of work.  */
 
    and friends should be rewritten to count characters and see where
    things are wrapping, but that would be a fair amount of work.  */
 

-int lines_to_list = 10;
+static int lines_to_list = 10;

 static void
 show_lines_to_list (struct ui_file *file, int from_tty,
                    struct cmd_list_element *c, const char *value)
 static void
 show_lines_to_list (struct ui_file *file, int from_tty,
                    struct cmd_list_element *c, const char *value)


@@ -135,7 +132,9 @@ show_filename_display_string (struct ui_file *file, int from_tty,
 
 static int last_line_listed;
 
 
 static int last_line_listed;
 

-/* First line number listed by last listing command.  */
+/* First line number listed by last listing command.  If 0, then no
+   source lines have yet been listed since the last time the current
+   source line was changed.  */

 
 static int first_line_listed;
 
 
 static int first_line_listed;
 


@@ -155,6 +154,16 @@ get_first_line_listed (void)
   return first_line_listed;
 }
 
   return first_line_listed;
 }
 

+/* Clear line listed range.  This makes the next "list" center the
+   printed source lines around the current source line.  */
+
+static void
+clear_lines_listed_range (void)
+{
+  first_line_listed = 0;
+  last_line_listed = 0;
+}
+

 /* Return the default number of lines to print with commands like the
    cli "list".  The caller of print_source_lines must use this to
    calculate the end line and use it in the call to print_source_lines
 /* Return the default number of lines to print with commands like the
    cli "list".  The caller of print_source_lines must use this to
    calculate the end line and use it in the call to print_source_lines


@@ -222,6 +231,9 @@ set_current_source_symtab_and_line (const struct symtab_and_line *sal)
   current_source_symtab = sal->symtab;
   current_source_line = sal->line;
 
   current_source_symtab = sal->symtab;
   current_source_line = sal->line;
 

+  /* Force the next "list" to center around the current line.  */
+  clear_lines_listed_range ();
+

   return cursal;
 }
 
   return cursal;
 }
 


@@ -248,6 +260,7 @@ select_source_symtab (struct symtab *s)
   struct symtabs_and_lines sals;
   struct symtab_and_line sal;
   struct objfile *ofp;
   struct symtabs_and_lines sals;
   struct symtab_and_line sal;
   struct objfile *ofp;

+  struct compunit_symtab *cu;

 
   if (s)
     {
 
   if (s)
     {


@@ -262,7 +275,7 @@ select_source_symtab (struct symtab *s)
 
   /* Make the default place to list be the function `main'
      if one exists.  */
 
   /* Make the default place to list be the function `main'
      if one exists.  */

-  if (lookup_symbol (main_name (), 0, VAR_DOMAIN, 0))
+  if (lookup_symbol (main_name (), 0, VAR_DOMAIN, 0).symbol)

     {
       sals = decode_line_with_current_source (main_name (),
                                              DECODE_LINE_FUNFIRSTLINE);
     {
       sals = decode_line_with_current_source (main_name (),
                                              DECODE_LINE_FUNFIRSTLINE);


@@ -280,19 +293,16 @@ select_source_symtab (struct symtab *s)
 
   current_source_line = 1;
 
 
   current_source_line = 1;
 

-  ALL_OBJFILES (ofp)
+  ALL_FILETABS (ofp, cu, s)

     {
     {

-      for (s = ofp->symtabs; s; s = s->next)
-       {
-         const char *name = s->filename;
-         int len = strlen (name);
+      const char *name = s->filename;
+      int len = strlen (name);

 
 

-         if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0
-             || strcmp (name, "<<C++-namespaces>>") == 0)))
-           {
-             current_source_pspace = current_program_space;
-             current_source_symtab = s;
-           }
+      if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0
+                       || strcmp (name, "<<C++-namespaces>>") == 0)))
+       {
+         current_source_pspace = current_program_space;
+         current_source_symtab = s;

        }
     }
 
        }
     }
 


@@ -361,9 +371,10 @@ show_directories_command (struct ui_file *file, int from_tty,
 void
 forget_cached_source_info_for_objfile (struct objfile *objfile)
 {
 void
 forget_cached_source_info_for_objfile (struct objfile *objfile)
 {

+  struct compunit_symtab *cu;

   struct symtab *s;
 
   struct symtab *s;
 

-  ALL_OBJFILE_SYMTABS (objfile, s)
+  ALL_OBJFILE_FILETABS (objfile, cu, s)

     {
       if (s->line_charpos != NULL)
        {
     {
       if (s->line_charpos != NULL)
        {


@@ -576,17 +587,33 @@ add_path (char *dirname, char **which_path, int parse_separators)
        char tinybuf[2];
 
        p = *which_path;
        char tinybuf[2];
 
        p = *which_path;

-       /* FIXME: we should use realpath() or its work-alike
-          before comparing.  Then all the code above which
-          removes excess slashes and dots could simply go away.  */
-       if (!filename_cmp (p, name))
+       while (1)

          {
          {

-           /* Found it in the search path, remove old copy.  */
-           if (p > *which_path)
-             p--;              /* Back over leading separator.  */
-           if (prefix > p - *which_path)
-             goto skip_dup;    /* Same dir twice in one cmd.  */
-           memmove (p, &p[len + 1], strlen (&p[len + 1]) + 1); /* Copy from next \0 or  : */
+           /* FIXME: we should use realpath() or its work-alike
+              before comparing.  Then all the code above which
+              removes excess slashes and dots could simply go away.  */
+           if (!filename_ncmp (p, name, len)
+               && (p[len] == '\0' || p[len] == DIRNAME_SEPARATOR))
+             {
+               /* Found it in the search path, remove old copy.  */
+               if (p > *which_path)
+                 {
+                   /* Back over leading separator.  */
+                   p--;
+                 }
+               if (prefix > p - *which_path)
+                 {
+                   /* Same dir twice in one cmd.  */
+                   goto skip_dup;
+                 }
+               /* Copy from next '\0' or ':'.  */
+               memmove (p, &p[len + 1], strlen (&p[len + 1]) + 1);
+             }
+           p = strchr (p, DIRNAME_SEPARATOR);
+           if (p != 0)
+             ++p;
+           else
+             break;

          }
 
        tinybuf[0] = DIRNAME_SEPARATOR;
          }
 
        tinybuf[0] = DIRNAME_SEPARATOR;


@@ -628,15 +655,18 @@ static void
 source_info (char *ignore, int from_tty)
 {
   struct symtab *s = current_source_symtab;
 source_info (char *ignore, int from_tty)
 {
   struct symtab *s = current_source_symtab;

+  struct compunit_symtab *cust;

 
   if (!s)
     {
       printf_filtered (_("No current source file.\n"));
       return;
     }
 
   if (!s)
     {
       printf_filtered (_("No current source file.\n"));
       return;
     }

+
+  cust = SYMTAB_COMPUNIT (s);

   printf_filtered (_("Current source file is %s\n"), s->filename);
   printf_filtered (_("Current source file is %s\n"), s->filename);

-  if (s->dirname)
-    printf_filtered (_("Compilation directory is %s\n"), s->dirname);
+  if (SYMTAB_DIRNAME (s) != NULL)
+    printf_filtered (_("Compilation directory is %s\n"), SYMTAB_DIRNAME (s));

   if (s->fullname)
     printf_filtered (_("Located in %s\n"), s->fullname);
   if (s->nlines)
   if (s->fullname)
     printf_filtered (_("Located in %s\n"), s->fullname);
   if (s->nlines)


@@ -644,9 +674,14 @@ source_info (char *ignore, int from_tty)
                     s->nlines == 1 ? "" : "s");
 
   printf_filtered (_("Source language is %s.\n"), language_str (s->language));
                     s->nlines == 1 ? "" : "s");
 
   printf_filtered (_("Source language is %s.\n"), language_str (s->language));

-  printf_filtered (_("Compiled with %s debugging format.\n"), s->debugformat);
+  printf_filtered (_("Producer is %s.\n"),
+                  COMPUNIT_PRODUCER (cust) != NULL
+                  ? COMPUNIT_PRODUCER (cust) : _("unknown"));
+  printf_filtered (_("Compiled with %s debugging format.\n"),
+                  COMPUNIT_DEBUGFORMAT (cust));

   printf_filtered (_("%s preprocessor macro info.\n"),
   printf_filtered (_("%s preprocessor macro info.\n"),

-                   s->macro_table ? "Includes" : "Does not include");
+                  COMPUNIT_MACRO_TABLE (cust) != NULL
+                  ? "Includes" : "Does not include");

 }
 \f
 
 }
 \f
 


@@ -676,9 +711,10 @@ is_regular_file (const char *name)
 
    If OPF_TRY_CWD_FIRST, try to open ./STRING before searching PATH.
    (ie pretend the first element of PATH is ".").  This also indicates
 
    If OPF_TRY_CWD_FIRST, try to open ./STRING before searching PATH.
    (ie pretend the first element of PATH is ".").  This also indicates

-   that a slash in STRING disables searching of the path (this is
-   so that "exec-file ./foo" or "symbol-file ./foo" insures that you
-   get that particular version of foo or an error message).
+   that, unless OPF_SEARCH_IN_PATH is also specified, a slash in STRING
+   disables searching of the path (this is so that "exec-file ./foo" or
+   "symbol-file ./foo" insures that you get that particular version of
+   foo or an error message).

 
    If OPTS has OPF_SEARCH_IN_PATH set, absolute names will also be
    searched in path (we usually want this for source files but not for
 
    If OPTS has OPF_SEARCH_IN_PATH set, absolute names will also be
    searched in path (we usually want this for source files but not for


@@ -690,6 +726,11 @@ is_regular_file (const char *name)
    and the file, sigh!  Emacs gets confuzzed by this when we print the
    source file name!!! 
 
    and the file, sigh!  Emacs gets confuzzed by this when we print the
    source file name!!! 
 

+   If OPTS has OPF_RETURN_REALPATH set return FILENAME_OPENED resolved by
+   gdb_realpath.  Even without OPF_RETURN_REALPATH this function still returns
+   filename starting with "/".  If FILENAME_OPENED is NULL this option has no
+   effect.
+

    If a file is found, return the descriptor.
    Otherwise, return -1, with errno set for the last name we tried to open.  */
 
    If a file is found, return the descriptor.
    Otherwise, return -1, with errno set for the last name we tried to open.  */
 


@@ -706,6 +747,9 @@ openp (const char *path, int opts, const char *string,
   struct cleanup *back_to;
   int ix;
   char *dir;
   struct cleanup *back_to;
   int ix;
   char *dir;

+  /* The errno set for the last name we tried to open (and
+     failed).  */
+  int last_errno = 0;

 
   /* The open syscall MODE parameter is not specified.  */
   gdb_assert ((mode & O_CREAT) == 0);
 
   /* The open syscall MODE parameter is not specified.  */
   gdb_assert ((mode & O_CREAT) == 0);


@@ -735,9 +779,9 @@ openp (const char *path, int opts, const char *string,
 
       if (is_regular_file (string))
        {
 
       if (is_regular_file (string))
        {

-         filename = alloca (strlen (string) + 1);
+         filename = (char *) alloca (strlen (string) + 1);

          strcpy (filename, string);
          strcpy (filename, string);

-         fd = open (filename, mode);
+         fd = gdb_open_cloexec (filename, mode, 0);

          if (fd >= 0)
            goto done;
        }
          if (fd >= 0)
            goto done;
        }


@@ -746,6 +790,7 @@ openp (const char *path, int opts, const char *string,
          filename = NULL;
          fd = -1;
        }
          filename = NULL;
          fd = -1;
        }

+      last_errno = errno;

 
       if (!(opts & OPF_SEARCH_IN_PATH))
        for (i = 0; string[i]; i++)
 
       if (!(opts & OPF_SEARCH_IN_PATH))
        for (i = 0; string[i]; i++)


@@ -766,8 +811,9 @@ openp (const char *path, int opts, const char *string,
     string += 2;
 
   alloclen = strlen (path) + strlen (string) + 2;
     string += 2;
 
   alloclen = strlen (path) + strlen (string) + 2;

-  filename = alloca (alloclen);
+  filename = (char *) alloca (alloclen);

   fd = -1;
   fd = -1;

+  last_errno = ENOENT;

 
   dir_vec = dirnames_to_char_ptr_vec (path);
   back_to = make_cleanup_free_char_ptr_vec (dir_vec);
 
   dir_vec = dirnames_to_char_ptr_vec (path);
   back_to = make_cleanup_free_char_ptr_vec (dir_vec);


@@ -787,7 +833,7 @@ openp (const char *path, int opts, const char *string,
          if (newlen > alloclen)
            {
              alloclen = newlen;
          if (newlen > alloclen)
            {
              alloclen = newlen;

-             filename = alloca (alloclen);
+             filename = (char *) alloca (alloclen);

            }
          strcpy (filename, current_directory);
        }
            }
          strcpy (filename, current_directory);
        }


@@ -805,7 +851,7 @@ openp (const char *path, int opts, const char *string,
          if (newlen > alloclen)
            {
              alloclen = newlen;
          if (newlen > alloclen)
            {
              alloclen = newlen;

-             filename = alloca (alloclen);
+             filename = (char *) alloca (alloclen);

            }
          strcpy (filename, tilde_expanded);
          xfree (tilde_expanded);
            }
          strcpy (filename, tilde_expanded);
          xfree (tilde_expanded);


@@ -835,9 +881,10 @@ openp (const char *path, int opts, const char *string,
 
       if (is_regular_file (filename))
        {
 
       if (is_regular_file (filename))
        {

-         fd = open (filename, mode);
+         fd = gdb_open_cloexec (filename, mode, 0);

          if (fd >= 0)
            break;
          if (fd >= 0)
            break;

+         last_errno = errno;

        }
     }
 
        }
     }
 


@@ -849,22 +896,13 @@ done:
       /* If a file was opened, canonicalize its filename.  */
       if (fd < 0)
        *filename_opened = NULL;
       /* If a file was opened, canonicalize its filename.  */
       if (fd < 0)
        *filename_opened = NULL;

-      else if (IS_ABSOLUTE_PATH (filename))
+      else if ((opts & OPF_RETURN_REALPATH) != 0)

        *filename_opened = gdb_realpath (filename);
       else
        *filename_opened = gdb_realpath (filename);
       else

-       {
-         /* Beware the // my son, the Emacs barfs, the botch that catch...  */
-
-         char *f = concat (current_directory,
-                           IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1])
-                           ? "" : SLASH_STRING,
-                           filename, (char *)NULL);
-
-         *filename_opened = gdb_realpath (f);
-         xfree (f);
-       }
+       *filename_opened = gdb_abspath (filename);

     }
 
     }
 

+  errno = last_errno;

   return fd;
 }
 
   return fd;
 }
 


@@ -885,8 +923,9 @@ source_full_path_of (const char *filename, char **full_pathname)
 {
   int fd;
 
 {
   int fd;
 

-  fd = openp (source_path, OPF_TRY_CWD_FIRST | OPF_SEARCH_IN_PATH, filename,
-             O_RDONLY, full_pathname);
+  fd = openp (source_path,
+             OPF_TRY_CWD_FIRST | OPF_SEARCH_IN_PATH | OPF_RETURN_REALPATH,
+             filename, O_RDONLY, full_pathname);

   if (fd < 0)
     {
       *full_pathname = NULL;
   if (fd < 0)
     {
       *full_pathname = NULL;


@@ -906,27 +945,20 @@ substitute_path_rule_matches (const struct substitute_path_rule *rule,
 {
   const int from_len = strlen (rule->from);
   const int path_len = strlen (path);
 {
   const int from_len = strlen (rule->from);
   const int path_len = strlen (path);

-  char *path_start;

 
   if (path_len < from_len)
     return 0;
 
   /* The substitution rules are anchored at the start of the path,
 
   if (path_len < from_len)
     return 0;
 
   /* The substitution rules are anchored at the start of the path,

-     so the path should start with rule->from.  There is no filename
-     comparison routine, so we need to extract the first FROM_LEN
-     characters from PATH first and use that to do the comparison.  */
-
-  path_start = alloca (from_len + 1);
-  strncpy (path_start, path, from_len);
-  path_start[from_len] = '\0';
+     so the path should start with rule->from.  */

 
 

-  if (FILENAME_CMP (path_start, rule->from) != 0)
+  if (filename_ncmp (path, rule->from, from_len) != 0)

     return 0;
 
   /* Make sure that the region in the path that matches the substitution
      rule is immediately followed by a directory separator (or the end of
      string character).  */
     return 0;
 
   /* Make sure that the region in the path that matches the substitution
      rule is immediately followed by a directory separator (or the end of
      string character).  */

-  
+

   if (path[from_len] != '\0' && !IS_DIR_SEPARATOR (path[from_len]))
     return 0;
 
   if (path[from_len] != '\0' && !IS_DIR_SEPARATOR (path[from_len]))
     return 0;
 


@@ -954,7 +986,7 @@ get_substitute_path_rule (const char *path)
    Return NULL if no substitution rule was specified by the user,
    or if no rule applied to the given PATH.  */
    
    Return NULL if no substitution rule was specified by the user,
    or if no rule applied to the given PATH.  */
    

-static char *
+char *

 rewrite_source_path (const char *path)
 {
   const struct substitute_path_rule *rule = get_substitute_path_rule (path);
 rewrite_source_path (const char *path)
 {
   const struct substitute_path_rule *rule = get_substitute_path_rule (path);


@@ -984,6 +1016,7 @@ find_and_open_source (const char *filename,
   char *path = source_path;
   const char *p;
   int result;
   char *path = source_path;
   const char *p;
   int result;

+  struct cleanup *cleanup;

 
   /* Quick way out if we already know its full name.  */
 
 
   /* Quick way out if we already know its full name.  */
 


@@ -1000,7 +1033,7 @@ find_and_open_source (const char *filename,
           *fullname = rewritten_fullname;
         }
 
           *fullname = rewritten_fullname;
         }
 

-      result = open (*fullname, OPEN_MODE);
+      result = gdb_open_cloexec (*fullname, OPEN_MODE, 0);

       if (result >= 0)
        {
          char *lpath = gdb_realpath (*fullname);
       if (result >= 0)
        {
          char *lpath = gdb_realpath (*fullname);


@@ -1015,6 +1048,8 @@ find_and_open_source (const char *filename,
       *fullname = NULL;
     }
 
       *fullname = NULL;
     }
 

+  cleanup = make_cleanup (null_cleanup, NULL);
+

   if (dirname != NULL)
     {
       /* If necessary, rewrite the compilation directory name according
   if (dirname != NULL)
     {
       /* If necessary, rewrite the compilation directory name according


@@ -1062,15 +1097,18 @@ find_and_open_source (const char *filename,
         }
     }
 
         }
     }
 

-  result = openp (path, OPF_SEARCH_IN_PATH, filename, OPEN_MODE, fullname);
+  result = openp (path, OPF_SEARCH_IN_PATH | OPF_RETURN_REALPATH, filename,
+                 OPEN_MODE, fullname);

   if (result < 0)
     {
       /* Didn't work.  Try using just the basename.  */
       p = lbasename (filename);
       if (p != filename)
   if (result < 0)
     {
       /* Didn't work.  Try using just the basename.  */
       p = lbasename (filename);
       if (p != filename)

-       result = openp (path, OPF_SEARCH_IN_PATH, p, OPEN_MODE, fullname);
+       result = openp (path, OPF_SEARCH_IN_PATH | OPF_RETURN_REALPATH, p,
+                       OPEN_MODE, fullname);

     }
 
     }
 

+  do_cleanups (cleanup);

   return result;
 }
 
   return result;
 }
 


@@ -1085,7 +1123,7 @@ open_source_file (struct symtab *s)
   if (!s)
     return -1;
 
   if (!s)
     return -1;
 

-  return find_and_open_source (s->filename, s->dirname, &s->fullname);
+  return find_and_open_source (s->filename, SYMTAB_DIRNAME (s), &s->fullname);

 }
 
 /* Finds the fullname that a symtab represents.
 }
 
 /* Finds the fullname that a symtab represents.


@@ -1105,7 +1143,8 @@ symtab_to_fullname (struct symtab *s)
      to handle cases like the file being moved.  */
   if (s->fullname == NULL)
     {
      to handle cases like the file being moved.  */
   if (s->fullname == NULL)
     {

-      int fd = find_and_open_source (s->filename, s->dirname, &s->fullname);
+      int fd = find_and_open_source (s->filename, SYMTAB_DIRNAME (s),
+                                    &s->fullname);

 
       if (fd >= 0)
        close (fd);
 
       if (fd >= 0)
        close (fd);


@@ -1117,10 +1156,11 @@ symtab_to_fullname (struct symtab *s)
          /* rewrite_source_path would be applied by find_and_open_source, we
             should report the pathname where GDB tried to find the file.  */
 
          /* rewrite_source_path would be applied by find_and_open_source, we
             should report the pathname where GDB tried to find the file.  */
 

-         if (s->dirname == NULL || IS_ABSOLUTE_PATH (s->filename))
+         if (SYMTAB_DIRNAME (s) == NULL || IS_ABSOLUTE_PATH (s->filename))

            fullname = xstrdup (s->filename);
          else
            fullname = xstrdup (s->filename);
          else

-           fullname = concat (s->dirname, SLASH_STRING, s->filename, NULL);
+           fullname = concat (SYMTAB_DIRNAME (s), SLASH_STRING, s->filename,
+                              NULL);

 
          back_to = make_cleanup (xfree, fullname);
          s->fullname = rewrite_source_path (fullname);
 
          back_to = make_cleanup (xfree, fullname);
          s->fullname = rewrite_source_path (fullname);


@@ -1165,12 +1205,12 @@ find_source_lines (struct symtab *s, int desc)
   int size;
 
   gdb_assert (s);
   int size;
 
   gdb_assert (s);

-  line_charpos = (int *) xmalloc (lines_allocated * sizeof (int));
+  line_charpos = XNEWVEC (int, lines_allocated);

   if (fstat (desc, &st) < 0)
     perror_with_name (symtab_to_filename_for_display (s));
 
   if (fstat (desc, &st) < 0)
     perror_with_name (symtab_to_filename_for_display (s));
 

-  if (s->objfile && s->objfile->obfd)
-    mtime = s->objfile->mtime;
+  if (SYMTAB_OBJFILE (s) != NULL && SYMTAB_OBJFILE (s)->obfd != NULL)
+    mtime = SYMTAB_OBJFILE (s)->mtime;

   else if (exec_bfd)
     mtime = exec_bfd_mtime;
 
   else if (exec_bfd)
     mtime = exec_bfd_mtime;
 


@@ -1274,12 +1314,11 @@ identify_source_line (struct symtab *s, int line, int mid_statement,
     /* Don't index off the end of the line_charpos array.  */
     return 0;
   annotate_source (s->fullname, line, s->line_charpos[line - 1],
     /* Don't index off the end of the line_charpos array.  */
     return 0;
   annotate_source (s->fullname, line, s->line_charpos[line - 1],

-                  mid_statement, get_objfile_arch (s->objfile), pc);
+                  mid_statement, get_objfile_arch (SYMTAB_OBJFILE (s)), pc);

 
   current_source_line = line;
 
   current_source_line = line;

-  first_line_listed = line;
-  last_line_listed = line;

   current_source_symtab = s;
   current_source_symtab = s;

+  clear_lines_listed_range ();

   return 1;
 }
 \f
   return 1;
 }
 \f


@@ -1289,7 +1328,7 @@ identify_source_line (struct symtab *s, int line, int mid_statement,
 
 static void
 print_source_lines_base (struct symtab *s, int line, int stopline,
 
 static void
 print_source_lines_base (struct symtab *s, int line, int stopline,

-                        enum print_source_lines_flags flags)
+                        print_source_lines_flags flags)

 {
   int c;
   int desc;
 {
   int c;
   int desc;


@@ -1323,7 +1362,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
   else
     {
       desc = last_source_error;
   else
     {
       desc = last_source_error;

-         flags |= PRINT_SOURCE_LINES_NOERROR;
+      flags |= PRINT_SOURCE_LINES_NOERROR;

       noprint = 1;
     }
 
       noprint = 1;
     }
 


@@ -1335,7 +1374,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
        {
          const char *filename = symtab_to_filename_for_display (s);
          int len = strlen (filename) + 100;
        {
          const char *filename = symtab_to_filename_for_display (s);
          int len = strlen (filename) + 100;

-         char *name = alloca (len);
+         char *name = (char *) alloca (len);

 
          xsnprintf (name, len, "%d\t%s", line, filename);
          print_sys_errmsg (name, errno);
 
          xsnprintf (name, len, "%d\t%s", line, filename);
          print_sys_errmsg (name, errno);


@@ -1344,18 +1383,30 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
        {
          ui_out_field_int (uiout, "line", line);
          ui_out_text (uiout, "\tin ");
        {
          ui_out_field_int (uiout, "line", line);
          ui_out_text (uiout, "\tin ");

-         ui_out_field_string (uiout, "file",
-                              symtab_to_filename_for_display (s));

 
 

-         /* TUI expects the "fullname" field.  While it is
-            !ui_out_is_mi_like_p compared to CLI it is !ui_source_list.  */
+         /* CLI expects only the "file" field.  TUI expects only the
+            "fullname" field (and TUI does break if "file" is printed).
+            MI expects both fields.  ui_source_list is set only for CLI,
+            not for TUI.  */
+         if (ui_out_is_mi_like_p (uiout)
+             || ui_out_test_flags (uiout, ui_source_list))
+           ui_out_field_string (uiout, "file",
+                                symtab_to_filename_for_display (s));

          if (ui_out_is_mi_like_p (uiout)
              || !ui_out_test_flags (uiout, ui_source_list))
          if (ui_out_is_mi_like_p (uiout)
              || !ui_out_test_flags (uiout, ui_source_list))

-           {
-             const char *fullname = symtab_to_fullname (s);
+           {
+             const char *s_fullname = symtab_to_fullname (s);
+             char *local_fullname;
+
+             /* ui_out_field_string may free S_FULLNAME by calling
+                open_source_file for it again.  See e.g.,
+                tui_field_string->tui_show_source.  */
+             local_fullname = (char *) alloca (strlen (s_fullname) + 1);
+             strcpy (local_fullname, s_fullname);
+
+             ui_out_field_string (uiout, "fullname", local_fullname);
+           }

 
 

-             ui_out_field_string (uiout, "fullname", fullname);
-           }

          ui_out_text (uiout, "\n");
        }
 
          ui_out_text (uiout, "\n");
        }
 


@@ -1437,7 +1488,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
 
 void
 print_source_lines (struct symtab *s, int line, int stopline,
 
 void
 print_source_lines (struct symtab *s, int line, int stopline,

-                   enum print_source_lines_flags flags)
+                   print_source_lines_flags flags)

 {
   print_source_lines_base (s, line, stopline, flags);
 }
 {
   print_source_lines_base (s, line, stopline, flags);
 }


@@ -1459,10 +1510,13 @@ line_info (char *arg, int from_tty)
     {
       sal.symtab = current_source_symtab;
       sal.pspace = current_program_space;
     {
       sal.symtab = current_source_symtab;
       sal.pspace = current_program_space;

-      sal.line = last_line_listed;
+      if (last_line_listed != 0)
+       sal.line = last_line_listed;
+      else
+       sal.line = current_source_line;
+

       sals.nelts = 1;
       sals.nelts = 1;

-      sals.sals = (struct symtab_and_line *)
-       xmalloc (sizeof (struct symtab_and_line));
+      sals.sals = XNEW (struct symtab_and_line);

       sals.sals[0] = sal;
     }
   else
       sals.sals[0] = sal;
     }
   else


@@ -1503,7 +1557,8 @@ line_info (char *arg, int from_tty)
       else if (sal.line > 0
               && find_line_pc_range (sal, &start_pc, &end_pc))
        {
       else if (sal.line > 0
               && find_line_pc_range (sal, &start_pc, &end_pc))
        {

-         struct gdbarch *gdbarch = get_objfile_arch (sal.symtab->objfile);
+         struct gdbarch *gdbarch
+           = get_objfile_arch (SYMTAB_OBJFILE (sal.symtab));

 
          if (start_pc == end_pc)
            {
 
          if (start_pc == end_pc)
            {


@@ -1597,10 +1652,10 @@ forward_search_command (char *regex, int from_tty)
       int cursize, newsize;
 
       cursize = 256;
       int cursize, newsize;
 
       cursize = 256;

-      buf = xmalloc (cursize);
+      buf = (char *) xmalloc (cursize);

       p = buf;
 
       p = buf;
 

-      c = getc (stream);
+      c = fgetc (stream);

       if (c == EOF)
        break;
       do
       if (c == EOF)
        break;
       do


@@ -1609,12 +1664,12 @@ forward_search_command (char *regex, int from_tty)
          if (p - buf == cursize)
            {
              newsize = cursize + cursize / 2;
          if (p - buf == cursize)
            {
              newsize = cursize + cursize / 2;

-             buf = xrealloc (buf, newsize);
+             buf = (char *) xrealloc (buf, newsize);

              p = buf + cursize;
              cursize = newsize;
            }
        }
              p = buf + cursize;
              cursize = newsize;
            }
        }

-      while (c != '\n' && (c = getc (stream)) >= 0);
+      while (c != '\n' && (c = fgetc (stream)) >= 0);

 
       /* Remove the \r, if any, at the end of the line, otherwise
          regular expressions that end with $ or \n won't work.  */
 
       /* Remove the \r, if any, at the end of the line, otherwise
          regular expressions that end with $ or \n won't work.  */


@@ -1685,14 +1740,14 @@ reverse_search_command (char *regex, int from_tty)
       char buf[4096];          /* Should be reasonable???  */
       char *p = buf;
 
       char buf[4096];          /* Should be reasonable???  */
       char *p = buf;
 

-      c = getc (stream);
+      c = fgetc (stream);

       if (c == EOF)
        break;
       do
        {
          *p++ = c;
        }
       if (c == EOF)
        break;
       do
        {
          *p++ = c;
        }

-      while (c != '\n' && (c = getc (stream)) >= 0);
+      while (c != '\n' && (c = fgetc (stream)) >= 0);

 
       /* Remove the \r, if any, at the end of the line, otherwise
          regular expressions that end with $ or \n won't work.  */
 
       /* Remove the \r, if any, at the end of the line, otherwise
          regular expressions that end with $ or \n won't work.  */


@@ -1768,9 +1823,8 @@ void
 add_substitute_path_rule (char *from, char *to)
 {
   struct substitute_path_rule *rule;
 add_substitute_path_rule (char *from, char *to)
 {
   struct substitute_path_rule *rule;

-  struct substitute_path_rule *new_rule;
+  struct substitute_path_rule *new_rule = XNEW (struct substitute_path_rule);

 
 

-  new_rule = xmalloc (sizeof (struct substitute_path_rule));

   new_rule->from = xstrdup (from);
   new_rule->to = xstrdup (to);
   new_rule->next = NULL;
   new_rule->from = xstrdup (from);
   new_rule->to = xstrdup (to);
   new_rule->next = NULL;


@@ -1827,9 +1881,10 @@ show_substitute_path_command (char *args, int from_tty)
   struct substitute_path_rule *rule = substitute_path_rules;
   char **argv;
   char *from = NULL;
   struct substitute_path_rule *rule = substitute_path_rules;
   char **argv;
   char *from = NULL;

+  struct cleanup *cleanup;

   
   argv = gdb_buildargv (args);
   
   argv = gdb_buildargv (args);

-  make_cleanup_freeargv (argv);
+  cleanup = make_cleanup_freeargv (argv);

 
   /* We expect zero or one argument.  */
 
 
   /* We expect zero or one argument.  */
 


@@ -1849,10 +1904,12 @@ show_substitute_path_command (char *args, int from_tty)
 
   while (rule != NULL)
     {
 
   while (rule != NULL)
     {

-      if (from == NULL || FILENAME_CMP (rule->from, from) == 0)
+      if (from == NULL || substitute_path_rule_matches (rule, from) != 0)

         printf_filtered ("  `%s' -> `%s'.\n", rule->from, rule->to);
       rule = rule->next;
     }
         printf_filtered ("  `%s' -> `%s'.\n", rule->from, rule->to);
       rule = rule->next;
     }

+
+  do_cleanups (cleanup);

 }
 
 /* Implement the "unset substitute-path" command.  */
 }
 
 /* Implement the "unset substitute-path" command.  */


@@ -1864,10 +1921,11 @@ unset_substitute_path_command (char *args, int from_tty)
   char **argv = gdb_buildargv (args);
   char *from = NULL;
   int rule_found = 0;
   char **argv = gdb_buildargv (args);
   char *from = NULL;
   int rule_found = 0;

+  struct cleanup *cleanup;

 
   /* This function takes either 0 or 1 argument.  */
 
 
   /* This function takes either 0 or 1 argument.  */
 

-  make_cleanup_freeargv (argv);
+  cleanup = make_cleanup_freeargv (argv);

   if (argv != NULL && argv[0] != NULL && argv[1] != NULL)
     error (_("Incorrect usage, too many arguments in command"));
 
   if (argv != NULL && argv[0] != NULL && argv[1] != NULL)
     error (_("Incorrect usage, too many arguments in command"));
 


@@ -1905,6 +1963,8 @@ unset_substitute_path_command (char *args, int from_tty)
     error (_("No substitution rule defined for `%s'"), from);
 
   forget_cached_source_info ();
     error (_("No substitution rule defined for `%s'"), from);
 
   forget_cached_source_info ();

+
+  do_cleanups (cleanup);

 }
 
 /* Add a new source path substitution rule.  */
 }
 
 /* Add a new source path substitution rule.  */


@@ -1914,9 +1974,10 @@ set_substitute_path_command (char *args, int from_tty)
 {
   char **argv;
   struct substitute_path_rule *rule;
 {
   char **argv;
   struct substitute_path_rule *rule;

+  struct cleanup *cleanup;

   
   argv = gdb_buildargv (args);
   
   argv = gdb_buildargv (args);

-  make_cleanup_freeargv (argv);
+  cleanup = make_cleanup_freeargv (argv);

 
   if (argv == NULL || argv[0] == NULL || argv [1] == NULL)
     error (_("Incorrect usage, too few arguments in command"));
 
   if (argv == NULL || argv[0] == NULL || argv [1] == NULL)
     error (_("Incorrect usage, too few arguments in command"));


@@ -1943,6 +2004,8 @@ set_substitute_path_command (char *args, int from_tty)
 
   add_substitute_path_rule (argv[0], argv[1]);
   forget_cached_source_info ();
 
   add_substitute_path_rule (argv[0], argv[1]);
   forget_cached_source_info ();

+
+  do_cleanups (cleanup);

 }
 
 \f
 }
 
 \f


@@ -1990,16 +2053,6 @@ Setting the value to an empty string sets it to $cdir:$cwd, the default."),
                            show_directories_command,
                            &setlist, &showlist);
 
                            show_directories_command,
                            &setlist, &showlist);
 

-  if (xdb_commands)
-    {
-      add_com_alias ("D", "directory", class_files, 0);
-      add_cmd ("ld", no_class, show_directories_1, _("\
-Current search path for finding source files.\n\
-$cwd in the path means the current working directory.\n\
-$cdir in the path means the compilation directory of the source file."),
-              &cmdlist);
-    }
-

   add_info ("source", source_info,
            _("Information about the current source file."));
 
   add_info ("source", source_info,
            _("Information about the current source file."));
 


@@ -2026,18 +2079,15 @@ Search backward for regular expression (see regex(3)) from last line listed.\n\
 The matching line number is also stored as the value of \"$_\"."));
   add_com_alias ("rev", "reverse-search", class_files, 1);
 
 The matching line number is also stored as the value of \"$_\"."));
   add_com_alias ("rev", "reverse-search", class_files, 1);
 

-  if (xdb_commands)
-    {
-      add_com_alias ("/", "forward-search", class_files, 0);
-      add_com_alias ("?", "reverse-search", class_files, 0);
-    }
-
-  add_setshow_zuinteger_unlimited_cmd ("listsize", class_support,
-                                      &lines_to_list, _("\
+  add_setshow_integer_cmd ("listsize", class_support, &lines_to_list, _("\

 Set number of source lines gdb will list by default."), _("\
 Set number of source lines gdb will list by default."), _("\

-Show number of source lines gdb will list by default."), NULL,
-                                      NULL, show_lines_to_list,
-                                      &setlist, &showlist);
+Show number of source lines gdb will list by default."), _("\
+Use this to choose how many source lines the \"list\" displays (unless\n\
+the \"list\" argument explicitly specifies some other number).\n\
+A value of \"unlimited\", or zero, means there's no limit."),
+                           NULL,
+                           show_lines_to_list,
+                           &setlist, &showlist);

 
   add_cmd ("substitute-path", class_files, set_substitute_path_command,
            _("\
 
   add_cmd ("substitute-path", class_files, set_substitute_path_command,
            _("\