From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 51471 invoked by alias); 3 May 2017 22:46:36 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 51407 invoked by uid 89); 3 May 2017 22:46:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gproxy3.mail.unifiedlayer.com Received: from gproxy3-pub.mail.unifiedlayer.com (HELO gproxy3.mail.unifiedlayer.com) (69.89.30.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 03 May 2017 22:46:32 +0000 Received: from cmgw3 (unknown [10.0.90.84]) by gproxy3.mail.unifiedlayer.com (Postfix) with ESMTP id E4F51401B1 for ; Wed, 3 May 2017 16:46:33 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id FymW1v00U2f2jeq01ymZGm; Wed, 03 May 2017 16:46:33 -0600 X-Authority-Analysis: v=2.2 cv=VKStp5HX c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=tJ8p9aeEuA8A:10 a=zstS-IiYAAAA:8 a=iKfbv_KB8t5Oxpn3sRIA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-63-71.hlrn.qwest.net ([75.166.63.71]:53090 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1d632U-00051x-Ln; Wed, 03 May 2017 16:46:30 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 03/23] Use gdb_file_up in find_and_open_script Date: Wed, 03 May 2017 22:46:00 -0000 Message-Id: <20170503224626.2818-4-tom@tromey.com> In-Reply-To: <20170503224626.2818-1-tom@tromey.com> References: <20170503224626.2818-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1d632U-00051x-Ln X-Source-Sender: 75-166-63-71.hlrn.qwest.net (bapiya.Home) [75.166.63.71]:53090 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-SW-Source: 2017-05/txt/msg00075.txt.bz2 This changes find_and_open_script to return a gdb_file_up. The result is also used to indicate whether the function succeeded, so the patch also removes the "streamp" argument; and finally, the type of the "full_path" argument is changed to remove more cleanups from the callers. ChangeLog 2017-05-02 Tom Tromey * cli/cli-cmds.c (find_and_open_script): Return gdb_file_p. Remove "streamp" argument. Change "full_path" to a unique_xmalloc_ptr. (source_script_with_search): Update. * auto-load.c (source_script_file): Update. * cli/cli-cmds.h (find_and_open_script): Change type. --- gdb/ChangeLog | 9 +++++++++ gdb/auto-load.c | 32 ++++++++++++++------------------ gdb/cli/cli-cmds.c | 35 +++++++++++++++-------------------- gdb/cli/cli-cmds.h | 7 +++++-- 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2bda6ff..76c53be 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2017-05-02 Tom Tromey + * cli/cli-cmds.c (find_and_open_script): Return gdb_file_p. + Remove "streamp" argument. Change "full_path" to a + unique_xmalloc_ptr. + (source_script_with_search): Update. + * auto-load.c (source_script_file): Update. + * cli/cli-cmds.h (find_and_open_script): Change type. + +2017-05-02 Tom Tromey + * xml-support.c (xml_fetch_content_from_file): Update. * ui-file.c (stdio_file::open): Update. * tracefile-tfile.c (tfile_start): Update. diff --git a/gdb/auto-load.c b/gdb/auto-load.c index 292f2ae..dc1bb5d 100644 --- a/gdb/auto-load.c +++ b/gdb/auto-load.c @@ -928,10 +928,7 @@ source_script_file (struct auto_load_pspace_info *pspace_info, const char *section_name, unsigned int offset, const char *file) { - FILE *stream; - char *full_path; - int opened, in_hash_table; - struct cleanup *cleanups; + int opened = 0, in_hash_table; objfile_script_sourcer_func *sourcer; /* Skip this script if support is not compiled in. */ @@ -953,26 +950,27 @@ source_script_file (struct auto_load_pspace_info *pspace_info, return; } - opened = find_and_open_script (file, 1 /*search_path*/, - &stream, &full_path); + gdb::unique_xmalloc_ptr full_path; + gdb_file_up stream = find_and_open_script (file, 1 /*search_path*/, + &full_path); + const char *path_ptr = full_path.get (); - cleanups = make_cleanup (null_cleanup, NULL); - if (opened) + if (stream) { - make_cleanup_fclose (stream); - make_cleanup (xfree, full_path); - - if (!file_is_auto_load_safe (full_path, + if (!file_is_auto_load_safe (full_path.get (), _("auto-load: Loading %s script " "\"%s\" from section \"%s\" of " "objfile \"%s\".\n"), - ext_lang_name (language), full_path, + ext_lang_name (language), + full_path.get (), section_name, objfile_name (objfile))) opened = 0; + else + opened = 1; } else { - full_path = NULL; + path_ptr = NULL; /* If one script isn't found it's not uncommon for more to not be found either. We don't want to print a message for each script, @@ -986,14 +984,12 @@ source_script_file (struct auto_load_pspace_info *pspace_info, section_name, offset); } - in_hash_table = maybe_add_script_file (pspace_info, opened, file, full_path, + in_hash_table = maybe_add_script_file (pspace_info, opened, file, path_ptr, language); /* If this file is not currently loaded, load it. */ if (opened && !in_hash_table) - sourcer (language, objfile, stream, full_path); - - do_cleanups (cleanups); + sourcer (language, objfile, stream.get (), path_ptr); } /* Subroutine of source_section_scripts to simplify it. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 2a5b128..c75dd16 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -495,17 +495,16 @@ show_script_ext_mode (struct ui_file *file, int from_tty, /* Try to open SCRIPT_FILE. If successful, the full path name is stored in *FULL_PATHP, - the stream is stored in *STREAMP, and return 1. - The caller is responsible for freeing *FULL_PATHP. - If not successful, return 0; errno is set for the last file + and the stream is returned. + If not successful, return NULL; errno is set for the last file we tried to open. If SEARCH_PATH is non-zero, and the file isn't found in cwd, search for it in the source search path. */ -int +gdb_file_up find_and_open_script (const char *script_file, int search_path, - FILE **streamp, char **full_pathp) + gdb::unique_xmalloc_ptr *full_pathp) { char *file; int fd; @@ -520,8 +519,10 @@ find_and_open_script (const char *script_file, int search_path, /* Search for and open 'file' on the search path used for source files. Put the full location in *FULL_PATHP. */ + char *temp_path; fd = openp (source_path, search_flags, - file, O_RDONLY, full_pathp); + file, O_RDONLY, &temp_path); + full_pathp->reset (temp_path); if (fd == -1) { @@ -533,19 +534,16 @@ find_and_open_script (const char *script_file, int search_path, do_cleanups (old_cleanups); - *streamp = fdopen (fd, FOPEN_RT); - if (*streamp == NULL) + FILE *result = fdopen (fd, FOPEN_RT); + if (result == NULL) { int save_errno = errno; close (fd); - if (full_pathp) - xfree (*full_pathp); errno = save_errno; - return 0; } - return 1; + return gdb_file_up (result); } /* Load script FILE, which has already been opened as STREAM. @@ -596,14 +594,13 @@ source_script_from_stream (FILE *stream, const char *file, static void source_script_with_search (const char *file, int from_tty, int search_path) { - FILE *stream; - char *full_path; - struct cleanup *old_cleanups; if (file == NULL || *file == 0) error (_("source command requires file name of file to source.")); - if (!find_and_open_script (file, search_path, &stream, &full_path)) + gdb::unique_xmalloc_ptr full_path; + gdb_file_up stream = find_and_open_script (file, search_path, &full_path); + if (!stream) { /* The script wasn't found, or was otherwise inaccessible. If the source command was invoked interactively, throw an @@ -618,15 +615,13 @@ source_script_with_search (const char *file, int from_tty, int search_path) } } - old_cleanups = make_cleanup (xfree, full_path); - make_cleanup_fclose (stream); /* The python support reopens the file, so we need to pass full_path here in case the file was found on the search path. It's useful to do this 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 (stream, file, search_path ? full_path : file); - do_cleanups (old_cleanups); + source_script_from_stream (stream.get (), file, + search_path ? full_path.get () : file); } /* Wrapper around source_script_with_search to export it to main.c diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h index 7ff1fca..6e3b3d9 100644 --- a/gdb/cli/cli-cmds.h +++ b/gdb/cli/cli-cmds.h @@ -17,6 +17,8 @@ #if !defined (CLI_CMDS_H) #define CLI_CMDS_H 1 +#include "common/filestuff.h" + /* Chain containing all defined commands. */ extern struct cmd_list_element *cmdlist; @@ -117,8 +119,9 @@ extern void source_script (const char *, int); /* Exported to objfiles.c. */ -extern int find_and_open_script (const char *file, int search_path, - FILE **streamp, char **full_path); +extern gdb_file_up + find_and_open_script (const char *file, int search_path, + gdb::unique_xmalloc_ptr *full_path); /* Command tracing state. */ -- 2.9.3