From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6852 invoked by alias); 23 Jan 2006 17:41:59 -0000 Received: (qmail 6843 invoked by uid 22791); 23 Jan 2006 17:41:58 -0000 X-Spam-Check-By: sourceware.org Received: from fra-del-02.spheriq.net (HELO fra-del-02.spheriq.net) (195.46.51.98) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 23 Jan 2006 17:41:53 +0000 Received: from fra-out-03.spheriq.net (fra-out-03.spheriq.net [195.46.51.131]) by fra-del-02.spheriq.net with ESMTP id k0NHfcQY024200 for ; Mon, 23 Jan 2006 17:41:38 GMT Received: from fra-cus-02.spheriq.net (fra-cus-02.spheriq.net [195.46.51.38]) by fra-out-03.spheriq.net with ESMTP id k0NHfcfp027434 for ; Mon, 23 Jan 2006 17:41:38 GMT Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by fra-cus-02.spheriq.net with ESMTP id k0NHfZSG022561 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK) for ; Mon, 23 Jan 2006 17:41:37 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 B8433DA44 for ; Mon, 23 Jan 2006 17:41:31 +0000 (GMT) Received: from mail1.bri.st.com (mail1.bri.st.com [164.129.8.218]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 83F37474B0 for ; Mon, 23 Jan 2006 17:45:02 +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 CHD84293 (AUTH stubbsa); Mon, 23 Jan 2006 17:41:30 GMT Message-ID: <43D514C8.5010808@st.com> Date: Mon, 23 Jan 2006 17:41:00 -0000 From: Andrew STUBBS User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 Cc: gdb-patches@sourceware.org Subject: Re: [PATCH] Use search path for scripts References: <437B6718.7070300@st.com> <437C6D69.1030209@st.com> <437DC94B.7060601@st.com> <437DE8F9.9030606@st.com> <43C5584C.3050708@st.com> <20060122204015.GD27224@nevyn.them.org> <43D503C8.80001@st.com> In-Reply-To: <43D503C8.80001@st.com> Content-Type: multipart/mixed; boundary="------------080408000109040509050006" 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.2.0 X-IsSubscribed: yes 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: 2006-01/txt/msg00334.txt.bz2 This is a multi-part message in MIME format. --------------080408000109040509050006 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 238 Andrew Stubbs wrote: > Daniel Jacobowitz wrote: >> The patch is OK as-is. Thanks. > > Thanks, committed. I should probably post the final patch since I had to modify it slightly to apply cleanly to the updated tree. Attached Andrew --------------080408000109040509050006 Content-Type: text/plain; name="search-path.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="search-path.patch" Content-length: 3282 2006-01-23 Andrew Stubbs * cli/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 2006-01-23 15:54:23.000000000 +0000 +++ src/gdb/cli/cli-cmds.c 2006-01-23 15:56:11.000000000 +0000 @@ -51,6 +51,8 @@ #include "tui/tui.h" /* For tui_active et.al. */ #endif +#include + /* Prototypes for local command functions */ static void complete_command (char *, int); @@ -427,6 +429,8 @@ source_command (char *args, int from_tty FILE *stream; struct cleanup *old_cleanups; char *file = args; + char *full_pathname = NULL; + int fd; if (file == NULL) { @@ -436,8 +440,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) { if (from_tty) perror_with_name (file); @@ -445,6 +459,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 2006-01-23 15:54:24.000000000 +0000 +++ src/gdb/doc/gdb.texinfo 2006-01-23 15:57:28.000000000 +0000 @@ -950,7 +950,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 @@ -5018,6 +5018,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{} @@ -16210,6 +16213,9 @@ unless the order of execution is changed 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). + Commands that would ask for confirmation if used interactively proceed without asking when used in a command file. Many @value{GDBN} commands that normally print messages to say what they are doing omit the messages --------------080408000109040509050006--