GDB 7.6.50

gdb/tui/tui-source.c

 /* TUI display source window.
 
-   Copyright (C) 1998-2004, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 1998-2013 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
@@ skipping 14 matching lines @@
 #include "symtab.h"
 #include "objfiles.h"
 #include "filenames.h"
 
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-stack.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
 
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_curses.h"
 
 /* Function to display source in the source window.  */
 enum tui_status
 tui_set_source_content (struct symtab *s, 
                         int line_no,
                         int noerror)
 {
   enum tui_status ret = TUI_FAILURE;
 
-  if (s != (struct symtab *) NULL && s->filename != (char *) NULL)
+  if (s != (struct symtab *) NULL)
     {
       FILE *stream;
       int i, desc, c, line_width, nlines;
       char *src_line = 0;
 
       if ((ret = tui_alloc_source_buffer (TUI_SRC_WIN)) == TUI_SUCCESS)
         {
           line_width = TUI_SRC_WIN->generic.width - 1;
           /* Take hilite (window border) into account, when
              calculating the number of lines.  */
           nlines = (line_no + (TUI_SRC_WIN->generic.height - 2)) - line_no;
           desc = open_source_file (s);
           if (desc < 0)
             {
               if (!noerror)
                 {
-                  char *name = alloca (strlen (s->filename) + 100);
+                  const char *filename = symtab_to_filename_for_display (s);
+                  char *name = alloca (strlen (filename) + 100);
 
-                  sprintf (name, "%s:%d", s->filename, line_no);
+                  sprintf (name, "%s:%d", filename, line_no);
                   print_sys_errmsg (name, errno);
                 }
               ret = TUI_FAILURE;
             }
           else
             {
               if (s->line_charpos == 0)
                 find_source_lines (s, desc);
 
               if (line_no < 1 || line_no > s->nlines)
                 {
                   close (desc);
-                  printf_unfiltered (
-                          "Line number %d out of range; %s has %d lines.\n",
-                                      line_no, s->filename, s->nlines);
+                  printf_unfiltered ("Line number %d out of range; "
+                                     "%s has %d lines.\n",
+                                     line_no,
+                                     symtab_to_filename_for_display (s),
+                                     s->nlines);
                 }
               else if (lseek (desc, s->line_charpos[line_no - 1], 0) < 0)
                 {
                   close (desc);
-                  perror_with_name (s->filename);
+                  perror_with_name (symtab_to_filename_for_display (s));
                 }
               else
                 {
                   int offset, cur_line_no, cur_line, cur_len, threshold;
                   struct tui_gen_win_info *locator
                     = tui_locator_win_info_ptr ();
                   struct tui_source_info *src
                     = &TUI_SRC_WIN->detail.source_info;
+                  const char *s_filename = symtab_to_filename_for_display (s);
 
                   if (TUI_SRC_WIN->generic.title)
                     xfree (TUI_SRC_WIN->generic.title);
-                  TUI_SRC_WIN->generic.title = xstrdup (s->filename);
+                  TUI_SRC_WIN->generic.title = xstrdup (s_filename);
 
-                  if (src->filename)
-                    xfree (src->filename);
-                  src->filename = xstrdup (s->filename);
+                  xfree (src->fullname);
+                  src->fullname = xstrdup (symtab_to_fullname (s));
 
                   /* Determine the threshold for the length of the
                      line and the offset to start the display.  */
                   offset = src->horizontal_offset;
                   threshold = (line_width - 1) + offset;
                   stream = fdopen (desc, FOPEN_RT);
                   clearerr (stream);
                   cur_line = 0;
                   src->gdbarch = get_objfile_arch (s->objfile);
                   src->start_line_or_addr.loa = LOA_LINE;
@@ skipping 28 matching lines @@
                       src_line[cur_len] = (char) 0;
 
                       /* Set whether element is the execution point
                          and whether there is a break point on it.  */
                       element->which_element.source.line_or_addr.loa =
                         LOA_LINE;
                       element->which_element.source.line_or_addr.u.line_no =
                         cur_line_no;
                       element->which_element.source.is_exec_point =
                         (filename_cmp (((struct tui_win_element *)
-                                       locator->content[0])->which_element.locator.file_name,
-                                       s->filename) == 0
+                                       locator->content[0])->which_element.locator.full_name,
+                                       symtab_to_fullname (s)) == 0
                          && cur_line_no == ((struct tui_win_element *)
                                             locator->content[0])->which_element.locator.line_no);
                       if (c != EOF)
                         {
                           i = strlen (src_line) - 1;
                           do
                             {
                               if ((c != '\n') && (c != '\r') 
                                   && (++i < threshold))
                                 {
@@ skipping 160 matching lines @@
                         int noerror)
 {
   TUI_SRC_WIN->detail.source_info.horizontal_offset = 0;
   tui_update_source_window_as_is (TUI_SRC_WIN, gdbarch, s, line, noerror);
 }
 
 
 /* Answer whether the source is currently displayed in the source
    window.  */
 int
-tui_source_is_displayed (char *fname)
+tui_source_is_displayed (const char *fullname)
 {
-  return (TUI_SRC_WIN->generic.content_in_use 
+  return (TUI_SRC_WIN != NULL
+          && TUI_SRC_WIN->generic.content_in_use 
           && (filename_cmp (((struct tui_win_element *)
                              (tui_locator_win_info_ptr ())->
-                             content[0])->which_element.locator.file_name,
-                            fname) == 0));
+                             content[0])->which_element.locator.full_name,
+                            fullname) == 0));
 }
 
 
 /* Scroll the source forward or backward vertically.  */
 void
 tui_vertical_source_scroll (enum tui_scroll_direction scroll_direction,
                             int num_to_scroll)
 {
   if (TUI_SRC_WIN->generic.content != NULL)
     {
@@ skipping 22 matching lines @@
         {
           l.u.line_no = content[0]->which_element.source.line_or_addr.u.line_no
             - num_to_scroll;
           if (l.u.line_no <= 0)
             l.u.line_no = 1;
         }
 
       print_source_lines (s, l.u.line_no, l.u.line_no + 1, 0);
     }
 }