From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3096 invoked by alias); 23 Apr 2015 21:22:21 -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 3078 invoked by uid 89); 23 Apr 2015 21:22:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 23 Apr 2015 21:22:19 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3NLMGnt012498 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 Apr 2015 17:22:16 -0400 Received: from blade.nx (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3NLMFPS022858; Thu, 23 Apr 2015 17:22:15 -0400 Received: by blade.nx (Postfix, from userid 1000) id B3E12263C57; Thu, 23 Apr 2015 22:22:14 +0100 (BST) Date: Thu, 23 Apr 2015 21:22:00 -0000 From: Gary Benson To: gdb-patches@sourceware.org Cc: Doug Evans Subject: [PING][PATCH v2] Do not manipulate "target:" filenames as local paths Message-ID: <20150423212214.GA15932@blade.nx> References: <20150414114129.GB4660@blade.nx> <1429085001-25894-1-git-send-email-gbenson@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1429085001-25894-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes X-SW-Source: 2015-04/txt/msg00917.txt.bz2 Ping: https://sourceware.org/ml/gdb-patches/2015-04/msg00547.html Gary Benson wrote: > Hi all, > > This patch alters two places that manipulate object file filenames > to detect "target:" filenames and to not attempt to manipulate them > as paths on the local filesystem: > > - allocate_objfile is updated to not attempt to expand "target:" > filenames with gdb_abspath. > > - load_auto_scripts_for_objfile is updated to not attempt to load > auto-load scripts for object files with "target:" filenames. > > Built and regtested on RHEL6.6 x86_64. > > Ok to commit? > > Cheers, > Gary > > > gdb/ChangeLog: > > * objfiles.c (allocate_objfile): Do not attempt to expand name > if name is a "target:" filename. > * auto-load.c (load_auto_scripts_for_objfile): Do not attempt > to load auto-load scripts for objfiles with "target:" filenames. > --- > gdb/ChangeLog | 7 +++++++ > gdb/auto-load.c | 7 +++++-- > gdb/objfiles.c | 3 ++- > 3 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/gdb/auto-load.c b/gdb/auto-load.c > index 778eeb6..7da288f 100644 > --- a/gdb/auto-load.c > +++ b/gdb/auto-load.c > @@ -1195,8 +1195,11 @@ load_auto_scripts_for_objfile (struct objfile *objfile) > { > /* Return immediately if auto-loading has been globally disabled. > This is to handle sequencing of operations during gdb startup. > - Also return immediately if OBJFILE is not actually a file. */ > - if (!global_auto_load || (objfile->flags & OBJF_NOT_FILENAME) != 0) > + Also return immediately if OBJFILE was not created from a file > + on the local filesystem. */ > + if (!global_auto_load > + || (objfile->flags & OBJF_NOT_FILENAME) != 0 > + || is_target_filename (objfile->original_name)) > return; > > /* Load any extension language scripts for this objfile. > diff --git a/gdb/objfiles.c b/gdb/objfiles.c > index ff20bc8..c6f9f00 100644 > --- a/gdb/objfiles.c > +++ b/gdb/objfiles.c > @@ -301,7 +301,8 @@ allocate_objfile (bfd *abfd, const char *name, int flags) > gdb_assert ((flags & OBJF_NOT_FILENAME) != 0); > expanded_name = xstrdup ("<>"); > } > - else if ((flags & OBJF_NOT_FILENAME) != 0) > + else if ((flags & OBJF_NOT_FILENAME) != 0 > + || is_target_filename (name)) > expanded_name = xstrdup (name); > else > expanded_name = gdb_abspath (name); > -- > 1.7.1 > -- http://gbenson.net/