From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20817 invoked by alias); 15 Oct 2013 15:10:25 -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 20803 invoked by uid 89); 15 Oct 2013 15:10:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.4 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS 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 ESMTP; Tue, 15 Oct 2013 15:10:24 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9FFAJ8M016680 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Oct 2013 11:10:20 -0400 Received: from host2.jankratochvil.net (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9FFAFes001293 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 15 Oct 2013 11:10:18 -0400 Date: Tue, 15 Oct 2013 15:10:00 -0000 From: Jan Kratochvil To: Luis Machado Cc: "'gdb-patches@sourceware.org'" Subject: Re: [PATCH] Fix calling gcore when gdb is not in $PATH. Message-ID: <20131015151015.GA7805@host2.jankratochvil.net> References: <525806C8.8040108@codesourcery.com> <20131011143145.GA1517@host2.jankratochvil.net> <52580F4B.8050306@codesourcery.com> <52582B57.8090006@codesourcery.com> <20131011165622.GA20960@host2.jankratochvil.net> <52583B08.3010907@codesourcery.com> <20131011181008.GA2115@host2.jankratochvil.net> <525841CD.8070506@codesourcery.com> <20131011190020.GA13493@host2.jankratochvil.net> <525BE269.9070907@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <525BE269.9070907@codesourcery.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00457.txt.bz2 On Mon, 14 Oct 2013 14:24:09 +0200, Luis Machado wrote: > --- a/gdb/gcore.in > +++ b/gdb/gcore.in > @@ -43,6 +43,40 @@ then > shift; shift > fi > > +# Attempt to fetch the absolute path to the gcore script that was > +# called. > +binary_path=`dirname "$0"` > + > +if test "x$binary_path" = x. ; then I find this test needlessly complicating the code a bit as it is true for both "sh gcore" and for "./gcore" while the conditionalized block of code is needed only in the "sh gcore" case. I was proposing a different test before. But it works even for the "./gcore" execution case so technically it is correct. > + # We got "." back as a path. This means the user executed > + # the gcore script locally (i.e. ./gcore) or called the > + # script via a shell interpreter (i.e. sh gcore). > + binary_basename=`basename "$0"` > + > + # If the gcore script was called like "sh gcore" and the script > + # lives in the current directory, "which" will not give us "gcore". > + # So first we check if the script is in the current directory > + # before using the output "which". > + if test -f "$binary_basename" ; then > + # We have a local gcore script in ".". This covers the case of > + # doing "./gcore" or "sh gcore". > + binary_path="." > + else > + # The gcore script was not found in ".", which means the script > + # was called from somewhere else in $PATH. Extract the correct # was called from somewhere else in $PATH by "sh gcore". [...] > + # path now. > + binary_path_from_env=`which "$0"` > + binary_path=`dirname "$binary_path_from_env"` > + fi > +fi > + > +# Check if the GDB binary is in the expected path. If not, just > +# quit with a message. > +if [ ! -f "$binary_path"/@GDB_TRANSFORM_NAME@ ]; then > + echo "gcore: GDB binary (${binary_path}/@GDB_TRANSFORM_NAME@) not found" > + exit 1 > +fi > + > # Initialise return code. > rc=0 > > @@ -51,7 +85,7 @@ for pid in $* > do > # ` # available but not accessible as GDB would get stopped on SIGTTIN. > - @GDB_TRANSFORM_NAME@ + $binary_path/@GDB_TRANSFORM_NAME@ -ex "set pagination off" -ex "set height 0" -ex "set width 0" \ > -ex "attach $pid" -ex "gcore $name.$pid" -ex detach -ex quit > OK for check-in. Thanks, Jan