X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fsource.c;h=e0ae0b179fd8c3221b0c09ce10d7200629fa65c7;hb=ec56be1b4dc25ec39c32ceab997747ad651c9d22;hp=1f1a724564a4f13bcaee6b2598e345a67c81ff37;hpb=1bedd215175652ad3e82d2fb731f1d62dd44acf8;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/source.c b/gdb/source.c
index 1f1a724564..e0ae0b179f 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1,13 +1,13 @@
/* List lines of source files for GDB, the GNU debugger.
- Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
- 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+ 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008
Free Software Foundation, Inc.
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
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. */
+ along with this program. If not, see . */
#include "defs.h"
#include "symtab.h"
@@ -29,6 +27,7 @@
#include "gdbcmd.h"
#include "frame.h"
#include "value.h"
+#include "gdb_assert.h"
#include
#include "gdb_string.h"
@@ -46,9 +45,6 @@
#include "ui-out.h"
#include "readline/readline.h"
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
#define OPEN_MODE (O_RDONLY | O_BINARY)
#define FDOPEN_MODE FOPEN_RB
@@ -76,6 +72,17 @@ static void show_directories (char *, int);
char *source_path;
+/* Support for source path substitution commands. */
+
+struct substitute_path_rule
+{
+ char *from;
+ char *to;
+ struct substitute_path_rule *next;
+};
+
+static struct substitute_path_rule *substitute_path_rules = NULL;
+
/* Symtab of default file for listing lines of. */
static struct symtab *current_source_symtab;
@@ -91,6 +98,14 @@ static int current_source_line;
things are wrapping, but that would be a fair amount of work. */
int lines_to_list = 10;
+static void
+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"),
+ value);
+}
/* Line number of last line printed. Default for various commands.
current_source_line is usually, but not always, the same as this. */
@@ -134,7 +149,7 @@ get_lines_to_list (void)
struct symtab_and_line
get_current_source_symtab_and_line (void)
{
- struct symtab_and_line cursal;
+ struct symtab_and_line cursal = { 0 };
cursal.symtab = current_source_symtab;
cursal.line = current_source_line;
@@ -173,7 +188,7 @@ set_default_source_symtab_and_line (void)
struct symtab_and_line
set_current_source_symtab_and_line (const struct symtab_and_line *sal)
{
- struct symtab_and_line cursal;
+ struct symtab_and_line cursal = { 0 };
cursal.symtab = current_source_symtab;
cursal.line = current_source_line;
@@ -224,7 +239,7 @@ select_source_symtab (struct symtab *s)
/* Make the default place to list be the function `main'
if one exists. */
- if (lookup_symbol (main_name (), 0, VAR_DOMAIN, 0, NULL))
+ if (lookup_symbol (main_name (), 0, VAR_DOMAIN, 0))
{
sals = decode_line_spec (main_name (), 1);
sal = sals.sals[0];
@@ -235,7 +250,8 @@ select_source_symtab (struct symtab *s)
return;
}
- /* All right; find the last file in the symtab list (ignoring .h's). */
+ /* Alright; find the last file in the symtab list (ignoring .h's
+ and namespace symtabs). */
current_source_line = 1;
@@ -243,29 +259,27 @@ select_source_symtab (struct symtab *s)
{
for (s = ofp->symtabs; s; s = s->next)
{
- char *name = s->filename;
+ const char *name = s->filename;
int len = strlen (name);
- if (!(len > 2 && (DEPRECATED_STREQ (&name[len - 2], ".h"))))
- {
- current_source_symtab = s;
- }
+ if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0
+ || strcmp (name, "<>") == 0)))
+ current_source_symtab = s;
}
}
if (current_source_symtab)
return;
- /* Howabout the partial symbol tables? */
+ /* How about the partial symbol tables? */
for (ofp = object_files; ofp != NULL; ofp = ofp->next)
{
for (ps = ofp->psymtabs; ps != NULL; ps = ps->next)
{
- char *name = ps->filename;
+ const char *name = ps->filename;
int len = strlen (name);
- if (!(len > 2 && (DEPRECATED_STREQ (&name[len - 2], ".h"))))
- {
- cs_pst = ps;
- }
+ if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0
+ || strcmp (name, "<>") == 0)))
+ cs_pst = ps;
}
}
if (cs_pst)
@@ -358,7 +372,7 @@ directory_command (char *dirname, int from_tty)
/* FIXME, this goes to "delete dir"... */
if (dirname == 0)
{
- if (from_tty && query (_("Reinitialize source path to empty? ")))
+ if (!from_tty || query (_("Reinitialize source path to empty? ")))
{
xfree (source_path);
init_source_path ();
@@ -374,6 +388,15 @@ directory_command (char *dirname, int from_tty)
forget_cached_source_info ();
}
+/* Add a path given with the -d command line switch.
+ This will not be quoted so we must not treat spaces as separators. */
+
+void
+directory_switch (char *dirname, int from_tty)
+{
+ add_path (dirname, &source_path, 0);
+}
+
/* Add zero or more directories to the front of an arbitrary path. */
void
@@ -393,56 +416,72 @@ add_path (char *dirname, char **which_path, int parse_separators)
{
char *old = *which_path;
int prefix = 0;
+ char **argv = NULL;
+ char *arg;
+ int argv_index = 0;
if (dirname == 0)
return;
- dirname = xstrdup (dirname);
- make_cleanup (xfree, dirname);
+ if (parse_separators)
+ {
+ /* This will properly parse the space and tab separators
+ and any quotes that may exist. DIRNAME_SEPARATOR will
+ be dealt with later. */
+ argv = buildargv (dirname);
+ make_cleanup_freeargv (argv);
+
+ if (argv == NULL)
+ nomem (0);
+
+ arg = argv[0];
+ }
+ else
+ {
+ arg = xstrdup (dirname);
+ make_cleanup (xfree, arg);
+ }
do
{
- char *name = dirname;
+ char *name = arg;
char *p;
struct stat st;
{
char *separator = NULL;
- char *space = NULL;
- char *tab = NULL;
+ /* Spaces and tabs will have been removed by buildargv().
+ The directories will there be split into a list but
+ each entry may still contain DIRNAME_SEPARATOR. */
if (parse_separators)
- {
- separator = strchr (name, DIRNAME_SEPARATOR);
- space = strchr (name, ' ');
- tab = strchr (name, '\t');
- }
+ separator = strchr (name, DIRNAME_SEPARATOR);
- if (separator == 0 && space == 0 && tab == 0)
- p = dirname = name + strlen (name);
+ if (separator == 0)
+ p = arg = name + strlen (name);
else
{
- p = 0;
- if (separator != 0 && (p == 0 || separator < p))
- p = separator;
- if (space != 0 && (p == 0 || space < p))
- p = space;
- if (tab != 0 && (p == 0 || tab < p))
- p = tab;
- dirname = p + 1;
- while (*dirname == DIRNAME_SEPARATOR
- || *dirname == ' '
- || *dirname == '\t')
- ++dirname;
+ p = separator;
+ arg = p + 1;
+ while (*arg == DIRNAME_SEPARATOR)
+ ++arg;
}
+
+ /* If there are no more directories in this argument then start
+ on the next argument next time round the loop (if any). */
+ if (*arg == '\0')
+ arg = parse_separators ? argv[++argv_index] : NULL;
}
- if (!(IS_DIR_SEPARATOR (*name) && p <= name + 1) /* "/" */
+ /* name is the start of the directory.
+ p is the separator (or null) following the end. */
+
+ while (!(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:/" */
+ && !(p == name + 3 && name[1] == ':') /* "d:/" */
#endif
- && IS_DIR_SEPARATOR (p[-1]))
+ && IS_DIR_SEPARATOR (p[-1]))
/* Sigh. "foo/" => "foo" */
--p;
*p = '\0';
@@ -479,10 +518,10 @@ add_path (char *dirname, char **which_path, int parse_separators)
name = tilde_expand (name);
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
else if (IS_ABSOLUTE_PATH (name) && p == name + 2) /* "d:" => "d:." */
- name = concat (name, ".", NULL);
+ name = concat (name, ".", (char *)NULL);
#endif
else if (!IS_ABSOLUTE_PATH (name) && name[0] != '$')
- name = concat (current_directory, SLASH_STRING, name, NULL);
+ name = concat (current_directory, SLASH_STRING, name, (char *)NULL);
else
name = savestring (name, p - name);
make_cleanup (xfree, name);
@@ -555,15 +594,16 @@ add_path (char *dirname, char **which_path, int parse_separators)
c = old[prefix];
old[prefix] = '\0';
- temp = concat (old, tinybuf, name, NULL);
+ temp = concat (old, tinybuf, name, (char *)NULL);
old[prefix] = c;
- *which_path = concat (temp, "", &old[prefix], NULL);
+ *which_path = concat (temp, "", &old[prefix], (char *)NULL);
prefix = strlen (temp);
xfree (temp);
}
else
{
- *which_path = concat (name, (old[0] ? tinybuf : old), old, NULL);
+ *which_path = concat (name, (old[0] ? tinybuf : old),
+ old, (char *)NULL);
prefix = strlen (name);
}
xfree (old);
@@ -572,7 +612,7 @@ add_path (char *dirname, char **which_path, int parse_separators)
}
skip_dup:;
}
- while (*dirname != '\0');
+ while (arg != NULL);
}
@@ -763,7 +803,7 @@ done:
char *f = concat (current_directory,
IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1])
? "" : SLASH_STRING,
- filename, NULL);
+ filename, (char *)NULL);
*filename_opened = xfullpath (f);
xfree (f);
}
@@ -801,6 +841,85 @@ source_full_path_of (char *filename, char **full_pathname)
return 1;
}
+/* Return non-zero if RULE matches PATH, that is if the rule can be
+ applied to PATH. */
+
+static int
+substitute_path_rule_matches (const struct substitute_path_rule *rule,
+ const char *path)
+{
+ const int from_len = strlen (rule->from);
+ const int path_len = strlen (path);
+ char *path_start;
+
+ if (path_len < from_len)
+ return 0;
+
+ /* The substitution rules are anchored at the start of the path,
+ so the path should start with rule->from. There is no filename
+ comparison routine, so we need to extract the first FROM_LEN
+ characters from PATH first and use that to do the comparison. */
+
+ path_start = alloca (from_len + 1);
+ strncpy (path_start, path, from_len);
+ path_start[from_len] = '\0';
+
+ if (FILENAME_CMP (path_start, rule->from) != 0)
+ return 0;
+
+ /* Make sure that the region in the path that matches the substitution
+ rule is immediately followed by a directory separator (or the end of
+ string character). */
+
+ if (path[from_len] != '\0' && !IS_DIR_SEPARATOR (path[from_len]))
+ return 0;
+
+ return 1;
+}
+
+/* Find the substitute-path rule that applies to PATH and return it.
+ Return NULL if no rule applies. */
+
+static struct substitute_path_rule *
+get_substitute_path_rule (const char *path)
+{
+ struct substitute_path_rule *rule = substitute_path_rules;
+
+ while (rule != NULL && !substitute_path_rule_matches (rule, path))
+ rule = rule->next;
+
+ return rule;
+}
+
+/* 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.
+
+ Return NULL if no substitution rule was specified by the user,
+ or if no rule applied to the given PATH. */
+
+static char *
+rewrite_source_path (const char *path)
+{
+ const struct substitute_path_rule *rule = get_substitute_path_rule (path);
+ char *new_path;
+ int from_len;
+
+ if (rule == NULL)
+ return NULL;
+
+ from_len = strlen (rule->from);
+
+ /* Compute the rewritten path and return it. */
+
+ new_path =
+ (char *) xmalloc (strlen (path) + 1 + strlen (rule->to) - from_len);
+ strcpy (new_path, rule->to);
+ strcat (new_path, path + from_len);
+
+ return new_path;
+}
+
/* 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
@@ -811,15 +930,19 @@ source_full_path_of (char *filename, char **full_pathname)
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.
+ Space for the path must have been malloc'd. If a path substitution
+ 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 )
FULLNAME is set to the absolute path to the file just opened.
+ The caller is responsible for freeing FULLNAME.
On Failure
- A non valid file descriptor is returned. ( the return value is negitive )
+ An invalid file descriptor is returned. ( the return value is negative )
FULLNAME is set to NULL. */
-int
+
+static int
find_and_open_source (struct objfile *objfile,
const char *filename,
const char *dirname,
@@ -830,8 +953,20 @@ find_and_open_source (struct objfile *objfile,
int result;
/* Quick way out if we already know its full name */
+
if (*fullname)
{
+ /* The user may have requested that source paths be rewritten
+ according to substitution rules he provided. If a substitution
+ rule applies to this path, then apply it. */
+ char *rewritten_fullname = rewrite_source_path (*fullname);
+
+ if (rewritten_fullname != NULL)
+ {
+ xfree (*fullname);
+ *fullname = rewritten_fullname;
+ }
+
result = open (*fullname, OPEN_MODE);
if (result >= 0)
return result;
@@ -842,6 +977,17 @@ find_and_open_source (struct objfile *objfile,
if (dirname != NULL)
{
+ /* If necessary, rewrite the compilation directory name according
+ to the source path substitution rules specified by the user. */
+
+ char *rewritten_dirname = rewrite_source_path (dirname);
+
+ if (rewritten_dirname != NULL)
+ {
+ make_cleanup (xfree, rewritten_dirname);
+ dirname = rewritten_dirname;
+ }
+
/* 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,
@@ -861,6 +1007,19 @@ find_and_open_source (struct objfile *objfile,
}
}
+ if (IS_ABSOLUTE_PATH (filename))
+ {
+ /* If filename is absolute path, try the source path
+ substitution on it. */
+ char *rewritten_filename = rewrite_source_path (filename);
+
+ if (rewritten_filename != NULL)
+ {
+ make_cleanup (xfree, rewritten_filename);
+ filename = rewritten_filename;
+ }
+ }
+
result = openp (path, OPF_SEARCH_IN_PATH, filename, OPEN_MODE, 0, fullname);
if (result < 0)
{
@@ -870,13 +1029,6 @@ find_and_open_source (struct objfile *objfile,
result = openp (path, OPF_SEARCH_IN_PATH, p, OPEN_MODE, 0, fullname);
}
- if (result >= 0)
- {
- char *tmp_fullname;
- tmp_fullname = *fullname;
- *fullname = xstrdup (tmp_fullname);
- xfree (tmp_fullname);
- }
return result;
}
@@ -897,11 +1049,11 @@ open_source_file (struct symtab *s)
/* Finds the fullname that a symtab represents.
- If this functions finds the fullname, it will save it in ps->fullname
+ If this functions finds the fullname, it will save it in s->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. */
+ NULL will be returned and s->fullname will be set to NULL. */
char *
symtab_to_fullname (struct symtab *s)
{
@@ -969,14 +1121,15 @@ find_source_lines (struct symtab *s, int desc)
long mtime = 0;
int size;
+ gdb_assert (s);
line_charpos = (int *) xmalloc (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);
+ if (s->objfile && s->objfile->obfd)
+ mtime = s->objfile->mtime;
else if (exec_bfd)
- mtime = bfd_get_mtime (exec_bfd);
+ mtime = exec_bfd_mtime;
if (mtime && mtime < st.st_mtime)
warning (_("Source file is more recent than executable."));
@@ -1271,7 +1424,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
}
/* Show source lines from the file of symtab S, starting with line
- number LINE and stopping before line number STOPLINE. If this is the
+ 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 */
@@ -1560,6 +1713,221 @@ reverse_search_command (char *regex, int from_tty)
fclose (stream);
return;
}
+
+/* If the last character of PATH is a directory separator, then strip it. */
+
+static void
+strip_trailing_directory_separator (char *path)
+{
+ const int last = strlen (path) - 1;
+
+ if (last < 0)
+ return; /* No stripping is needed if PATH is the empty string. */
+
+ if (IS_DIR_SEPARATOR (path[last]))
+ path[last] = '\0';
+}
+
+/* Return the path substitution rule that matches FROM.
+ Return NULL if no rule matches. */
+
+static struct substitute_path_rule *
+find_substitute_path_rule (const char *from)
+{
+ struct substitute_path_rule *rule = substitute_path_rules;
+
+ while (rule != NULL)
+ {
+ if (FILENAME_CMP (rule->from, from) == 0)
+ return rule;
+ rule = rule->next;
+ }
+
+ return NULL;
+}
+
+/* Add a new substitute-path rule at the end of the current list of rules.
+ The new rule will replace FROM into TO. */
+
+static void
+add_substitute_path_rule (char *from, char *to)
+{
+ struct substitute_path_rule *rule;
+ struct substitute_path_rule *new_rule;
+
+ new_rule = xmalloc (sizeof (struct substitute_path_rule));
+ new_rule->from = xstrdup (from);
+ new_rule->to = xstrdup (to);
+ new_rule->next = NULL;
+
+ /* If the list of rules are empty, then insert the new rule
+ at the head of the list. */
+
+ if (substitute_path_rules == NULL)
+ {
+ substitute_path_rules = new_rule;
+ return;
+ }
+
+ /* Otherwise, skip to the last rule in our list and then append
+ the new rule. */
+
+ rule = substitute_path_rules;
+ while (rule->next != NULL)
+ rule = rule->next;
+
+ rule->next = new_rule;
+}
+
+/* Remove the given source path substitution rule from the current list
+ of rules. The memory allocated for that rule is also deallocated. */
+
+static void
+delete_substitute_path_rule (struct substitute_path_rule *rule)
+{
+ if (rule == substitute_path_rules)
+ substitute_path_rules = rule->next;
+ else
+ {
+ struct substitute_path_rule *prev = substitute_path_rules;
+
+ while (prev != NULL && prev->next != rule)
+ prev = prev->next;
+
+ gdb_assert (prev != NULL);
+
+ prev->next = rule->next;
+ }
+
+ xfree (rule->from);
+ xfree (rule->to);
+ xfree (rule);
+}
+
+/* Implement the "show substitute-path" command. */
+
+static void
+show_substitute_path_command (char *args, int from_tty)
+{
+ struct substitute_path_rule *rule = substitute_path_rules;
+ char **argv;
+ char *from = NULL;
+
+ argv = buildargv (args);
+ make_cleanup_freeargv (argv);
+
+ /* We expect zero or one argument. */
+
+ if (argv != NULL && argv[0] != NULL && argv[1] != NULL)
+ error (_("Too many arguments in command"));
+
+ if (argv != NULL && argv[0] != NULL)
+ from = argv[0];
+
+ /* Print the substitution rules. */
+
+ if (from != NULL)
+ printf_filtered
+ (_("Source path substitution rule matching `%s':\n"), from);
+ else
+ printf_filtered (_("List of all source path substitution rules:\n"));
+
+ while (rule != NULL)
+ {
+ if (from == NULL || FILENAME_CMP (rule->from, from) == 0)
+ printf_filtered (" `%s' -> `%s'.\n", rule->from, rule->to);
+ rule = rule->next;
+ }
+}
+
+/* Implement the "unset substitute-path" command. */
+
+static void
+unset_substitute_path_command (char *args, int from_tty)
+{
+ struct substitute_path_rule *rule = substitute_path_rules;
+ char **argv = buildargv (args);
+ char *from = NULL;
+ int rule_found = 0;
+
+ /* This function takes either 0 or 1 argument. */
+
+ make_cleanup_freeargv (argv);
+ if (argv != NULL && argv[0] != NULL && argv[1] != NULL)
+ error (_("Incorrect usage, too many arguments in command"));
+
+ if (argv != NULL && argv[0] != NULL)
+ from = argv[0];
+
+ /* If the user asked for all the rules to be deleted, ask him
+ to confirm and give him a chance to abort before the action
+ is performed. */
+
+ if (from == NULL
+ && !query (_("Delete all source path substitution rules? ")))
+ error (_("Canceled"));
+
+ /* Delete the rule matching the argument. No argument means that
+ all rules should be deleted. */
+
+ while (rule != NULL)
+ {
+ struct substitute_path_rule *next = rule->next;
+
+ if (from == NULL || FILENAME_CMP (from, rule->from) == 0)
+ {
+ delete_substitute_path_rule (rule);
+ rule_found = 1;
+ }
+
+ rule = next;
+ }
+
+ /* If the user asked for a specific rule to be deleted but
+ we could not find it, then report an error. */
+
+ if (from != NULL && !rule_found)
+ error (_("No substitution rule defined for `%s'"), from);
+}
+
+/* Add a new source path substitution rule. */
+
+static void
+set_substitute_path_command (char *args, int from_tty)
+{
+ char *from_path, *to_path;
+ char **argv;
+ struct substitute_path_rule *rule;
+
+ argv = buildargv (args);
+ make_cleanup_freeargv (argv);
+
+ if (argv == NULL || argv[0] == NULL || argv [1] == NULL)
+ error (_("Incorrect usage, too few arguments in command"));
+
+ if (argv[2] != NULL)
+ error (_("Incorrect usage, too many arguments in command"));
+
+ if (*(argv[0]) == '\0')
+ error (_("First argument must be at least one character long"));
+
+ /* Strip any trailing directory separator character in either FROM
+ or TO. The substitution rule already implicitly contains them. */
+ strip_trailing_directory_separator (argv[0]);
+ strip_trailing_directory_separator (argv[1]);
+
+ /* If a rule with the same "from" was previously defined, then
+ delete it. This new rule replaces it. */
+
+ rule = find_substitute_path_rule (argv[0]);
+ if (rule != NULL)
+ delete_substitute_path_rule (rule);
+
+ /* Insert the new substitution rule. */
+
+ add_substitute_path_rule (argv[0], argv[1]);
+}
+
void
_initialize_source (void)
@@ -1633,10 +2001,33 @@ The matching line number is also stored as the value of \"$_\"."));
add_com_alias ("?", "reverse-search", class_files, 0);
}
- 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.",
- &setlist),
- &showlist);
+ add_setshow_integer_cmd ("listsize", class_support, &lines_to_list, _("\
+Set number of source lines gdb will list by default."), _("\
+Show number of source lines gdb will list by default."), NULL,
+ NULL,
+ show_lines_to_list,
+ &setlist, &showlist);
+
+ add_cmd ("substitute-path", class_files, set_substitute_path_command,
+ _("\
+Usage: set substitute-path FROM TO\n\
+Add a substitution rule replacing FROM into TO in source file names.\n\
+If a substitution rule was previously set for FROM, the old rule\n\
+is replaced by the new one."),
+ &setlist);
+
+ add_cmd ("substitute-path", class_files, unset_substitute_path_command,
+ _("\
+Usage: unset substitute-path [FROM]\n\
+Delete the rule for substituting FROM in source file names. If FROM\n\
+is not specified, all substituting rules are deleted.\n\
+If the debugger cannot find a rule for FROM, it will display a warning."),
+ &unsetlist);
+
+ add_cmd ("substitute-path", class_files, show_substitute_path_command,
+ _("\
+Usage: show substitute-path [FROM]\n\
+Print the rule for substituting FROM in source file names. If FROM\n\
+is not specified, print all substitution rules."),
+ &showlist);
}