diff options
author | Brad Mouring <bmouring@ni.com> | 2014-06-02 15:55:10 -0500 |
---|---|---|
committer | Joel Brobecker <brobecker@adacore.com> | 2014-06-03 07:17:06 -0700 |
commit | 1e2ccb612d2b61014bb7e9fef3eb58e4947b9d2b (patch) | |
tree | 4a997dd7f3d394dc1980351c2a9c6abad0dc353b /gdb/source.c | |
parent | c6ec5ab23a17b972c7c78ac66f3685b57db74946 (diff) | |
download | gdb-1e2ccb612d2b61014bb7e9fef3eb58e4947b9d2b.zip gdb-1e2ccb612d2b61014bb7e9fef3eb58e4947b9d2b.tar.gz gdb-1e2ccb612d2b61014bb7e9fef3eb58e4947b9d2b.tar.bz2 |
gdb/source.c: Fix matching path substitute rule listing
The check for the source (or "from") directory snippet in listing
matching path substitution rules currently will not match anything
other than a direct match of the "from" field in a substitution rule,
resulting in the incorrect behavior below:
...
(gdb) set substitute-path /a/path /another/path
(gdb) show substitute-path
List of all source path substitution rules:
`/a/path' -> `/another/path'.
(gdb) show substitute-path /a/path/to/a/file.ext
Source path substitution rule matching `/a/path/to/a/file.ext':
(gdb) show substitute-path /a/path
Source path substitution rule matching `/a/path':
`/a/path' -> `/another/path'.
...
This change effects the following behavior by (sanely) checking
with the length of the "from" portion of a rule and ensuring that
the next character of the path considered for substitution is a path
delimiter (or NULL). With this change, the following behavior is
garnered:
...
(gdb) set substitute-path /a/path /another/path
(gdb) show substitute-path
List of all source path substitution rules:
`/a/path' -> `/another/path'.
(gdb) show substitute-path /a/path/to/a/file.ext
Source path substitution rule matching `/a/path/to/a/file.ext':
`/a/path' -> `/another/path'.
(gdb) show substitute-path /a/pathological/case/that/should/fail.err
Source path substitution rule matching `/a/pathological/case/that/should/fail.err':
(gdb)
Also included is a couple of tests added to subst.exp to verify
this behavior in the test suite.
gdb/ChangeLog:
* source.c (show_substitute_path_command): Fix display of matching
substitution rules.
gdb/testsuite/ChangeLog:
* gdb.ada/subst.exp: Add tests to verify partial path matching
output.
This was tested on x86_64 Linux.
Diffstat (limited to 'gdb/source.c')
-rw-r--r-- | gdb/source.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/source.c b/gdb/source.c index c985a1b..14b1f71 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1890,7 +1890,7 @@ show_substitute_path_command (char *args, int from_tty) while (rule != NULL) { - if (from == NULL || FILENAME_CMP (rule->from, from) == 0) + if (from == NULL || substitute_path_rule_matches (rule, from) != 0) printf_filtered (" `%s' -> `%s'.\n", rule->from, rule->to); rule = rule->next; } |