X-Git-Url: https://repo.jachan.dev/binutils.git/blobdiff_plain/30727aa6d12fb866494020c0b62ab265a2bdcdfe..6b2d8da01f862b10c714d86bc5b4897ec055dfd8:/gdb/source.c diff --git a/gdb/source.c b/gdb/source.c index ca1dddae0e..d6714d4b04 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1,5 +1,6 @@ /* List lines of source files for GDB, the GNU debugger. - Copyright 1986, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 1998 + Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GDB. @@ -24,6 +25,7 @@ #include "expression.h" #include "language.h" #include "command.h" +#include "source.h" #include "gdbcmd.h" #include "frame.h" #include "value.h" @@ -32,15 +34,16 @@ #include "gdb_string.h" #include "gdb_stat.h" #include -#ifdef HAVE_UNISTD_H -#include -#endif #include "gdbcore.h" -#include "gnu-regex.h" +#include "gdb_regex.h" #include "symfile.h" #include "objfiles.h" #include "annotate.h" #include "gdbtypes.h" +#include "linespec.h" +#include "filenames.h" /* for DOSish file names */ +#include "completer.h" +#include "ui-out.h" #ifdef CRLF_SOURCE_FILES @@ -62,33 +65,27 @@ #endif /* ! defined (CRLF_SOURCE_FILES) */ -/* Forward declarations */ - -int open_source_file PARAMS ((struct symtab *)); - -void find_source_lines PARAMS ((struct symtab *, int)); - /* Prototypes for exported functions. */ -void _initialize_source PARAMS ((void)); +void _initialize_source (void); /* Prototypes for local functions. */ -static int get_filename_and_charpos PARAMS ((struct symtab *, char **)); +static int get_filename_and_charpos (struct symtab *, char **); -static void reverse_search_command PARAMS ((char *, int)); +static void reverse_search_command (char *, int); -static void forward_search_command PARAMS ((char *, int)); +static void forward_search_command (char *, int); -static void line_info PARAMS ((char *, int)); +static void line_info (char *, int); -static void list_command PARAMS ((char *, int)); +static void list_command (char *, int); -static void ambiguous_line_spec PARAMS ((struct symtabs_and_lines *)); +static void ambiguous_line_spec (struct symtabs_and_lines *); -static void source_info PARAMS ((char *, int)); +static void source_info (char *, int); -static void show_directories PARAMS ((char *, int)); +static void show_directories (char *, int); /* Path of directories to search for source files. Same format as the PATH environment variable's value. */ @@ -136,8 +133,7 @@ static int last_source_error = 0; before we need to would make things slower than necessary. */ void -select_source_symtab (s) - register struct symtab *s; +select_source_symtab (register struct symtab *s) { struct symtabs_and_lines sals; struct symtab_and_line sal; @@ -157,11 +153,11 @@ select_source_symtab (s) /* Make the default place to list be the function `main' if one exists. */ - if (lookup_symbol ("main", 0, VAR_NAMESPACE, 0, NULL)) + if (lookup_symbol (main_name (), 0, VAR_NAMESPACE, 0, NULL)) { - sals = decode_line_spec ("main", 1); + sals = decode_line_spec (main_name (), 1); sal = sals.sals[0]; - free (sals.sals); + xfree (sals.sals); current_source_symtab = sal.symtab; current_source_line = max (sal.line - (lines_to_list - 1), 1); if (current_source_symtab) @@ -205,7 +201,9 @@ select_source_symtab (s) { if (cs_pst->readin) { - fatal ("Internal: select_source_symtab: readin pst found and no symtabs."); + internal_error (__FILE__, __LINE__, + "select_source_symtab: " + "readin pst found and no symtabs."); } else { @@ -219,9 +217,7 @@ select_source_symtab (s) } static void -show_directories (ignore, from_tty) - char *ignore; - int from_tty; +show_directories (char *ignore, int from_tty) { puts_filtered ("Source directories searched: "); puts_filtered (source_path); @@ -233,10 +229,11 @@ show_directories (ignore, from_tty) may be found in a different directory now. */ void -forget_cached_source_info () +forget_cached_source_info (void) { register struct symtab *s; register struct objfile *objfile; + struct partial_symtab *pst; for (objfile = object_files; objfile != NULL; objfile = objfile->next) { @@ -244,34 +241,41 @@ forget_cached_source_info () { if (s->line_charpos != NULL) { - mfree (objfile->md, s->line_charpos); + xmfree (objfile->md, s->line_charpos); s->line_charpos = NULL; } if (s->fullname != NULL) { - mfree (objfile->md, s->fullname); + xmfree (objfile->md, s->fullname); s->fullname = NULL; } } + + ALL_OBJFILE_PSYMTABS (objfile, pst) + { + if (pst->fullname != NULL) + { + xfree (pst->fullname); + pst->fullname = NULL; + } + } } } void -init_source_path () +init_source_path (void) { char buf[20]; sprintf (buf, "$cdir%c$cwd", DIRNAME_SEPARATOR); - source_path = strsave (buf); + source_path = xstrdup (buf); forget_cached_source_info (); } /* Add zero or more directories to the front of the source path. */ void -directory_command (dirname, from_tty) - char *dirname; - int from_tty; +directory_command (char *dirname, int from_tty) { dont_repeat (); /* FIXME, this goes to "delete dir"... */ @@ -279,7 +283,7 @@ directory_command (dirname, from_tty) { if (from_tty && query ("Reinitialize source path to empty? ")) { - free (source_path); + xfree (source_path); init_source_path (); } } @@ -296,9 +300,7 @@ directory_command (dirname, from_tty) /* Add zero or more directories to the front of an arbitrary path. */ void -mod_path (dirname, which_path) - char *dirname; - char **which_path; +mod_path (char *dirname, char **which_path) { char *old = *which_path; int prefix = 0; @@ -306,8 +308,8 @@ mod_path (dirname, which_path) if (dirname == 0) return; - dirname = strsave (dirname); - make_cleanup (free, dirname); + dirname = xstrdup (dirname); + make_cleanup (xfree, dirname); do { @@ -339,15 +341,17 @@ mod_path (dirname, which_path) } } -#ifndef _WIN32 - /* On win32 h:\ is different to h: */ - if (SLASH_P (p[-1])) + if (!(IS_DIR_SEPARATOR (*name) && p <= name + 1) /* "/" */ +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + /* On MS-DOS and MS-Windows, h:\ is different from h: */ + && !(p == name + 3 && name[1] == ':') /* "d:/" */ +#endif + && IS_DIR_SEPARATOR (p[-1])) /* Sigh. "foo/" => "foo" */ --p; -#endif *p = '\0'; - while (p[-1] == '.') + while (p > name && p[-1] == '.') { if (p - name == 1) { @@ -355,7 +359,7 @@ mod_path (dirname, which_path) name = current_directory; goto append; } - else if (SLASH_P (p[-2])) + else if (p > name + 1 && IS_DIR_SEPARATOR (p[-2])) { if (p - name == 2) { @@ -377,11 +381,15 @@ mod_path (dirname, which_path) if (name[0] == '~') name = tilde_expand (name); - else if (!ROOTED_P (name) && name[0] != '$') +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + else if (IS_ABSOLUTE_PATH (name) && p == name + 2) /* "d:" => "d:." */ + name = concat (name, ".", NULL); +#endif + else if (!IS_ABSOLUTE_PATH (name) && name[0] != '$') name = concat (current_directory, SLASH_STRING, name, NULL); else name = savestring (name, p - name); - make_cleanup (free, name); + make_cleanup (xfree, name); /* Unless it's a variable, check existence. */ if (name[0] != '$') @@ -412,6 +420,14 @@ mod_path (dirname, which_path) p = *which_path; while (1) { + /* FIXME: strncmp loses in interesting ways on MS-DOS and + MS-Windows because of case-insensitivity and two different + but functionally identical slash characters. We need a + special filesystem-dependent file-name comparison function. + + Actually, even on Unix I would use realpath() or its work- + alike before comparing. Then all the code above which + removes excess slashes and dots could simply go away. */ if (!strncmp (p, name, len) && (p[len] == '\0' || p[len] == DIRNAME_SEPARATOR)) { @@ -446,14 +462,14 @@ mod_path (dirname, which_path) old[prefix] = c; *which_path = concat (temp, "", &old[prefix], NULL); prefix = strlen (temp); - free (temp); + xfree (temp); } else { *which_path = concat (name, (old[0] ? tinybuf : old), old, NULL); prefix = strlen (name); } - free (old); + xfree (old); old = *which_path; } } @@ -464,9 +480,7 @@ mod_path (dirname, which_path) static void -source_info (ignore, from_tty) - char *ignore; - int from_tty; +source_info (char *ignore, int from_tty) { register struct symtab *s = current_source_symtab; @@ -499,8 +513,8 @@ source_info (ignore, from_tty) so that "exec-file ./foo" or "symbol-file ./foo" insures that you get that particular version of foo or an error message). - If FILENAMED_OPENED is non-null, set it to a newly allocated string naming - the actual file opened (this string will always start with a "/". We + If FILENAME_OPENED is non-null, set it to a newly allocated string naming + the actual file opened (this string will always start with a "/"). We have to take special pains to avoid doubling the "/" between the directory and the file, sigh! Emacs gets confuzzed by this when we print the source file name!!! @@ -511,49 +525,47 @@ source_info (ignore, from_tty) /* >>>> This should only allow files of certain types, >>>> eg executable, non-directory */ int -openp (path, try_cwd_first, string, mode, prot, filename_opened) - char *path; - int try_cwd_first; - char *string; - int mode; - int prot; - char **filename_opened; +openp (const char *path, int try_cwd_first, const char *string, + int mode, int prot, + char **filename_opened) { register int fd; register char *filename; - register char *p, *p1; + const char *p; + const char *p1; register int len; int alloclen; if (!path) path = "."; -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) mode |= O_BINARY; #endif - if (try_cwd_first || ROOTED_P (string)) + if (try_cwd_first || IS_ABSOLUTE_PATH (string)) { int i; - filename = string; + filename = alloca (strlen (string) + 1); + strcpy (filename, string); fd = open (filename, mode, prot); if (fd >= 0) goto done; for (i = 0; string[i]; i++) - if (SLASH_P (string[i])) + if (IS_DIR_SEPARATOR (string[i])) goto done; } /* ./foo => foo */ - while (string[0] == '.' && SLASH_P (string[1])) + while (string[0] == '.' && IS_DIR_SEPARATOR (string[1])) string += 2; alloclen = strlen (path) + strlen (string) + 2; - filename = (char *) alloca (alloclen); + filename = alloca (alloclen); fd = -1; for (p = path; p; p = p1 ? p1 + 1 : 0) { - p1 = (char *) strchr (p, DIRNAME_SEPARATOR); + p1 = strchr (p, DIRNAME_SEPARATOR); if (p1) len = p1 - p; else @@ -571,7 +583,7 @@ openp (path, try_cwd_first, string, mode, prot, filename_opened) if (newlen > alloclen) { alloclen = newlen; - filename = (char *) alloca (alloclen); + filename = alloca (alloclen); } strcpy (filename, current_directory); } @@ -583,7 +595,7 @@ openp (path, try_cwd_first, string, mode, prot, filename_opened) } /* Remove trailing slashes */ - while (len > 0 && SLASH_P (filename[len - 1])) + while (len > 0 && IS_DIR_SEPARATOR (filename[len - 1])) filename[--len] = 0; strcat (filename + len, SLASH_STRING); @@ -597,37 +609,27 @@ openp (path, try_cwd_first, string, mode, prot, filename_opened) done: if (filename_opened) { + /* If a file was opened, canonicalize its filename. Use xfullpath + rather than gdb_realpath to avoid resolving the basename part + of filenames when the associated file is a symbolic link. This + fixes a potential inconsistency between the filenames known to + GDB and the filenames it prints in the annotations. */ if (fd < 0) - *filename_opened = (char *) 0; - else if (ROOTED_P (filename)) - *filename_opened = savestring (filename, strlen (filename)); + *filename_opened = NULL; + else if (IS_ABSOLUTE_PATH (filename)) + *filename_opened = xfullpath (filename); else { /* Beware the // my son, the Emacs barfs, the botch that catch... */ - *filename_opened = concat (current_directory, - SLASH_CHAR - == current_directory[strlen (current_directory) - 1] + char *f = concat (current_directory, + IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1]) ? "" : SLASH_STRING, filename, NULL); + *filename_opened = xfullpath (f); + xfree (f); } } -#ifdef MPW - /* This is a debugging hack that can go away when all combinations - of Mac and Unix names are handled reasonably. */ - { - extern int debug_openp; - - if (debug_openp) - { - printf ("openp on %s, path %s mode %d prot %d\n returned %d", - string, path, mode, prot, fd); - if (*filename_opened) - printf (" (filename is %s)", *filename_opened); - printf ("\n"); - } - } -#endif /* MPW */ return fd; } @@ -646,9 +648,7 @@ done: Else, this functions returns 0, and FULL_PATHNAME is set to NULL. */ int -source_full_path_of (filename, full_pathname) - char *filename; - char **full_pathname; +source_full_path_of (char *filename, char **full_pathname) { int fd; @@ -668,11 +668,10 @@ source_full_path_of (filename, full_pathname) negative number for error. */ int -open_source_file (s) - struct symtab *s; +open_source_file (struct symtab *s) { char *path = source_path; - char *p; + const char *p; int result; char *fullname; @@ -683,7 +682,7 @@ open_source_file (s) if (result >= 0) return result; /* Didn't work -- free old one, try again. */ - mfree (s->objfile->md, s->fullname); + xmfree (s->objfile->md, s->fullname); s->fullname = NULL; } @@ -712,32 +711,16 @@ open_source_file (s) if (result < 0) { /* Didn't work. Try using just the basename. */ - p = basename (s->filename); + p = lbasename (s->filename); if (p != s->filename) result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname); } -#ifdef MPW - if (result < 0) - { - /* Didn't work. Try using just the MPW basename. */ - p = (char *) mpw_basename (s->filename); - if (p != s->filename) - result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname); - } - if (result < 0) - { - /* Didn't work. Try using the mixed Unix/MPW basename. */ - p = (char *) mpw_mixed_basename (s->filename); - if (p != s->filename) - result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname); - } -#endif /* MPW */ if (result >= 0) { fullname = s->fullname; s->fullname = mstrsave (s->objfile->md, s->fullname); - free (fullname); + xfree (fullname); } return result; } @@ -746,8 +729,7 @@ open_source_file (s) if no symtab. */ char * -symtab_to_filename (s) - struct symtab *s; +symtab_to_filename (struct symtab *s) { int fd; @@ -778,9 +760,7 @@ symtab_to_filename (s) All set S->nlines to the number of such lines. */ void -find_source_lines (s, desc) - struct symtab *s; - int desc; +find_source_lines (struct symtab *s, int desc) { struct stat st; register char *data, *p, *end; @@ -802,8 +782,6 @@ find_source_lines (s, desc) if (mtime && mtime < st.st_mtime) { - if (tui_version) - printf_filtered ("\n"); warning ("Source file is more recent than executable.\n"); } @@ -841,7 +819,7 @@ find_source_lines (s, desc) /* Use malloc, not alloca, because this may be pretty large, and we may run into various kinds of limits on stack size. */ data = (char *) xmalloc (size); - old_cleanups = make_cleanup (free, data); + old_cleanups = make_cleanup (xfree, data); /* Reassign `size' to result of read for systems where \r\n -> \n. */ size = myread (desc, data, size); @@ -883,9 +861,7 @@ find_source_lines (s, desc) #if 0 /* Currently unused */ int -source_line_charpos (s, line) - struct symtab *s; - int line; +source_line_charpos (struct symtab *s, int line) { if (!s) return 0; @@ -899,9 +875,7 @@ source_line_charpos (s, line) /* Return the line number of character position POS in symtab S. */ int -source_charpos_line (s, chr) - register struct symtab *s; - register int chr; +source_charpos_line (register struct symtab *s, register int chr) { register int line = 0; register int *lnp; @@ -929,9 +903,7 @@ source_charpos_line (s, chr) or to 0 if the file is not found. */ static int -get_filename_and_charpos (s, fullname) - struct symtab *s; - char **fullname; +get_filename_and_charpos (struct symtab *s, char **fullname) { register int desc, linenums_changed = 0; @@ -962,11 +934,8 @@ get_filename_and_charpos (s, fullname) Return 1 if successful, 0 if could not find the file. */ int -identify_source_line (s, line, mid_statement, pc) - struct symtab *s; - int line; - int mid_statement; - CORE_ADDR pc; +identify_source_line (struct symtab *s, int line, int mid_statement, + CORE_ADDR pc) { if (s->line_charpos == 0) get_filename_and_charpos (s, (char **) NULL); @@ -989,13 +958,10 @@ identify_source_line (s, line, mid_statement, pc) /* Print source lines from the file of symtab S, starting with line number LINE and stopping before line number STOPLINE. */ -static void print_source_lines_base PARAMS ((struct symtab * s, int line, int stopline, int noerror)); +static void print_source_lines_base (struct symtab *s, int line, int stopline, + int noerror); static void -print_source_lines_base (s, line, stopline, noerror) - struct symtab *s; - int line; - int stopline; - int noerror; +print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) { register int c; register int desc; @@ -1007,6 +973,9 @@ print_source_lines_base (s, line, stopline, noerror) current_source_line = line; first_line_listed = line; + /* If printing of source lines is disabled, just print file and line number */ + if (ui_out_test_flags (uiout, ui_source_list)) + { /* Only prints "No such file or directory" once */ if ((s != last_source_visited) || (!last_source_error)) { @@ -1018,6 +987,12 @@ print_source_lines_base (s, line, stopline, noerror) desc = last_source_error; noerror = 1; } + } + else + { + desc = -1; + noerror = 1; + } if (desc < 0) { @@ -1030,7 +1005,10 @@ print_source_lines_base (s, line, stopline, noerror) print_sys_errmsg (name, errno); } else - printf_filtered ("%d\tin %s\n", line, s->filename); + ui_out_field_int (uiout, "line", line); + ui_out_text (uiout, "\tin "); + ui_out_field_string (uiout, "file", s->filename); + ui_out_text (uiout, "\n"); return; } @@ -1058,25 +1036,40 @@ print_source_lines_base (s, line, stopline, noerror) while (nlines-- > 0) { + char buf[20]; + c = fgetc (stream); if (c == EOF) break; last_line_listed = current_source_line; - printf_filtered ("%d\t", current_source_line++); + sprintf (buf, "%d\t", current_source_line++); + ui_out_text (uiout, buf); do { if (c < 040 && c != '\t' && c != '\n' && c != '\r') - printf_filtered ("^%c", c + 0100); + { + sprintf (buf, "^%c", c + 0100); + ui_out_text (uiout, buf); + } else if (c == 0177) - printf_filtered ("^?"); + ui_out_text (uiout, "^?"); #ifdef CRLF_SOURCE_FILES else if (c == '\r') { - /* Just skip \r characters. */ + /* Skip a \r character, but only before a \n. */ + int c1 = fgetc (stream); + + if (c1 != '\n') + printf_filtered ("^%c", c + 0100); + if (c1 != EOF) + ungetc (c1, stream); } #endif else - printf_filtered ("%c", c); + { + sprintf (buf, "%c", c); + ui_out_text (uiout, buf); + } } while (c != '\n' && (c = fgetc (stream)) >= 0); } @@ -1090,35 +1083,9 @@ print_source_lines_base (s, line, stopline, noerror) window otherwise it is simply printed */ void -print_source_lines (s, line, stopline, noerror) - struct symtab *s; - int line, stopline, noerror; +print_source_lines (struct symtab *s, int line, int stopline, int noerror) { -#if defined(TUI) - if (!tui_version || - m_winPtrIsNull (srcWin) || !srcWin->generic.isVisible) - print_source_lines_base (s, line, stopline, noerror); - else - { - TuiGenWinInfoPtr locator = locatorWinInfoPtr (); - extern void tui_vAddWinToLayout PARAMS ((va_list)); - extern void tui_vUpdateSourceWindowsWithLine PARAMS ((va_list)); - - /* Regardless of whether we can open the file, - set current_source_symtab. */ - current_source_symtab = s; - current_source_line = line; - first_line_listed = line; - - /* make sure that the source window is displayed */ - tuiDo ((TuiOpaqueFuncPtr) tui_vAddWinToLayout, SRC_WIN); - - tuiDo ((TuiOpaqueFuncPtr) tui_vUpdateSourceWindowsWithLine, s, line); - tuiDo ((TuiOpaqueFuncPtr) tui_vUpdateLocatorFilename, s->filename); - } -#else print_source_lines_base (s, line, stopline, noerror); -#endif } @@ -1129,8 +1096,7 @@ print_source_lines (s, line, stopline, noerror) SALS provides the filenames and line numbers. */ static void -ambiguous_line_spec (sals) - struct symtabs_and_lines *sals; +ambiguous_line_spec (struct symtabs_and_lines *sals) { int i; @@ -1140,9 +1106,7 @@ ambiguous_line_spec (sals) } static void -list_command (arg, from_tty) - char *arg; - int from_tty; +list_command (char *arg, int from_tty) { struct symtabs_and_lines sals, sals_end; struct symtab_and_line sal, sal_end; @@ -1202,12 +1166,12 @@ list_command (arg, from_tty) if (sals.nelts > 1) { ambiguous_line_spec (&sals); - free (sals.sals); + xfree (sals.sals); return; } sal = sals.sals[0]; - free (sals.sals); + xfree (sals.sals); } /* Record whether the BEG arg is all digits. */ @@ -1236,11 +1200,11 @@ list_command (arg, from_tty) if (sals_end.nelts > 1) { ambiguous_line_spec (&sals_end); - free (sals_end.sals); + xfree (sals_end.sals); return; } sal_end = sals_end.sals[0]; - free (sals_end.sals); + xfree (sals_end.sals); } } @@ -1302,19 +1266,12 @@ list_command (arg, from_tty) error ("No default source file yet. Do \"help list\"."); else if (no_end) { - if (lines_to_list % 2 == 0) - print_source_lines (sal.symtab, - max (sal.line - (lines_to_list / 2), 1), - sal.line + (lines_to_list / 2), 0); - else - /* If lines_to_list is odd, then we round down in - * one of the lines_to_list/2 computations, round up in - * the other, so the total window size around the specified - * line comes out right. - */ - print_source_lines (sal.symtab, - max (sal.line - (lines_to_list / 2), 1), - sal.line + ((1 + lines_to_list) / 2), 0); + int first_line = sal.line - lines_to_list / 2; + + if (first_line < 1) first_line = 1; + + print_source_lines (sal.symtab, first_line, first_line + lines_to_list, + 0); } else print_source_lines (sal.symtab, sal.line, @@ -1327,9 +1284,7 @@ list_command (arg, from_tty) /* Print info on range of pc's in a specified line. */ static void -line_info (arg, from_tty) - char *arg; - int from_tty; +line_info (char *arg, int from_tty) { struct symtabs_and_lines sals; struct symtab_and_line sal; @@ -1420,16 +1375,14 @@ line_info (arg, from_tty) printf_filtered ("Line number %d is out of range for \"%s\".\n", sal.line, sal.symtab->filename); } - free (sals.sals); + xfree (sals.sals); } /* Commands to search the source file for a regexp. */ /* ARGSUSED */ static void -forward_search_command (regex, from_tty) - char *regex; - int from_tty; +forward_search_command (char *regex, int from_tty) { register int c; register int desc; @@ -1437,29 +1390,7 @@ forward_search_command (regex, from_tty) int line; char *msg; -#if defined(TUI) - /* - ** If this is the TUI, search from the first line displayed in - ** the source window, otherwise, search from last_line_listed+1 - ** in current_source_symtab - */ - if (!tui_version) - line = last_line_listed; - else - { - if (srcWin->generic.isVisible && srcWin->generic.contentSize > 0) - line = ((TuiWinContent) - srcWin->generic.content)[0]->whichElement.source.lineOrAddr.lineNo; - else - { - printf_filtered ("No source displayed.\nExpression not found.\n"); - return; - } - } - line++; -#else line = last_line_listed + 1; -#endif msg = (char *) re_comp (regex); if (msg) @@ -1515,14 +1446,22 @@ forward_search_command (regex, from_tty) } while (c != '\n' && (c = getc (stream)) >= 0); +#ifdef CRLF_SOURCE_FILES + /* Remove the \r, if any, at the end of the line, otherwise + regular expressions that end with $ or \n won't work. */ + if (p - buf > 1 && p[-2] == '\r') + { + p--; + p[-1] = '\n'; + } +#endif + /* we now have a source line in buf, null terminate and match */ *p = 0; if (re_exec (buf) > 0) { /* Match! */ fclose (stream); - if (tui_version) - print_source_lines_base (current_source_symtab, line, line + 1, 0); print_source_lines (current_source_symtab, line, line + 1, 0); set_internalvar (lookup_internalvar ("_"), value_from_longest (builtin_type_int, @@ -1539,38 +1478,15 @@ forward_search_command (regex, from_tty) /* ARGSUSED */ static void -reverse_search_command (regex, from_tty) - char *regex; - int from_tty; +reverse_search_command (char *regex, int from_tty) { register int c; register int desc; register FILE *stream; int line; char *msg; -#if defined(TUI) - /* - ** If this is the TUI, search from the first line displayed in - ** the source window, otherwise, search from last_line_listed-1 - ** in current_source_symtab - */ - if (!tui_version) - line = last_line_listed; - else - { - if (srcWin->generic.isVisible && srcWin->generic.contentSize > 0) - line = ((TuiWinContent) - srcWin->generic.content)[0]->whichElement.source.lineOrAddr.lineNo; - else - { - printf_filtered ("No source displayed.\nExpression not found.\n"); - return; - } - } - line--; -#else + line = last_line_listed - 1; -#endif msg = (char *) re_comp (regex); if (msg) @@ -1615,14 +1531,22 @@ reverse_search_command (regex, from_tty) } while (c != '\n' && (c = getc (stream)) >= 0); +#ifdef CRLF_SOURCE_FILES + /* Remove the \r, if any, at the end of the line, otherwise + regular expressions that end with $ or \n won't work. */ + if (p - buf > 1 && p[-2] == '\r') + { + p--; + p[-1] = '\n'; + } +#endif + /* We now have a source line in buf; null terminate and match. */ *p = 0; if (re_exec (buf) > 0) { /* Match! */ fclose (stream); - if (tui_version) - print_source_lines_base (current_source_symtab, line, line + 1, 0); print_source_lines (current_source_symtab, line, line + 1, 0); set_internalvar (lookup_internalvar ("_"), value_from_longest (builtin_type_int, @@ -1644,7 +1568,7 @@ reverse_search_command (regex, from_tty) } void -_initialize_source () +_initialize_source (void) { struct cmd_list_element *c; current_source_symtab = 0; @@ -1667,7 +1591,7 @@ With no argument, reset the search path to $cdir:$cwd, the default.", if (dbx_commands) add_com_alias ("use", "directory", class_files, 0); - c->completer = filename_completer; + set_cmd_completer (c, filename_completer); add_cmd ("directories", no_class, show_directories, "Current search path for finding source files.\n\