X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-source.c;h=240a82c1e0401c0c3e5f17d84eadbfa60715db3a;hb=e5908723e599e3788a3fbceeef35804024a03af7;hp=c7bcea684830a86cba9e66eaabd0160f5257744d;hpb=88d83552b190308353cbb345b5f07b2b995ef37c;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index c7bcea6848..240a82c1e0 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -1,7 +1,7 @@ /* TUI display source window. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software - Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007 + Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. @@ -41,7 +41,9 @@ /* Function to display source in the source window. */ enum tui_status -tui_set_source_content (struct symtab *s, int line_no, int noerror) +tui_set_source_content (struct symtab *s, + int line_no, + int noerror) { enum tui_status ret = TUI_FAILURE; @@ -54,8 +56,8 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror) 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 */ + /* 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) @@ -88,8 +90,8 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror) 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; + struct tui_gen_win_info *locator = tui_locator_win_info_ptr (); + struct tui_source_info *src = &TUI_SRC_WIN->detail.source_info; if (TUI_SRC_WIN->generic.title) xfree (TUI_SRC_WIN->generic.title); @@ -99,8 +101,8 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror) xfree (src->filename); src->filename = xstrdup (s->filename); - /* Determine the threshold for the length of the line - and the offset to start the display. */ + /* 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); @@ -113,17 +115,17 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror) (threshold + 1) * sizeof (char)); while (cur_line < nlines) { - struct tui_win_element * element = (struct tui_win_element *) + struct tui_win_element *element = (struct tui_win_element *) TUI_SRC_WIN->generic.content[cur_line]; - /* get the first character in the 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; - /* Init the line with the line number */ + /* Init the line with the line number. */ sprintf (src_line, "%-6d", cur_line_no); cur_len = strlen (src_line); i = cur_len - @@ -136,25 +138,25 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror) } src_line[cur_len] = (char) 0; - /* Set whether element is the execution point and - whether there is a break point on it. */ + /* 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 = (strcmp (((struct tui_win_element *) - locator->content[0])->which_element.locator.file_name, + 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); + locator->content[0])->which_element.locator.line_no); if (c != EOF) { i = strlen (src_line) - 1; do { - if ((c != '\n') && - (c != '\r') && (++i < threshold)) + if ((c != '\n') && (c != '\r') + && (++i < threshold)) { if (c < 040 && c != '\t') { @@ -167,19 +169,18 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror) src_line[i] = '?'; } else - { /* Store the charcter in the line - buffer. If it is a tab, then - translate to the correct number of - chars so we don't overwrite our - buffer. */ + { /* Store the charcter in the + line buffer. If it is a tab, + then translate to the correct + number of chars so we don't + overwrite our buffer. */ if (c == '\t') { int j, max_tab_len = tui_default_tab_len (); - for (j = i - ( - (i / max_tab_len) * max_tab_len); - ((j < max_tab_len) && - i < threshold); + for (j = i - ((i / max_tab_len) * max_tab_len); + j < max_tab_len + && i < threshold; i++, j++) src_line[i] = ' '; i--; @@ -190,16 +191,27 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror) src_line[i + 1] = 0; } else - { /* If we have not reached EOL, then eat - chars until we do */ + { /* If we have not reached EOL, then + eat chars until we do. */ while (c != EOF && c != '\n' && c != '\r') c = fgetc (stream); + /* Handle non-'\n' end-of-line. */ + if (c == '\r' + && (c = fgetc (stream)) != '\n' + && c != EOF) + { + ungetc (c, stream); + c = '\r'; + } + } } - while (c != EOF && c != '\n' && c != '\r' && - i < threshold && (c = fgetc (stream))); + while (c != EOF && c != '\n' && c != '\r' + && i < threshold + && (c = fgetc (stream))); } - /* Now copy the line taking the offset into account */ + /* 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, @@ -224,14 +236,15 @@ tui_set_source_content (struct symtab *s, int line_no, int noerror) } -/* elz: this function sets the contents of the source window to empty +/* elz: This function sets the contents of the source window to empty except for a line in the middle with a warning message about the - source not being available. This function is called by + source not being available. This function is called by tui_erase_source_contents(), which in turn is invoked when the source files cannot be accessed. */ void -tui_set_source_content_nil (struct tui_win_info * win_info, char *warning_string) +tui_set_source_content_nil (struct tui_win_info *win_info, + char *warning_string) { int line_width; int n_lines; @@ -240,29 +253,30 @@ tui_set_source_content_nil (struct tui_win_info * win_info, char *warning_string line_width = win_info->generic.width - 1; n_lines = win_info->generic.height - 2; - /* set to empty each line in the window, except for the one - which contains the message */ + /* Set to empty each line in the window, except for the one which + contains the message. */ while (curr_line < win_info->generic.content_size) { - /* set the information related to each displayed line - to null: i.e. the line number is 0, there is no bp, - it is not where the program is stopped */ + /* Set the information related to each displayed line to null: + 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 = + (struct tui_win_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; element->which_element.source.is_exec_point = FALSE; element->which_element.source.has_break = FALSE; - /* set the contents of the line to blank */ + /* Set the contents of the line to blank. */ element->which_element.source.line[0] = (char) 0; - /* if the current line is in the middle of the screen, then we + /* If the current line is in the middle of the screen, then we want to display the 'no source available' message in it. Note: the 'weird' arithmetic with the line width and height - comes from the function tui_erase_source_content(). We need - to keep the screen and the window's actual contents in synch. */ + comes from the function tui_erase_source_content(). We need + to keep the screen and the window's actual contents in + synch. */ if (curr_line == (n_lines / 2 + 1)) { @@ -299,7 +313,9 @@ tui_set_source_content_nil (struct tui_win_info * win_info, char *warning_string /* Function to display source in the source window. This function initializes the horizontal scroll to 0. */ void -tui_show_symtab_source (struct symtab *s, struct tui_line_or_address line, int noerror) +tui_show_symtab_source (struct symtab *s, + struct tui_line_or_address line, + int noerror) { TUI_SRC_WIN->detail.source_info.horizontal_offset = 0; tui_update_source_window_as_is (TUI_SRC_WIN, s, line, noerror); @@ -311,9 +327,9 @@ tui_show_symtab_source (struct symtab *s, struct tui_line_or_address line, int n int tui_source_is_displayed (char *fname) { - return (TUI_SRC_WIN->generic.content_in_use && - (strcmp (((struct tui_win_element *) (tui_locator_win_info_ptr ())-> - content[0])->which_element.locator.file_name, fname) == 0)); + return (TUI_SRC_WIN->generic.content_in_use + && (strcmp (((struct tui_win_element *) (tui_locator_win_info_ptr ())-> + content[0])->which_element.locator.file_name, fname) == 0)); } @@ -330,7 +346,7 @@ tui_vertical_source_scroll (enum tui_scroll_direction scroll_direction, struct symtab_and_line cursal = get_current_source_symtab_and_line (); if (cursal.symtab == (struct symtab *) NULL) - s = find_pc_symtab (get_frame_pc (deprecated_selected_frame)); + s = find_pc_symtab (get_frame_pc (get_selected_frame (NULL))); else s = cursal.symtab; @@ -340,8 +356,8 @@ tui_vertical_source_scroll (enum tui_scroll_direction scroll_direction, l.u.line_no = content[0]->which_element.source.line_or_addr.u.line_no + num_to_scroll; if (l.u.line_no > s->nlines) - /*line = s->nlines - win_info->generic.content_size + 1; */ - /*elz: fix for dts 23398 */ + /* line = s->nlines - win_info->generic.content_size + 1; */ + /* elz: fix for dts 23398. */ l.u.line_no = content[0]->which_element.source.line_or_addr.u.line_no; } else