This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] gdb/source.c: Fix matching path substitute rule listing
- From: "Brad Mouring" <bmouring at ni dot com>
- To: gdb-patches at sourceware dot org
- Cc: brobecker at adacore dot com, Brad Mouring <brad dot mouring at ni dot com>
- Date: Mon, 2 Jun 2014 15:55:10 -0500
- Subject: [PATCH] gdb/source.c: Fix matching path substitute rule listing
- Authentication-results: sourceware.org; auth=none
- References: <20140602204518 dot GL4289 at adacore dot com>
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.
This was tested on x86_64 Linux 3.0.0-21
gdb/ChangeLog:
* source.c (show_substitute_path_command): Fix display of matching
substitution rules
gdb/testsuite/ChangeLog:
* subst.exp: Add tests to verify partial path matching output
---
gdb/source.c | 2 +-
gdb/testsuite/gdb.base/subst.exp | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/gdb/source.c b/gdb/source.c
index c112765..282acb5 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1879,7 +1879,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;
}
diff --git a/gdb/testsuite/gdb.base/subst.exp b/gdb/testsuite/gdb.base/subst.exp
index e132809..e99735b 100644
--- a/gdb/testsuite/gdb.base/subst.exp
+++ b/gdb/testsuite/gdb.base/subst.exp
@@ -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"
--
1.8.3-rc3