diff options
author | Andrew Burgess <andrew.burgess@embecosm.com> | 2021-05-05 16:50:17 +0100 |
---|---|---|
committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2021-05-07 22:20:47 +0100 |
commit | 1845e254645efbc02248345ccdb557d265dd8ae1 (patch) | |
tree | f0edd8445b6289107098a9807c1a51dcf4650271 /gdb/cli | |
parent | a3237c7cc7de4b3ea44d8874a0c90dff1f4d31dc (diff) | |
download | gdb-1845e254645efbc02248345ccdb557d265dd8ae1.zip gdb-1845e254645efbc02248345ccdb557d265dd8ae1.tar.gz gdb-1845e254645efbc02248345ccdb557d265dd8ae1.tar.bz2 |
gdb/guile: perform tilde expansion when sourcing guile scripts
Before this patch:
(gdb) source ~/script.scm
ERROR: In procedure apply-smob/1:
ERROR: In procedure primitive-load-path: Unable to find file "~/script.scm" in load path
Error while executing Scheme code.
(gdb)
This is because the path is not tilde expanded. In contrast, when
sourcing a .py or .gdb script the path is tilde expanded.
This commit fixes this oversight, and allows the above source command
to work as expected.
The tilde expansion is done in the generic GDB code before we call the
sourcer function for any particular extension language.
gdb/ChangeLog:
* cli/cli-cmds.c: Add 'gdbsupport/gdb_tilde_expand.h'
include.
(source_script_with_search): Perform tilde expansion.
gdb/testsuite/ChangeLog:
* gdb.guile/guile.exp: Add an extra test.
Diffstat (limited to 'gdb/cli')
-rw-r--r-- | gdb/cli/cli-cmds.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 68ef92e..62948f5 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -54,6 +54,7 @@ #include "extension.h" #include "gdbsupport/pathstuff.h" +#include "gdbsupport/gdb_tilde_expand.h" #ifdef TUI #include "tui/tui.h" /* For tui_active et.al. */ @@ -737,8 +738,16 @@ source_script_with_search (const char *file, int from_tty, int search_path) anyway so that error messages show the actual file used. But only do this if we (may have) used search_path, as printing the full path in errors for the non-search case can be more noise than signal. */ - source_script_from_stream (opened->stream.get (), file, - search_path ? opened->full_path.get () : file); + const char *file_to_open; + gdb::unique_xmalloc_ptr<char> tilde_expanded_file; + if (search_path) + file_to_open = opened->full_path.get (); + else + { + tilde_expanded_file = gdb_tilde_expand_up (file); + file_to_open = tilde_expanded_file.get (); + } + source_script_from_stream (opened->stream.get (), file, file_to_open); } /* Wrapper around source_script_with_search to export it to main.c |