X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsource.c;h=443421cfff477bfad0644890565f0524d4c1a1eb;hb=a1b461bf403f675bf552b7f6783a732aa34056d7;hp=9fe97425aa4daf2ed4c9882e0fadc6fb6070ad1a;hpb=1996fae84682e8ddd146215dd2959ad1ec924c09;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/source.c b/gdb/source.c index 9fe97425aa..443421cfff 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1,28 +1,31 @@ /* 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, 2003, 2004 Free Software Foundation, Inc. -This file is part of GDB. + 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 2 of the License, or -(at your option) any later version. + 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 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "symtab.h" #include "expression.h" #include "language.h" #include "command.h" +#include "source.h" #include "gdbcmd.h" #include "frame.h" #include "value.h" @@ -31,15 +34,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #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" +#include "readline/readline.h" #ifdef CRLF_SOURCE_FILES @@ -61,33 +66,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #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 void reverse_search_command PARAMS ((char *, int)); +static int get_filename_and_charpos (struct symtab *, char **); -static void forward_search_command PARAMS ((char *, int)); +static void reverse_search_command (char *, int); -static void line_info PARAMS ((char *, int)); +static void forward_search_command (char *, int); -static void list_command PARAMS ((char *, int)); +static void line_info (char *, int); -static void ambiguous_line_spec PARAMS ((struct symtabs_and_lines *)); +static void source_info (char *, int); -static void source_info PARAMS ((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. */ @@ -96,11 +91,11 @@ char *source_path; /* Symtab of default file for listing lines of. */ -struct symtab *current_source_symtab; +static struct symtab *current_source_symtab; /* Default next line to list. */ -int current_source_line; +static int current_source_line; /* Default number of lines to print with commands like "list". This is based on guessing how many long (i.e. more than chars_per_line @@ -124,8 +119,95 @@ static int first_line_listed; static struct symtab *last_source_visited = NULL; static int last_source_error = 0; - +/* Return the first line listed by print_source_lines. + Used by command interpreters to request listing from + a previous point. */ + +int +get_first_line_listed (void) +{ + return first_line_listed; +} + +/* 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 + as it does not automatically use this value. */ + +int +get_lines_to_list (void) +{ + return lines_to_list; +} + +/* Return the current source file for listing and next line to list. + NOTE: The returned sal pc and end fields are not valid. */ + +struct symtab_and_line +get_current_source_symtab_and_line (void) +{ + struct symtab_and_line cursal; + + cursal.symtab = current_source_symtab; + cursal.line = current_source_line; + cursal.pc = 0; + cursal.end = 0; + + return cursal; +} + +/* If the current source file for listing is not set, try and get a default. + Usually called before get_current_source_symtab_and_line() is called. + It may err out if a default cannot be determined. + We must be cautious about where it is called, as it can recurse as the + process of determining a new default may call the caller! + Use get_current_source_symtab_and_line only to get whatever + we have without erroring out or trying to get a default. */ + +void +set_default_source_symtab_and_line (void) +{ + struct symtab_and_line cursal; + + if (!have_full_symbols () && !have_partial_symbols ()) + error ("No symbol table is loaded. Use the \"file\" command."); + + /* Pull in a current source symtab if necessary */ + if (current_source_symtab == 0) + select_source_symtab (0); +} + +/* Return the current default file for listing and next line to list + (the returned sal pc and end fields are not valid.) + and set the current default to whatever is in SAL. + NOTE: The returned sal pc and end fields are not valid. */ + +struct symtab_and_line +set_current_source_symtab_and_line (const struct symtab_and_line *sal) +{ + struct symtab_and_line cursal; + + cursal.symtab = current_source_symtab; + cursal.line = current_source_line; + + current_source_symtab = sal->symtab; + current_source_line = sal->line; + cursal.pc = 0; + cursal.end = 0; + + return cursal; +} + +/* Reset any information stored about a default file and line to print. */ + +void +clear_current_source_symtab_and_line (void) +{ + current_source_symtab = 0; + current_source_line = 0; +} + /* Set the source file default for the "list" command to be S. If S is NULL, and we don't have a default, find one. This @@ -135,15 +217,14 @@ 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 (struct symtab *s) { struct symtabs_and_lines sals; struct symtab_and_line sal; struct partial_symtab *ps; struct partial_symtab *cs_pst = 0; struct objfile *ofp; - + if (s) { current_source_symtab = s; @@ -156,28 +237,28 @@ 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_DOMAIN, 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) - return; + return; } - + /* All right; find the last file in the symtab list (ignoring .h's). */ current_source_line = 1; - for (ofp = object_files; ofp != NULL; ofp = ofp -> next) + for (ofp = object_files; ofp != NULL; ofp = ofp->next) { - for (s = ofp -> symtabs; s; s = s->next) + for (s = ofp->symtabs; s; s = s->next) { - char *name = s -> filename; + char *name = s->filename; int len = strlen (name); - if (! (len > 2 && (STREQ (&name[len - 2], ".h")))) + if (!(len > 2 && (DEPRECATED_STREQ (&name[len - 2], ".h")))) { current_source_symtab = s; } @@ -188,13 +269,13 @@ select_source_symtab (s) /* Howabout the partial symbol tables? */ - for (ofp = object_files; ofp != NULL; ofp = ofp -> next) + for (ofp = object_files; ofp != NULL; ofp = ofp->next) { - for (ps = ofp -> psymtabs; ps != NULL; ps = ps -> next) + for (ps = ofp->psymtabs; ps != NULL; ps = ps->next) { - char *name = ps -> filename; + char *name = ps->filename; int len = strlen (name); - if (! (len > 2 && (STREQ (&name[len - 2], ".h")))) + if (!(len > 2 && (DEPRECATED_STREQ (&name[len - 2], ".h")))) { cs_pst = ps; } @@ -202,9 +283,11 @@ select_source_symtab (s) } if (cs_pst) { - if (cs_pst -> readin) + 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 { @@ -218,9 +301,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); @@ -232,53 +313,67 @@ 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 symtab *s; + struct objfile *objfile; + struct partial_symtab *pst; - for (objfile = object_files; objfile != NULL; objfile = objfile -> next) + for (objfile = object_files; objfile != NULL; objfile = objfile->next) { - for (s = objfile -> symtabs; s != NULL; s = s -> next) + for (s = objfile->symtabs; s != NULL; s = s->next) { - if (s -> line_charpos != NULL) + if (s->line_charpos != NULL) { - mfree (objfile -> md, s -> line_charpos); - s -> line_charpos = NULL; + xmfree (objfile->md, s->line_charpos); + s->line_charpos = NULL; } - if (s -> fullname != NULL) + if (s->fullname != NULL) { - mfree (objfile -> md, s -> fullname); - s -> fullname = NULL; + 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 (); } +void +init_last_source_visited (void) +{ + last_source_visited = NULL; +} + /* 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"... */ if (dirname == 0) { - if (query ("Reinitialize source path to empty? ")) + if (from_tty && query ("Reinitialize source path to empty? ")) { - free (source_path); + xfree (source_path); init_source_path (); } } @@ -288,16 +383,26 @@ directory_command (dirname, from_tty) last_source_visited = NULL; } if (from_tty) - show_directories ((char *)0, from_tty); + show_directories ((char *) 0, from_tty); forget_cached_source_info (); } /* 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) +{ + add_path (dirname, which_path, 1); +} + +/* Workhorse of mod_path. Takes an extra argument to determine + if dirname should be parsed for separators that indicate multiple + directories. This allows for interfaces that pre-parse the dirname + and allow specification of traditional separator characters such + as space or tab. */ + +void +add_path (char *dirname, char **which_path, int parse_separators) { char *old = *which_path; int prefix = 0; @@ -305,21 +410,28 @@ mod_path (dirname, which_path) if (dirname == 0) return; - dirname = strsave (dirname); - make_cleanup (free, dirname); + dirname = xstrdup (dirname); + make_cleanup (xfree, dirname); do { char *name = dirname; - register char *p; + char *p; struct stat st; { - char *separator = strchr (name, DIRNAME_SEPARATOR); - char *space = strchr (name, ' '); - char *tab = strchr (name, '\t'); + char *separator = NULL; + char *space = NULL; + char *tab = NULL; + + if (parse_separators) + { + separator = strchr (name, DIRNAME_SEPARATOR); + space = strchr (name, ' '); + tab = strchr (name, '\t'); + } - if (separator == 0 && space == 0 && tab == 0) + if (separator == 0 && space == 0 && tab == 0) p = dirname = name + strlen (name); else { @@ -338,15 +450,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) { @@ -354,7 +468,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) { @@ -376,49 +490,62 @@ mod_path (dirname, which_path) if (name[0] == '~') name = tilde_expand (name); - else if (!ROOTED_P (name) && name[0] != '$') - name = concat (current_directory, SLASH_STRING, name, NULL); +#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] != '$') { - /* These are warnings, not errors, since we don't want a - non-existent directory in a .gdbinit file to stop processing - of the .gdbinit file. - - Whether they get added to the path is more debatable. Current - answer is yes, in case the user wants to go make the directory - or whatever. If the directory continues to not exist/not be - a directory/etc, then having them in the path should be - harmless. */ - if (stat (name, &st) < 0) - { - int save_errno = errno; - fprintf_unfiltered (gdb_stderr, "Warning: "); - print_sys_errmsg (name, save_errno); - } - else if ((st.st_mode & S_IFMT) != S_IFDIR) - warning ("%s is not a directory.", name); - } + if (name[0] != '$') + { + /* These are warnings, not errors, since we don't want a + non-existent directory in a .gdbinit file to stop processing + of the .gdbinit file. + + Whether they get added to the path is more debatable. Current + answer is yes, in case the user wants to go make the directory + or whatever. If the directory continues to not exist/not be + a directory/etc, then having them in the path should be + harmless. */ + if (stat (name, &st) < 0) + { + int save_errno = errno; + fprintf_unfiltered (gdb_stderr, "Warning: "); + print_sys_errmsg (name, save_errno); + } + else if ((st.st_mode & S_IFMT) != S_IFDIR) + warning ("%s is not a directory.", name); + } append: { - register unsigned int len = strlen (name); + unsigned int len = strlen (name); 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)) { /* Found it in the search path, remove old copy */ if (p > *which_path) - p--; /* Back over leading separator */ + p--; /* Back over leading separator */ if (prefix > p - *which_path) goto skip_dup; /* Same dir twice in one cmd */ - strcpy (p, &p[len+1]); /* Copy from next \0 or : */ + strcpy (p, &p[len + 1]); /* Copy from next \0 or : */ } p = strchr (p, DIRNAME_SEPARATOR); if (p != 0) @@ -433,7 +560,8 @@ mod_path (dirname, which_path) tinybuf[0] = DIRNAME_SEPARATOR; tinybuf[1] = '\0'; - /* If we have already tacked on a name(s) in this command, be sure they stay on the front as we tack on some more. */ + /* If we have already tacked on a name(s) in this command, be sure they stay + on the front as we tack on some more. */ if (prefix) { char *temp, c; @@ -444,32 +572,31 @@ 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; } } - skip_dup: ; - } while (*dirname != '\0'); + skip_dup:; + } + while (*dirname != '\0'); } 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; + struct symtab *s = current_source_symtab; if (!s) { - printf_filtered("No current source file.\n"); + printf_filtered ("No current source file.\n"); return; } printf_filtered ("Current source file is %s\n", s->filename); @@ -483,10 +610,29 @@ source_info (ignore, from_tty) printf_filtered ("Source language is %s.\n", language_str (s->language)); printf_filtered ("Compiled with %s debugging format.\n", s->debugformat); + printf_filtered ("%s preprocessor macro info.\n", + s->macro_table ? "Includes" : "Does not include"); } + +/* Return True if the file NAME exists and is a regular file */ +static int +is_regular_file (const char *name) +{ + struct stat st; + const int status = stat (name, &st); + + /* Stat should never fail except when the file does not exist. + If stat fails, analyze the source of error and return True + unless the file does not exist, to avoid returning false results + on obscure systems where stat does not work as expected. + */ + if (status != 0) + return (errno != ENOENT); + + return S_ISREG (st.st_mode); +} - /* Open a file named STRING, searching path PATH (dir names sep by some char) using mode MODE and protection bits PROT in the calls to open. @@ -496,8 +642,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!!! @@ -508,123 +654,129 @@ 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; - register int len; + int fd; + char *filename; + const char *p; + const char *p1; + int len; int alloclen; if (!path) path = "."; -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) mode |= O_BINARY; #endif - if (try_cwd_first || SLASH_P (string[0])) + if (try_cwd_first || IS_ABSOLUTE_PATH (string)) { int i; - filename = string; - fd = open (filename, mode, prot); - if (fd >= 0) - goto done; + + if (is_regular_file (string)) + { + filename = alloca (strlen (string) + 1); + strcpy (filename, string); + fd = open (filename, mode, prot); + if (fd >= 0) + goto done; + } + else + { + filename = NULL; + fd = -1; + } + 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 len = strlen (p); if (len == 4 && p[0] == '$' && p[1] == 'c' - && p[2] == 'w' && p[3] == 'd') { - /* Name is $cwd -- insert current directory name instead. */ - int newlen; - - /* First, realloc the filename buffer if too short. */ - len = strlen (current_directory); - newlen = len + strlen (string) + 2; - if (newlen > alloclen) { - alloclen = newlen; - filename = (char *) alloca (alloclen); + && p[2] == 'w' && p[3] == 'd') + { + /* Name is $cwd -- insert current directory name instead. */ + int newlen; + + /* First, realloc the filename buffer if too short. */ + len = strlen (current_directory); + newlen = len + strlen (string) + 2; + if (newlen > alloclen) + { + alloclen = newlen; + filename = alloca (alloclen); + } + strcpy (filename, current_directory); + } + else + { + /* Normal file name in path -- just use it. */ + strncpy (filename, p, len); + filename[len] = 0; } - strcpy (filename, current_directory); - } else { - /* Normal file name in path -- just use it. */ - strncpy (filename, p, len); - filename[len] = 0; - } /* 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); + strcat (filename + len, SLASH_STRING); strcat (filename, string); - fd = open (filename, mode); - if (fd >= 0) break; + if (is_regular_file (filename)) + { + fd = open (filename, mode); + if (fd >= 0) + break; + } } - done: +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] - ? "": SLASH_STRING, - filename, NULL); - } - } -#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 */ + char *f = concat (current_directory, + IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1]) + ? "" : SLASH_STRING, + filename, NULL); + *filename_opened = xfullpath (f); + xfree (f); + } + } return fd; } - + /* This is essentially a convenience, for clients that want the behaviour of openp, using source_path, but that really don't want the file to be opened but want instead just to know what the full pathname is (as @@ -635,14 +787,11 @@ openp (path, try_cwd_first, string, mode, prot, filename_opened) If the file was found, this function returns 1, and FULL_PATHNAME is set to the fully-qualified pathname. - Else, this functions returns 0, and FULL_PATHNAME is set to NULL. - */ + 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; + int fd; fd = openp (source_path, 1, filename, O_RDONLY, 0, full_pathname); if (fd < 0) @@ -655,114 +804,157 @@ source_full_path_of (filename, full_pathname) return 1; } +/* This function is capable of finding the absolute path to a + source file, and opening it, provided you give it an + OBJFILE and FILENAME. Both the DIRNAME and FULLNAME are only + added suggestions on where to find the file. -/* Open a source file given a symtab S. Returns a file descriptor or - negative number for error. */ + OBJFILE should be the objfile associated with a psymtab or symtab. + FILENAME should be the filename to open. + DIRNAME is the compilation directory of a particular source file. + Only some debug formats provide this info. + FULLNAME can be the last known absolute path to the file in question. + On Success + A valid file descriptor is returned. ( the return value is positive ) + FULLNAME is set to the absolute path to the file just opened. + + On Failure + A non valid file descriptor is returned. ( the return value is negitive ) + FULLNAME is set to NULL. */ int -open_source_file (s) - struct symtab *s; +find_and_open_source (struct objfile *objfile, + const char *filename, + const char *dirname, + char **fullname) { char *path = source_path; - char *p; + const char *p; int result; - char *fullname; /* Quick way out if we already know its full name */ - if (s->fullname) + if (*fullname) { - result = open (s->fullname, OPEN_MODE); + result = open (*fullname, OPEN_MODE); if (result >= 0) - return result; + return result; /* Didn't work -- free old one, try again. */ - mfree (s->objfile->md, s->fullname); - s->fullname = NULL; + xmfree (objfile->md, *fullname); + *fullname = NULL; } - if (s->dirname != NULL) + if (dirname != NULL) { /* Replace a path entry of $cdir with the compilation directory name */ #define cdir_len 5 /* We cast strstr's result in case an ANSIhole has made it const, - which produces a "required warning" when assigned to a nonconst. */ - p = (char *)strstr (source_path, "$cdir"); + which produces a "required warning" when assigned to a nonconst. */ + p = (char *) strstr (source_path, "$cdir"); if (p && (p == path || p[-1] == DIRNAME_SEPARATOR) - && (p[cdir_len] == DIRNAME_SEPARATOR || p[cdir_len] == '\0')) + && (p[cdir_len] == DIRNAME_SEPARATOR || p[cdir_len] == '\0')) { int len; path = (char *) - alloca (strlen (source_path) + 1 + strlen (s->dirname) + 1); + alloca (strlen (source_path) + 1 + strlen (dirname) + 1); len = p - source_path; - strncpy (path, source_path, len); /* Before $cdir */ - strcpy (path + len, s->dirname); /* new stuff */ - strcat (path + len, source_path + len + cdir_len); /* After $cdir */ + strncpy (path, source_path, len); /* Before $cdir */ + strcpy (path + len, dirname); /* new stuff */ + strcat (path + len, source_path + len + cdir_len); /* After $cdir */ } } - result = openp (path, 0, s->filename, OPEN_MODE, 0, &s->fullname); + result = openp (path, 0, filename, OPEN_MODE, 0, fullname); if (result < 0) { /* Didn't work. Try using just the basename. */ - p = basename (s->filename); - if (p != s->filename) - result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname); + p = lbasename (filename); + if (p != filename) + result = openp (path, 0, p, OPEN_MODE, 0, 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); + char *tmp_fullname; + tmp_fullname = *fullname; + *fullname = mstrsave (objfile->md, *fullname); + xfree (tmp_fullname); } return result; } -/* Return the path to the source file associated with symtab. Returns NULL - if no symtab. */ +/* Open a source file given a symtab S. Returns a file descriptor or + negative number for error. + + This function is a convience function to find_and_open_source. */ + +int +open_source_file (struct symtab *s) +{ + if (!s) + return -1; + + return find_and_open_source (s->objfile, s->filename, s->dirname, + &s->fullname); +} + +/* Finds the fullname that a symtab represents. + If this functions finds the fullname, it will save it in ps->fullname + and it will also return the value. + + If this function fails to find the file that this symtab represents, + NULL will be returned and ps->fullname will be set to NULL. */ char * -symtab_to_filename (s) - struct symtab *s; +symtab_to_fullname (struct symtab *s) { - int fd; + int r; if (!s) return NULL; - /* If we've seen the file before, just return fullname. */ + /* Don't check s->fullname here, the file could have been + deleted/moved/..., look for it again */ + r = find_and_open_source (s->objfile, s->filename, s->dirname, + &s->fullname); - if (s->fullname) - return s->fullname; + if (r) + { + close (r); + return s->fullname; + } - /* Try opening the file to setup fullname */ + return NULL; +} - fd = open_source_file (s); - if (fd < 0) - return s->filename; /* File not found. Just use short name */ +/* Finds the fullname that a partial_symtab represents. - /* Found the file. Cleanup and return the full name */ + If this functions finds the fullname, it will save it in ps->fullname + and it will also return the value. - close (fd); - return s->fullname; -} + If this function fails to find the file that this partial_symtab represents, + NULL will be returned and ps->fullname will be set to NULL. */ +char * +psymtab_to_fullname (struct partial_symtab *ps) +{ + int r; + + if (!ps) + return NULL; + + /* Don't check ps->fullname here, the file could have been + deleted/moved/..., look for it again */ + r = find_and_open_source (ps->objfile, ps->filename, ps->dirname, + &ps->fullname); + + if (r) + { + close (r); + return ps->fullname; + } + return NULL; +} /* Create and initialize the table S->line_charpos that records the positions of the lines in the source file, which is assumed @@ -770,33 +962,29 @@ 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; + char *data, *p, *end; int nlines = 0; int lines_allocated = 1000; int *line_charpos; long mtime = 0; int size; - line_charpos = (int *) xmmalloc (s -> objfile -> md, + line_charpos = (int *) xmmalloc (s->objfile->md, lines_allocated * sizeof (int)); if (fstat (desc, &st) < 0) perror_with_name (s->filename); if (s && s->objfile && s->objfile->obfd) - mtime = bfd_get_mtime(s->objfile->obfd); + mtime = bfd_get_mtime (s->objfile->obfd); else if (exec_bfd) - mtime = bfd_get_mtime(exec_bfd); + mtime = bfd_get_mtime (exec_bfd); if (mtime && mtime < st.st_mtime) { - if (tui_version) - printf_filtered ("\n"); - warning("Source file is more recent than executable.\n"); + warning ("Source file is more recent than executable.\n"); } #ifdef LSEEK_NOT_LINEAR @@ -807,15 +995,15 @@ find_source_lines (s, desc) line_charpos[0] = lseek (desc, 0, SEEK_CUR); nlines = 1; - while (myread(desc, &c, 1)>0) + while (myread (desc, &c, 1) > 0) { - if (c == '\n') + if (c == '\n') { - if (nlines == lines_allocated) + if (nlines == lines_allocated) { lines_allocated *= 2; line_charpos = - (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos, + (int *) xmrealloc (s->objfile->md, (char *) line_charpos, sizeof (int) * lines_allocated); } line_charpos[nlines++] = lseek (desc, 0, SEEK_CUR); @@ -833,7 +1021,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); @@ -846,14 +1034,14 @@ find_source_lines (s, desc) while (p != end) { if (*p++ == '\n' - /* A newline at the end does not start a new line. */ + /* A newline at the end does not start a new line. */ && p != end) { if (nlines == lines_allocated) { lines_allocated *= 2; line_charpos = - (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos, + (int *) xmrealloc (s->objfile->md, (char *) line_charpos, sizeof (int) * lines_allocated); } line_charpos[nlines++] = p - data; @@ -864,23 +1052,23 @@ find_source_lines (s, desc) #endif /* lseek linear. */ s->nlines = nlines; s->line_charpos = - (int *) xmrealloc (s -> objfile -> md, (char *) line_charpos, - nlines * sizeof (int)); + (int *) xmrealloc (s->objfile->md, (char *) line_charpos, + nlines * sizeof (int)); } /* Return the character position of a line LINE in symtab S. Return 0 if anything is invalid. */ -#if 0 /* Currently unused */ +#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; - if (!s->line_charpos || line <= 0) return 0; + if (!s) + return 0; + if (!s->line_charpos || line <= 0) + return 0; if (line > s->nlines) line = s->nlines; return s->line_charpos[line - 1]; @@ -889,17 +1077,16 @@ 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 (struct symtab *s, int chr) { - register int line = 0; - register int *lnp; - - if (s == 0 || s->line_charpos == 0) return 0; + int line = 0; + int *lnp; + + if (s == 0 || s->line_charpos == 0) + return 0; lnp = s->line_charpos; /* Files are usually short, so sequential search is Ok */ - while (line < s->nlines && *lnp <= chr) + while (line < s->nlines && *lnp <= chr) { line++; lnp++; @@ -909,32 +1096,32 @@ source_charpos_line (s, chr) return line; } -#endif /* 0 */ - +#endif /* 0 */ + /* Get full pathname and line number positions for a symtab. Return nonzero if line numbers may have changed. Set *FULLNAME to actual name of the file as found by `openp', 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; - + int desc, linenums_changed = 0; + desc = open_source_file (s); if (desc < 0) { if (fullname) *fullname = NULL; return 0; - } + } if (fullname) *fullname = s->fullname; - if (s->line_charpos == 0) linenums_changed = 1; - if (linenums_changed) find_source_lines (s, desc); + if (s->line_charpos == 0) + linenums_changed = 1; + if (linenums_changed) + find_source_lines (s, desc); close (desc); return linenums_changed; } @@ -949,14 +1136,11 @@ 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); + get_filename_and_charpos (s, (char **) NULL); if (s->fullname == 0) return 0; if (line > s->nlines) @@ -971,20 +1155,19 @@ identify_source_line (s, line, mid_statement, pc) current_source_symtab = s; return 1; } - + /* 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 (struct symtab *s, int line, int stopline, + int noerror); static void -print_source_lines_base (s, line, stopline, noerror) - struct symtab *s; - int line, stopline; - int noerror; +print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) { - register int c; - register int desc; - register FILE *stream; + int c; + int desc; + FILE *stream; int nlines = stopline - line; /* Regardless of whether we can open the file, set current_source_symtab. */ @@ -992,16 +1175,24 @@ print_source_lines_base (s, line, stopline, noerror) current_source_line = line; first_line_listed = line; - - /* Only prints "No such file or directory" once */ - if ((s != last_source_visited) || (! last_source_error)) + /* If printing of source lines is disabled, just print file and line number */ + if (ui_out_test_flags (uiout, ui_source_list)) { - last_source_visited = s; - desc = open_source_file (s); + /* Only prints "No such file or directory" once */ + if ((s != last_source_visited) || (!last_source_error)) + { + last_source_visited = s; + desc = open_source_file (s); + } + else + { + desc = last_source_error; + noerror = 1; + } } else { - desc = last_source_error; + desc = -1; noerror = 1; } @@ -1009,14 +1200,17 @@ print_source_lines_base (s, line, stopline, noerror) { last_source_error = desc; - if (! noerror) - { + if (!noerror) + { char *name = alloca (strlen (s->filename) + 100); sprintf (name, "%d\t%s", line, s->filename); 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; } @@ -1044,25 +1238,42 @@ print_source_lines_base (s, line, stopline, noerror) while (nlines-- > 0) { + char buf[20]; + c = fgetc (stream); - if (c == EOF) break; + 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); - } while (c != '\n' && (c = fgetc (stream)) >= 0); + { + sprintf (buf, "%c", c); + ui_out_text (uiout, buf); + } + } + while (c != '\n' && (c = fgetc (stream)) >= 0); } fclose (stream); @@ -1073,251 +1284,23 @@ print_source_lines_base (s, line, stopline, noerror) not the command line version, then the source is shown in the source window otherwise it is simply printed */ -void -print_source_lines (s, line, stopline, noerror) - struct symtab *s; - int line, stopline, 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 -} - - - -/* Print a list of files and line numbers which a user may choose from - in order to list a function which was specified ambiguously (as with - `list classname::overloadedfuncname', for example). The vector in - SALS provides the filenames and line numbers. */ - -static void -ambiguous_line_spec (sals) - struct symtabs_and_lines *sals; -{ - int i; - - for (i = 0; i < sals->nelts; ++i) - printf_filtered("file: \"%s\", line number: %d\n", - sals->sals[i].symtab->filename, sals->sals[i].line); -} - -static void -list_command (arg, from_tty) - char *arg; - int from_tty; +void +print_source_lines (struct symtab *s, int line, int stopline, int noerror) { - struct symtabs_and_lines sals, sals_end; - struct symtab_and_line sal, sal_end; - struct symbol *sym; - char *arg1; - int no_end = 1; - int dummy_end = 0; - int dummy_beg = 0; - int linenum_beg = 0; - char *p; - - if (!have_full_symbols () && !have_partial_symbols()) - error ("No symbol table is loaded. Use the \"file\" command."); - - /* Pull in a current source symtab if necessary */ - if (current_source_symtab == 0 && - (arg == 0 || arg[0] == '+' || arg[0] == '-')) - select_source_symtab (0); - - /* "l" or "l +" lists next ten lines. */ - - if (arg == 0 || STREQ (arg, "+")) - { - if (current_source_symtab == 0) - error ("No default source file yet. Do \"help list\"."); - print_source_lines (current_source_symtab, current_source_line, - current_source_line + lines_to_list, 0); - return; - } - - /* "l -" lists previous ten lines, the ones before the ten just listed. */ - if (STREQ (arg, "-")) - { - if (current_source_symtab == 0) - error ("No default source file yet. Do \"help list\"."); - print_source_lines (current_source_symtab, - max (first_line_listed - lines_to_list, 1), - first_line_listed, 0); - return; - } - - /* Now if there is only one argument, decode it in SAL - and set NO_END. - If there are two arguments, decode them in SAL and SAL_END - and clear NO_END; however, if one of the arguments is blank, - set DUMMY_BEG or DUMMY_END to record that fact. */ - - arg1 = arg; - if (*arg1 == ',') - dummy_beg = 1; - else - { - sals = decode_line_1 (&arg1, 0, 0, 0, 0); - - if (! sals.nelts) return; /* C++ */ - if (sals.nelts > 1) - { - ambiguous_line_spec (&sals); - free (sals.sals); - return; - } - - sal = sals.sals[0]; - free (sals.sals); - } - - /* Record whether the BEG arg is all digits. */ - - for (p = arg; p != arg1 && *p >= '0' && *p <= '9'; p++); - linenum_beg = (p == arg1); - - while (*arg1 == ' ' || *arg1 == '\t') - arg1++; - if (*arg1 == ',') - { - no_end = 0; - arg1++; - while (*arg1 == ' ' || *arg1 == '\t') - arg1++; - if (*arg1 == 0) - dummy_end = 1; - else - { - if (dummy_beg) - sals_end = decode_line_1 (&arg1, 0, 0, 0, 0); - else - sals_end = decode_line_1 (&arg1, 0, sal.symtab, sal.line, 0); - if (sals_end.nelts == 0) - return; - if (sals_end.nelts > 1) - { - ambiguous_line_spec (&sals_end); - free (sals_end.sals); - return; - } - sal_end = sals_end.sals[0]; - free (sals_end.sals); - } - } - - if (*arg1) - error ("Junk at end of line specification."); - - if (!no_end && !dummy_beg && !dummy_end - && sal.symtab != sal_end.symtab) - error ("Specified start and end are in different files."); - if (dummy_beg && dummy_end) - error ("Two empty args do not say what lines to list."); - - /* if line was specified by address, - first print exactly which line, and which file. - In this case, sal.symtab == 0 means address is outside - of all known source files, not that user failed to give a filename. */ - if (*arg == '*') - { - if (sal.symtab == 0) - /* FIXME-32x64--assumes sal.pc fits in long. */ - error ("No source file for address %s.", - local_hex_string((unsigned long) sal.pc)); - sym = find_pc_function (sal.pc); - if (sym) - { - print_address_numeric (sal.pc, 1, gdb_stdout); - printf_filtered (" is in "); - fputs_filtered (SYMBOL_SOURCE_NAME (sym), gdb_stdout); - printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line); - } - else - { - print_address_numeric (sal.pc, 1, gdb_stdout); - printf_filtered (" is at %s:%d.\n", - sal.symtab->filename, sal.line); - } - } - - /* If line was not specified by just a line number, - and it does not imply a symtab, it must be an undebuggable symbol - which means no source code. */ - - if (! linenum_beg && sal.symtab == 0) - error ("No line number known for %s.", arg); - - /* If this command is repeated with RET, - turn it into the no-arg variant. */ - - if (from_tty) - *arg = 0; - - if (dummy_beg && sal_end.symtab == 0) - error ("No default source file yet. Do \"help list\"."); - if (dummy_beg) - print_source_lines (sal_end.symtab, - max (sal_end.line - (lines_to_list - 1), 1), - sal_end.line + 1, 0); - else if (sal.symtab == 0) - 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); - else - print_source_lines (sal.symtab, sal.line, - (dummy_end - ? sal.line + lines_to_list - : sal_end.line + 1), - 0); + print_source_lines_base (s, line, stopline, noerror); } /* 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; CORE_ADDR start_pc, end_pc; int i; - INIT_SAL (&sal); /* initialize to zeroes */ + init_sal (&sal); /* initialize to zeroes */ if (arg == 0) { @@ -1331,7 +1314,7 @@ line_info (arg, from_tty) else { sals = decode_line_spec_1 (arg, 0); - + dont_repeat (); } @@ -1340,15 +1323,15 @@ line_info (arg, from_tty) for (i = 0; i < sals.nelts; i++) { sal = sals.sals[i]; - + if (sal.symtab == 0) { printf_filtered ("No line number information available"); if (sal.pc != 0) { /* This is useful for "info line *0x7f34". If we can't tell the - user about a source line, at least let them have the symbolic - address. */ + user about a source line, at least let them have the symbolic + address. */ printf_filtered (" for address "); wrap_here (" "); print_address (sal.pc, gdb_stdout); @@ -1401,50 +1384,25 @@ 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; - register FILE *stream; + int c; + int desc; + 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) - error (msg); + error ("%s", msg); if (current_source_symtab == 0) select_source_symtab (0); @@ -1470,89 +1428,76 @@ forward_search_command (regex, from_tty) stream = fdopen (desc, FDOPEN_MODE); clearerr (stream); - while (1) { - static char *buf = NULL; - register char *p; - int cursize, newsize; - - cursize = 256; - buf = xmalloc (cursize); - p = buf; - - c = getc (stream); - if (c == EOF) - break; - do { - *p++ = c; - if (p - buf == cursize) + while (1) + { + static char *buf = NULL; + char *p; + int cursize, newsize; + + cursize = 256; + buf = xmalloc (cursize); + p = buf; + + c = getc (stream); + if (c == EOF) + break; + do { - newsize = cursize + cursize / 2; - buf = xrealloc (buf, newsize); - p = buf + cursize; - cursize = newsize; + *p++ = c; + if (p - buf == cursize) + { + newsize = cursize + cursize / 2; + buf = xrealloc (buf, newsize); + p = buf + cursize; + cursize = newsize; + } } - } while (c != '\n' && (c = getc (stream)) >= 0); + while (c != '\n' && (c = getc (stream)) >= 0); - /* 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, - (LONGEST) line)); - current_source_line = max (line - lines_to_list / 2, 1); - return; - } - line++; - } +#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); + print_source_lines (current_source_symtab, line, line + 1, 0); + set_internalvar (lookup_internalvar ("_"), + value_from_longest (builtin_type_int, + (LONGEST) line)); + current_source_line = max (line - lines_to_list / 2, 1); + return; + } + line++; + } printf_filtered ("Expression not found\n"); fclose (stream); } -/* 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 c; + int desc; + 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) - error (msg); + error ("%s", msg); if (current_source_symtab == 0) select_source_symtab (0); @@ -1582,14 +1527,26 @@ reverse_search_command (regex, from_tty) { /* FIXME!!! We walk right off the end of buf if we get a long line!!! */ char buf[4096]; /* Should be reasonable??? */ - register char *p = buf; + char *p = buf; c = getc (stream); if (c == EOF) break; - do { - *p++ = c; - } while (c != '\n' && (c = getc (stream)) >= 0); + do + { + *p++ = c; + } + 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; @@ -1597,9 +1554,7 @@ reverse_search_command (regex, from_tty) { /* 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); + print_source_lines (current_source_symtab, line, line + 1, 0); set_internalvar (lookup_internalvar ("_"), value_from_longest (builtin_type_int, (LONGEST) line)); @@ -1620,7 +1575,7 @@ reverse_search_command (regex, from_tty) } void -_initialize_source () +_initialize_source (void) { struct cmd_list_element *c; current_source_symtab = 0; @@ -1633,7 +1588,7 @@ _initialize_source () re_set_syntax (RE_SYNTAX_GREP); c = add_cmd ("directory", class_files, directory_command, - "Add directory DIR to beginning of search path for source files.\n\ + "Add directory DIR to beginning of search path for source files.\n\ Forget cached info on source file locations and line positions.\n\ DIR can also be $cwd for the current working directory, or $cdir for the\n\ directory in which the source file was compiled into object code.\n\ @@ -1641,9 +1596,9 @@ With no argument, reset the search path to $cdir:$cwd, the default.", &cmdlist); if (dbx_commands) - add_com_alias("use", "directory", class_files, 0); + 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\ @@ -1653,12 +1608,12 @@ $cdir in the path means the compilation directory of the source file.", if (xdb_commands) { - add_com_alias("D", "directory", class_files, 0); + add_com_alias ("D", "directory", class_files, 0); add_cmd ("ld", no_class, show_directories, - "Current search path for finding source files.\n\ + "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); + &cmdlist); } add_info ("source", source_info, @@ -1688,37 +1643,14 @@ The matching line number is also stored as the value of \"$_\"."); if (xdb_commands) { - add_com_alias("/", "forward-search", class_files, 0); - add_com_alias("?", "reverse-search", class_files, 0); + add_com_alias ("/", "forward-search", class_files, 0); + add_com_alias ("?", "reverse-search", class_files, 0); } - add_com ("list", class_files, list_command, - concat ("List specified function or line.\n\ -With no argument, lists ten more lines after or around previous listing.\n\ -\"list -\" lists the ten lines before a previous ten-line listing.\n\ -One argument specifies a line, and ten lines are listed around that line.\n\ -Two arguments with comma between specify starting and ending lines to list.\n\ -", "\ -Lines can be specified in these ways:\n\ - LINENUM, to list around that line in current file,\n\ - FILE:LINENUM, to list around that line in that file,\n\ - FUNCTION, to list around beginning of that function,\n\ - FILE:FUNCTION, to distinguish among like-named static functions.\n\ - *ADDRESS, to list around the line containing that address.\n\ -With two args if one is empty it stands for ten lines away from the other arg.", NULL)); - - if (!xdb_commands) - add_com_alias ("l", "list", class_files, 1); - else - add_com_alias ("v", "list", class_files, 1); - - if (dbx_commands) - add_com_alias ("file", "list", class_files, 1); - - add_show_from_set + deprecated_add_show_from_set (add_set_cmd ("listsize", class_support, var_uinteger, - (char *)&lines_to_list, - "Set number of source lines gdb will list by default.", + (char *) &lines_to_list, + "Set number of source lines gdb will list by default.", &setlist), &showlist); }