From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31172 invoked by alias); 18 Nov 2005 14:53:04 -0000 Received: (qmail 31152 invoked by uid 22791); 18 Nov 2005 14:53:01 -0000 Received: from lon-del-01.spheriq.net (HELO lon-del-01.spheriq.net) (195.46.50.97) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Fri, 18 Nov 2005 14:53:01 +0000 Received: from lon-out-01.spheriq.net ([195.46.50.129]) by lon-del-01.spheriq.net with ESMTP id jAIEqUo4027619 for ; Fri, 18 Nov 2005 14:52:39 GMT Received: from lon-cus-02.spheriq.net (lon-cus-02.spheriq.net [195.46.50.38]) by lon-out-01.spheriq.net with ESMTP id jAIEqT5h010725 for ; Fri, 18 Nov 2005 14:52:30 GMT Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by lon-cus-02.spheriq.net with ESMTP id jAIEqSL3009597 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK); Fri, 18 Nov 2005 14:52:28 GMT Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id AA111DB05; Fri, 18 Nov 2005 14:47:54 +0000 (GMT) Received: by zeta.dmz-eu.st.com (STMicroelectronics, from userid 60012) id 366E947429; Fri, 18 Nov 2005 14:50:54 +0000 (GMT) Received: from zeta.dmz-eu.st.com (localhost [127.0.0.1]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 09A8F759B0; Fri, 18 Nov 2005 14:50:53 +0000 (UTC) Received: from mail1.bri.st.com (mail1.bri.st.com [164.129.8.218]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 80F6E47367; Fri, 18 Nov 2005 14:50:52 +0000 (GMT) Received: from [164.129.15.13] (terrorhawk.bri.st.com [164.129.15.13]) by mail1.bri.st.com (MOS 3.5.8-GR) with ESMTP id CGZ54553 (AUTH "andrew stubbs"); Fri, 18 Nov 2005 14:47:50 GMT Message-ID: <437DE8F9.9030606@st.com> Date: Fri, 18 Nov 2005 15:54:00 -0000 From: Andrew STUBBS User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317) MIME-Version: 1.0 To: Eli Zaretskii Cc: gdb-patches@sources.redhat.com Subject: Re: [PATCH] Use search path for scripts References: <437B6718.7070300@st.com> <437C6D69.1030209@st.com> <437DC94B.7060601@st.com> In-Reply-To: Content-Type: multipart/mixed; boundary="------------040200090600010608040808" X-O-Spoofed: Not Scanned X-O-General-Status: No X-O-Spam1-Status: Not Scanned X-O-Spam2-Status: Not Scanned X-O-URL-Status: Not Scanned X-O-Virus1-Status: No X-O-Virus2-Status: Not Scanned X-O-Virus3-Status: No X-O-Virus4-Status: No X-O-Virus5-Status: Not Scanned X-O-Image-Status: Not Scanned X-O-Attach-Status: Not Scanned X-SpheriQ-Ver: 4.1.07 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2005-11/txt/msg00330.txt.bz2 This is a multi-part message in MIME format. --------------040200090600010608040808 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 261 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 --------------040200090600010608040808 Content-Type: text/plain; name="search-path.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="search-path.patch" Content-length: 3409 2005-11-17 Andrew Stubbs * 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 + /* 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. --------------040200090600010608040808--