/* List lines of source files for GDB, the GNU debugger.
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
- 2009 Free Software Foundation, Inc.
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GDB.
#include "ui-out.h"
#include "readline/readline.h"
+#include "psymtab.h"
+
#define OPEN_MODE (O_RDONLY | O_BINARY)
#define FDOPEN_MODE FOPEN_RB
-/* Prototypes for exported functions. */
+/* Prototypes for exported functions. */
void _initialize_source (void);
-/* Prototypes for local functions. */
+/* Prototypes for local functions. */
static int get_filename_and_charpos (struct symtab *, char **);
static void source_info (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. */
static int current_source_line;
+static struct program_space *current_source_pspace;
+
/* 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
characters) lines there will be. To be completely correct, "list"
show_lines_to_list (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("\
-Number of source lines gdb will list by default is %s.\n"),
+ fprintf_filtered (file,
+ _("Number of source lines gdb "
+ "will list by default is %s.\n"),
value);
}
static int first_line_listed;
/* Saves the name of the last source file visited and a possible error code.
- Used to prevent repeating annoying "No such file or directories" msgs */
+ Used to prevent repeating annoying "No such file or directories" msgs. */
static struct symtab *last_source_visited = NULL;
static int last_source_error = 0;
\f
/* Return the first line listed by print_source_lines.
Used by command interpreters to request listing from
- a previous point. */
+ a previous point. */
int
get_first_line_listed (void)
/* 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. */
+ as it does not automatically use this value. */
int
get_lines_to_list (void)
}
/* Return the current source file for listing and next line to list.
- NOTE: The returned sal pc and end fields are not valid. */
+ 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 = { 0 };
+ cursal.pspace = current_source_pspace;
cursal.symtab = current_source_symtab;
cursal.line = current_source_line;
cursal.pc = 0;
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. */
+ 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 */
+ /* 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. */
+ 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 = { 0 };
-
+
+ cursal.pspace = current_source_pspace;
cursal.symtab = current_source_symtab;
cursal.line = current_source_line;
+ cursal.pc = 0;
+ cursal.end = 0;
+ current_source_pspace = sal->pspace;
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. */
+/* Reset any information stored about a default file and line to print. */
void
clear_current_source_symtab_and_line (void)
{
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;
current_source_line = 1;
+ current_source_pspace = SYMTAB_PSPACE (s);
return;
}
sals = decode_line_spec (main_name (), 1);
sal = sals.sals[0];
xfree (sals.sals);
+ current_source_pspace = sal.pspace;
current_source_symtab = sal.symtab;
current_source_line = max (sal.line - (lines_to_list - 1), 1);
if (current_source_symtab)
current_source_line = 1;
- for (ofp = object_files; ofp != NULL; ofp = ofp->next)
+ ALL_OBJFILES (ofp)
{
for (s = ofp->symtabs; s; s = s->next)
{
const char *name = s->filename;
int len = strlen (name);
+
if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0
|| strcmp (name, "<<C++-namespaces>>") == 0)))
- current_source_symtab = s;
+ {
+ current_source_pspace = current_program_space;
+ current_source_symtab = s;
+ }
}
}
+
if (current_source_symtab)
return;
- /* How about the partial symbol tables? */
-
- for (ofp = object_files; ofp != NULL; ofp = ofp->next)
- {
- for (ps = ofp->psymtabs; ps != NULL; ps = ps->next)
- {
- const char *name = ps->filename;
- int len = strlen (name);
- if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0
- || strcmp (name, "<<C++-namespaces>>") == 0)))
- cs_pst = ps;
- }
- }
- if (cs_pst)
- {
- if (cs_pst->readin)
- {
- internal_error (__FILE__, __LINE__,
- _("select_source_symtab: "
- "readin pst found and no symtabs."));
- }
- else
- {
- current_source_symtab = PSYMTAB_TO_SYMTAB (cs_pst);
- }
- }
+ ALL_OBJFILES (ofp)
+ {
+ if (ofp->sf)
+ s = ofp->sf->qf->find_last_source_symtab (ofp);
+ if (s)
+ current_source_symtab = s;
+ }
if (current_source_symtab)
return;
error (_("Can't find a default source file"));
}
\f
+/* Handler for "set directories path-list" command.
+ "set dir mumble" doesn't prepend paths, it resets the entire
+ path list. The theory is that set(show(dir)) should be a no-op. */
+
+static void
+set_directories_command (char *args, int from_tty, struct cmd_list_element *c)
+{
+ /* This is the value that was set.
+ It needs to be processed to maintain $cdir:$cwd and remove dups. */
+ char *set_path = source_path;
+
+ /* We preserve the invariant that $cdir:$cwd begins life at the end of
+ the list by calling init_source_path. If they appear earlier in
+ SET_PATH then mod_path will move them appropriately.
+ mod_path will also remove duplicates. */
+ init_source_path ();
+ if (*set_path != '\0')
+ mod_path (set_path, &source_path);
+
+ xfree (set_path);
+}
+
+/* Print the list of source directories.
+ This is used by the "ld" command, so it has the signature of a command
+ function. */
+
static void
-show_directories (char *ignore, int from_tty)
+show_directories_1 (char *ignore, int from_tty)
{
puts_filtered ("Source directories searched: ");
puts_filtered (source_path);
puts_filtered ("\n");
}
+/* Handler for "show directories" command. */
+
+static void
+show_directories_command (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
+{
+ show_directories_1 (NULL, from_tty);
+}
+
+/* Forget line positions and file names for the symtabs in a
+ particular objfile. */
+
+void
+forget_cached_source_info_for_objfile (struct objfile *objfile)
+{
+ struct symtab *s;
+
+ ALL_OBJFILE_SYMTABS (objfile, s)
+ {
+ if (s->line_charpos != NULL)
+ {
+ xfree (s->line_charpos);
+ s->line_charpos = NULL;
+ }
+ if (s->fullname != NULL)
+ {
+ xfree (s->fullname);
+ s->fullname = NULL;
+ }
+
+ if (objfile->sf)
+ objfile->sf->qf->forget_cached_source_info (objfile);
+ }
+}
+
/* Forget what we learned about line positions in source files, and
which directories contain them; must check again now since files
may be found in a different directory now. */
void
forget_cached_source_info (void)
{
+ struct program_space *pspace;
struct symtab *s;
struct objfile *objfile;
- struct partial_symtab *pst;
- for (objfile = object_files; objfile != NULL; objfile = objfile->next)
+ ALL_PSPACES (pspace)
+ ALL_PSPACE_OBJFILES (pspace, objfile)
{
- for (s = objfile->symtabs; s != NULL; s = s->next)
- {
- if (s->line_charpos != NULL)
- {
- xfree (s->line_charpos);
- s->line_charpos = NULL;
- }
- if (s->fullname != NULL)
- {
- xfree (s->fullname);
- s->fullname = NULL;
- }
- }
-
- ALL_OBJFILE_PSYMTABS (objfile, pst)
- {
- if (pst->fullname != NULL)
- {
- xfree (pst->fullname);
- pst->fullname = NULL;
- }
- }
+ forget_cached_source_info_for_objfile (objfile);
}
last_source_visited = NULL;
directory_command (char *dirname, int from_tty)
{
dont_repeat ();
- /* FIXME, this goes to "delete dir"... */
+ /* FIXME, this goes to "delete dir"... */
if (dirname == 0)
{
if (!from_tty || query (_("Reinitialize source path to empty? ")))
forget_cached_source_info ();
}
if (from_tty)
- show_directories ((char *) 0, from_tty);
+ show_directories_1 ((char *) 0, from_tty);
}
/* Add a path given with the -d command line switch.
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. */
+ as space or tab. */
void
add_path (char *dirname, char **which_path, int parse_separators)
if (parse_separators)
{
/* This will properly parse the space and tab separators
- and any quotes that may exist. DIRNAME_SEPARATOR will
+ and any quotes that may exist. DIRNAME_SEPARATOR will
be dealt with later. */
argv = gdb_buildargv (dirname);
make_cleanup_freeargv (argv);
&& !(p == name + 3 && name[1] == ':') /* "d:/" */
#endif
&& IS_DIR_SEPARATOR (p[-1]))
- /* Sigh. "foo/" => "foo" */
+ /* Sigh. "foo/" => "foo" */
--p;
*p = '\0';
if (stat (name, &st) < 0)
{
int save_errno = errno;
+
fprintf_unfiltered (gdb_stderr, "Warning: ");
print_sys_errmsg (name, save_errno);
}
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
+ /* FIXME: we should 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)
+ if (!filename_ncmp (p, name, len)
&& (p[len] == '\0' || p[len] == DIRNAME_SEPARATOR))
{
- /* Found it in the search path, remove old copy */
+ /* 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 */
+ goto skip_dup; /* Same dir twice in one cmd. */
strcpy (p, &p[len + 1]); /* Copy from next \0 or : */
}
p = strchr (p, DIRNAME_SEPARATOR);
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;
old[prefix] = '\0';
temp = concat (old, tinybuf, name, (char *)NULL);
old[prefix] = c;
- *which_path = concat (temp, "", &old[prefix], (char *)NULL);
+ *which_path = concat (temp, "", &old[prefix], (char *) NULL);
prefix = strlen (temp);
xfree (temp);
}
old = *which_path;
}
}
- skip_dup:;
+ skip_dup:
+ ;
}
while (arg != NULL);
}
}
\f
-/* Return True if the file NAME exists and is a regular file */
+/* Return True if the file NAME exists and is a regular file. */
static int
is_regular_file (const char *name)
{
/* 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.
- */
+ on obscure systems where stat does not work as expected. */
+
if (status != 0)
return (errno != ENOENT);
Otherwise, return -1, with errno set for the last name we tried to open. */
/* >>>> This should only allow files of certain types,
- >>>> eg executable, non-directory */
+ >>>> eg executable, non-directory. */
int
openp (const char *path, int opts, const char *string,
int mode, char **filename_opened)
/* The open syscall MODE parameter is not specified. */
gdb_assert ((mode & O_CREAT) == 0);
+ gdb_assert (string != NULL);
+
+ /* A file with an empty name cannot possibly exist. Report a failure
+ without further checking.
+
+ This is an optimization which also defends us against buggy
+ implementations of the "stat" function. For instance, we have
+ noticed that a MinGW debugger built on Windows XP 32bits crashes
+ when the debugger is started with an empty argument. */
+ if (string[0] == '\0')
+ {
+ errno = ENOENT;
+ return -1;
+ }
if (!path)
path = ".";
goto done;
}
- /* /foo => foo, to avoid multiple slashes that Emacs doesn't like. */
+ /* For dos paths, d:/foo -> /foo, and d:foo -> foo. */
+ if (HAS_DRIVE_SPEC (string))
+ string = STRIP_DRIVE_SPEC (string);
+
+ /* /foo => foo, to avoid multiple slashes that Emacs doesn't like. */
while (IS_DIR_SEPARATOR(string[0]))
string++;
/* Name is $cwd -- insert current directory name instead. */
int newlen;
- /* First, realloc the filename buffer if too short. */
+ /* First, realloc the filename buffer if too short. */
len = strlen (current_directory);
newlen = len + strlen (string) + 2;
if (newlen > alloclen)
/* Normal file name in path -- just use it. */
strncpy (filename, p, len);
filename[len] = 0;
+
+ /* Don't search $cdir. It's also a magic path like $cwd, but we
+ don't have enough information to expand it. The user *could*
+ have an actual directory named '$cdir' but handling that would
+ be confusing, it would mean different things in different
+ contexts. If the user really has '$cdir' one can use './$cdir'.
+ We can get $cdir when loading scripts. When loading source files
+ $cdir must have already been expanded to the correct value. */
+ if (strcmp (filename, "$cdir") == 0)
+ continue;
}
- /* Remove trailing slashes */
+ /* Remove trailing slashes. */
while (len > 0 && IS_DIR_SEPARATOR (filename[len - 1]))
filename[--len] = 0;
done:
if (filename_opened)
{
- /* If a file was opened, canonicalize its filename. Use xfullpath
+ /* 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
+ 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 = xfullpath (filename);
else
{
- /* Beware the // my son, the Emacs barfs, the botch that catch... */
+ /* Beware the // my son, the Emacs barfs, the botch that catch... */
char *f = concat (current_directory,
IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1])
? "" : SLASH_STRING,
filename, (char *)NULL);
+
*filename_opened = xfullpath (f);
xfree (f);
}
/* If the user specified a source path substitution rule that applies
to PATH, then apply it and return the new path. This new path must
- be deallocated afterwards.
+ be deallocated afterwards.
Return NULL if no substitution rule was specified by the user,
or if no rule applied to the given PATH. */
}
/* This function is capable of finding the absolute path to a
- source file, and opening it, provided you give it a FILENAME. Both the
- DIRNAME and FULLNAME are only added suggestions on where to find the file.
+ source file, and opening it, provided you give it a FILENAME. Both the
+ DIRNAME and FULLNAME are only added suggestions on where to find the file.
FILENAME should be the filename to open.
DIRNAME is the compilation directory of a particular source file.
is applied we free the old value and set a new one.
On Success
- A valid file descriptor is returned. ( the return value is positive )
+ A valid file descriptor is returned (the return value is positive).
FULLNAME is set to the absolute path to the file just opened.
The caller is responsible for freeing FULLNAME.
On Failure
- An invalid file descriptor is returned. ( the return value is negative )
+ An invalid file descriptor is returned (the return value is negative).
FULLNAME is set to NULL. */
-static int
+int
find_and_open_source (const char *filename,
const char *dirname,
char **fullname)
const char *p;
int result;
- /* Quick way out if we already know its full name */
+ /* Quick way out if we already know its full name. */
if (*fullname)
{
result = open (*fullname, OPEN_MODE);
if (result >= 0)
return result;
- /* Didn't work -- free old one, try again. */
+ /* Didn't work -- free old one, try again. */
xfree (*fullname);
*fullname = NULL;
}
dirname = rewritten_dirname;
}
- /* Replace a path entry of $cdir with the compilation directory name */
+ /* 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. */
+ 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'))
alloca (strlen (source_path) + 1 + strlen (dirname) + 1);
len = p - source_path;
strncpy (path, source_path, len); /* Before $cdir */
- strcpy (path + len, dirname); /* new stuff */
- strcat (path + len, source_path + len + cdir_len); /* After $cdir */
+ strcpy (path + len, dirname); /* new stuff */
+ strcat (path + len, source_path + len + cdir_len); /* After
+ $cdir */
}
}
result = openp (path, OPF_SEARCH_IN_PATH, filename, OPEN_MODE, fullname);
if (result < 0)
{
- /* Didn't work. Try using just the basename. */
+ /* Didn't work. Try using just the basename. */
p = lbasename (filename);
if (p != filename)
result = openp (path, OPF_SEARCH_IN_PATH, p, OPEN_MODE, fullname);
/* 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. */
+ This function is a convience function to find_and_open_source. */
int
open_source_file (struct symtab *s)
return NULL;
/* Don't check s->fullname here, the file could have been
- deleted/moved/..., look for it again */
+ deleted/moved/..., look for it again. */
r = find_and_open_source (s->filename, s->dirname, &s->fullname);
if (r >= 0)
return NULL;
}
-
-/* Finds the fullname that a partial_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 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->filename, ps->dirname, &ps->fullname);
-
- if (r >= 0)
- {
- close (r);
- return ps->fullname;
- }
-
- return NULL;
-}
\f
/* Create and initialize the table S->line_charpos that records
the positions of the lines in the source file, which is assumed
if (mtime && mtime < st.st_mtime)
warning (_("Source file is more recent than executable."));
-#ifdef LSEEK_NOT_LINEAR
- {
- char c;
-
- /* Have to read it byte by byte to find out where the chars live */
-
- line_charpos[0] = lseek (desc, 0, SEEK_CUR);
- nlines = 1;
- while (myread (desc, &c, 1) > 0)
- {
- if (c == '\n')
- {
- if (nlines == lines_allocated)
- {
- lines_allocated *= 2;
- line_charpos =
- (int *) xrealloc ((char *) line_charpos,
- sizeof (int) * lines_allocated);
- }
- line_charpos[nlines++] = lseek (desc, 0, SEEK_CUR);
- }
- }
- }
-#else /* lseek linear. */
{
struct cleanup *old_cleanups;
}
do_cleanups (old_cleanups);
}
-#endif /* lseek linear. */
+
s->nlines = nlines;
s->line_charpos =
(int *) xrealloc ((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 */
-
-int
-source_line_charpos (struct symtab *s, int line)
-{
- 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];
-}
-
-/* Return the line number of character position POS in symtab S. */
-
-int
-source_charpos_line (struct symtab *s, int chr)
-{
- 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)
- {
- line++;
- lnp++;
- }
- if (line >= s->nlines)
- line = s->nlines;
- return line;
-}
-
-#endif /* 0 */
\f
/* Get full pathname and line number positions for a symtab.
\f
/* Print source lines from the file of symtab S,
- starting with line number LINE and stopping before line number STOPLINE. */
+ 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);
{
int c;
int desc;
+ int noprint = 0;
FILE *stream;
int nlines = stopline - line;
struct cleanup *cleanup;
+ struct ui_out *uiout = current_uiout;
- /* Regardless of whether we can open the file, set current_source_symtab. */
+ /* Regardless of whether we can open the file, set current_source_symtab. */
current_source_symtab = s;
current_source_line = line;
first_line_listed = line;
- /* If printing of source lines is disabled, just print file and line number */
+ /* 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 */
+ /* Only prints "No such file or directory" once. */
if ((s != last_source_visited) || (!last_source_error))
{
last_source_visited = s;
}
else
{
- desc = -1;
+ desc = last_source_error;
noerror = 1;
+ noprint = 1;
}
- if (desc < 0)
+ if (desc < 0 || noprint)
{
last_source_error = desc;
/* Show source lines from the file of symtab S, starting with line
number LINE and stopping before line number STOPLINE. If this is
not the command line version, then the source is shown in the source
- window otherwise it is simply printed */
+ window otherwise it is simply printed. */
void
print_source_lines (struct symtab *s, int line, int stopline, int noerror)
}
/* C++ More than one line may have been specified, as when the user
- specifies an overloaded function name. Print info on them all. */
+ specifies an overloaded function name. Print info on them all. */
for (i = 0; i < sals.nelts; i++)
{
sal = sals.sals[i];
p[-1] = '\n';
}
- /* we now have a source line in buf, null terminate and match */
+ /* We now have a source line in buf, null terminate and match. */
*p = 0;
if (re_exec (buf) > 0)
{
- /* Match! */
+ /* Match! */
do_cleanups (cleanups);
print_source_lines (current_source_symtab, line, line + 1, 0);
set_internalvar_integer (lookup_internalvar ("_"), line);
cleanups = make_cleanup_fclose (stream);
while (line > 1)
{
-/* FIXME!!! We walk right off the end of buf if we get a long line!!! */
- char buf[4096]; /* Should be reasonable??? */
+/* FIXME!!! We walk right off the end of buf if we get a long line!!! */
+ char buf[4096]; /* Should be reasonable??? */
char *p = buf;
c = getc (stream);
*p = 0;
if (re_exec (buf) > 0)
{
- /* Match! */
+ /* Match! */
do_cleanups (cleanups);
print_source_lines (current_source_symtab, line, line + 1, 0);
set_internalvar_integer (lookup_internalvar ("_"), line);
static void
set_substitute_path_command (char *args, int from_tty)
{
- char *from_path, *to_path;
char **argv;
struct substitute_path_rule *rule;
_initialize_source (void)
{
struct cmd_list_element *c;
+
current_source_symtab = 0;
init_source_path ();
set_cmd_completer (c, filename_completer);
- add_cmd ("directories", no_class, show_directories, _("\
-Current search path for finding source files.\n\
+ add_setshow_optional_filename_cmd ("directories",
+ class_files,
+ &source_path,
+ _("\
+Set the search path for finding source files."),
+ _("\
+Show the search path for finding source files."),
+ _("\
$cwd in the path means the current working directory.\n\
-$cdir in the path means the compilation directory of the source file."),
- &showlist);
+$cdir in the path means the compilation directory of the source file.\n\
+GDB ensures the search path always ends with $cdir:$cwd by\n\
+appending these directories if necessary.\n\
+Setting the value to an empty string sets it to $cdir:$cwd, the default."),
+ set_directories_command,
+ show_directories_command,
+ &setlist, &showlist);
if (xdb_commands)
{
add_com_alias ("D", "directory", class_files, 0);
- add_cmd ("ld", no_class, show_directories, _("\
+ add_cmd ("ld", no_class, show_directories_1, _("\
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."),
add_com ("reverse-search", class_files, reverse_search_command, _("\
Search backward for regular expression (see regex(3)) from last line listed.\n\
The matching line number is also stored as the value of \"$_\"."));
+ add_com_alias ("rev", "reverse-search", class_files, 1);
if (xdb_commands)
{
projects / deliverable / binutils-gdb.git / blobdiff