darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gdb/source.c: Fix matching path substitute rule listing

Browse source 
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.
This commit is contained in:
Brad Mouring 2014-06-02 15:55:10 -05:00 committed by Joel Brobecker
parent c6ec5ab23a
commit 1e2ccb612d
4 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2014-06-03 Brad Mouring <bmouring@ni.com> (tiny patch)
Pushed by Joel Brobecker <brobecker@adacore.com>
* source.c (show_substitute_path_command): Fix display of matching
substitution rules.
2014-06-03 Gary Benson <gbenson@redhat.com>
* gnu-v2-abi.c (gnuv2_value_rtti_type): Use gdb_demangle.

2
gdb/source.c
View file

@ -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;
}

5
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2014-06-03 Brad Mouring <bmouring@ni.com> (tiny patch)
* gdb.base/subst.exp: Add tests to verify partial path matching
output.
2014-06-03 Pedro Alves <palves@redhat.com>
* gdb.base/sss-bp-on-user-bp-2.exp: Skip if testing with a remote

8
gdb/testsuite/gdb.base/subst.exp
View file

@ -95,6 +95,14 @@ gdb_test "show substitute-path depuis" \
"Source path substitution rule matching `depuis':\r\n +`depuis' -> `vers'." \
"show substitute-path depuis, after all paths added"
gdb_test "show substitute-path from/path" \
"Source path substitution rule matching `from/path':\r\n +`from' -> `to'." \
"show substitute-path from/path, after all paths added"
gdb_test "show substitute-path from_a_bad_path" \
"Source path substitution rule matching `from_a_bad_path':" \
"show substitute-path from_a_bad_path, after all paths added"
gdb_test "show substitute-path garbage" \
"Source path substitution rule matching `garbage':" \
"show substitute-path garbage, after all paths added"