/* TUI display source window.
- Copyright (C) 1998-2004, 2007-2012 Free Software Foundation, Inc.
+ Copyright (C) 1998-2016 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
#include "tui/tui-stack.h"
#include "tui/tui-winsource.h"
#include "tui/tui-source.h"
-
-#include "gdb_string.h"
#include "gdb_curses.h"
/* Function to display source in the source window. */
{
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;
{
if (!noerror)
{
- char *name = alloca (strlen (s->filename) + 100);
+ const char *filename = symtab_to_filename_for_display (s);
+ char *name = (char *) 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;
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
{
= 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. */
stream = fdopen (desc, FOPEN_RT);
clearerr (stream);
cur_line = 0;
- src->gdbarch = get_objfile_arch (s->objfile);
+ src->gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
src->start_line_or_addr.loa = LOA_LINE;
cur_line_no = src->start_line_or_addr.u.line_no = line_no;
if (offset > 0)
while (cur_line < nlines)
{
struct tui_win_element *element
- = (struct tui_win_element *)
- TUI_SRC_WIN->generic.content[cur_line];
+ = TUI_SRC_WIN->generic.content[cur_line];
/* Get the first character in the line. */
c = fgetc (stream);
if (offset == 0)
- src_line = ((struct tui_win_element *)
- TUI_SRC_WIN->generic.content[
- cur_line])->which_element.source.line;
+ src_line = TUI_SRC_WIN->generic.content[cur_line]
+ ->which_element.source.line;
/* Init the line with the line number. */
sprintf (src_line, "%-6d", cur_line_no);
cur_len = strlen (src_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
- && cur_line_no == ((struct tui_win_element *)
- locator->content[0])->which_element.locator.line_no);
+ (filename_cmp (locator->content[0]
+ ->which_element.locator.full_name,
+ symtab_to_fullname (s)) == 0
+ && cur_line_no
+ == locator->content[0]
+ ->which_element.locator.line_no);
if (c != EOF)
{
i = strlen (src_line) - 1;
}
/* Now copy the line taking the offset into
account. */
- if (strlen (src_line) > offset)
- strcpy (((struct tui_win_element *)
- TUI_SRC_WIN->generic.content[cur_line])->which_element.source.line,
+ if (offset == 0)
+ ;
+ else if (strlen (src_line) > offset)
+ strcpy (TUI_SRC_WIN->generic.content[cur_line]
+ ->which_element.source.line,
&src_line[offset]);
else
- ((struct tui_win_element *)
- TUI_SRC_WIN->generic.content[
- cur_line])->which_element.source.line[0] = (char) 0;
+ TUI_SRC_WIN->generic.content[cur_line]
+ ->which_element.source.line[0] = (char) 0;
cur_line++;
cur_line_no++;
}
i.e. the line number is 0, there is no bp, it is not where
the program is stopped. */
- struct tui_win_element *element =
- (struct tui_win_element *) win_info->generic.content[curr_line];
+ struct tui_win_element *element = win_info->generic.content[curr_line];
element->which_element.source.line_or_addr.loa = LOA_LINE;
element->which_element.source.line_or_addr.u.line_no = 0;
/* 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 != 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));
+ && (filename_cmp (tui_locator_win_info_ptr ()->content[0]
+ ->which_element.locator.full_name,
+ fullname) == 0));
}
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
if (cursal.symtab == (struct symtab *) NULL)
- s = find_pc_symtab (get_frame_pc (get_selected_frame (NULL)));
+ s = find_pc_line_symtab (get_frame_pc (get_selected_frame (NULL)));
else
s = cursal.symtab;