Eli Zaretskii wrote:
+ stream = fdopen (fd, "r");
^^^
Shouldn't this be FOPEN_RT, like what was used in the call to fopen in
the original code?
Quite so. I don't know where that came from.
Update attached.
Andrew Stubbs
------------------------------------------------------------------------
2005-11-17 Andrew Stubbs <andrew.stubbs@st.com>
* cli-cmds.c: Include fcntl.h.
(source_command): Use the GDB search path to find script files.
doc/
* gdb.texinfo (Choosing files): Mention that -directory is used
for script files.
(Specifying source directories): Likewise.
(Command files): Explain how script files are found.
Index: src/gdb/cli/cli-cmds.c
===================================================================
--- src.orig/gdb/cli/cli-cmds.c 2005-11-18 11:22:08.000000000 +0000
+++ src/gdb/cli/cli-cmds.c 2005-11-18 14:43:08.000000000 +0000
@@ -50,6 +50,8 @@
#include "tui/tui.h" /* For tui_active et.al. */
#endif
+#include <fcntl.h>
+
/* Prototypes for local command functions */
static void complete_command (char *, int);
@@ -433,6 +435,8 @@ source_command (char *args, int from_tty
char *file = args;
char *minusv=NULL;
int old_source_verbose = source_verbose;
+ char *full_pathname = NULL;
+ int fd;
/* -v causes the source command to run in verbose mode.
We still have to be able to handle filenames with spaces. */
@@ -486,8 +490,18 @@ source_command (char *args, int from_tty
file = tilde_expand (file);
old_cleanups = make_cleanup (xfree, file);
- stream = fopen (file, FOPEN_RT);
- if (!stream)
+ /* Search for and open 'file' on the search path used for source
+ files. Put the full location in 'full_pathname'. */
+ fd = openp (source_path, OPF_TRY_CWD_FIRST,
+ file, O_RDONLY, 0, &full_pathname);
+
+ /* Use the full path name, if it is found. */
+ if (full_pathname != NULL && fd != -1)
+ {
+ file = full_pathname;
+ }
+
+ if (fd == -1)
{
source_verbose = old_source_verbose;
if (from_tty)
@@ -496,6 +510,7 @@ source_command (char *args, int from_tty
return;
}
+ stream = fdopen (fd, FOPEN_RT);
script_from_file (stream, file);
do_cleanups (old_cleanups);
Index: src/gdb/doc/gdb.texinfo
===================================================================
--- src.orig/gdb/doc/gdb.texinfo 2005-11-18 11:22:09.000000000 +0000
+++ src/gdb/doc/gdb.texinfo 2005-11-18 12:31:33.000000000 +0000
@@ -951,7 +951,7 @@ also be interleaved with @samp{-command}
@itemx -d @var{directory}
@cindex @code{--directory}
@cindex @code{-d}
-Add @var{directory} to the path to search for source files.
+Add @var{directory} to the path to search for source and script files.
@item -r
@itemx -readnow
@@ -4830,6 +4830,9 @@ When you start @value{GDBN}, its source
and @samp{cwd}, in that order.
To add other directories, use the @code{directory} command.
+The search path is used to find both program source files and @value{GDBN}
+script files (read using the @samp{-command} option and @samp{source} command).
+
@table @code
@item directory @var{dirname} @dots{}
@item dir @var{dirname} @dots{}
@@ -15997,6 +16000,9 @@ The lines in a command file are executed
printed as they are executed. An error in any command terminates
execution of the command file and control is returned to the console.
+@value{GDBN} searches for @var{filename} in the current directory and then
+on the search path (specified with the @samp{directory} command).
+
If @code{-v}, for verbose mode, is given then each command will
be displayed as it is executed. The option may be given before or after
@var{filename}, but will be interpreted as part of the filename anywhere else.