From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25083 invoked by alias); 10 Nov 2011 17:15:46 -0000 Received: (qmail 25071 invoked by uid 22791); 10 Nov 2011 17:15:44 -0000 X-SWARE-Spam-Status: No, hits=-6.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 10 Nov 2011 17:15:28 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pAAHFRT9011622 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 10 Nov 2011 12:15:27 -0500 Received: from valrhona.uglyboxes.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id pAAHFPdl029768 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 10 Nov 2011 12:15:26 -0500 Message-ID: <4EBC06AD.6050205@redhat.com> Date: Thu, 10 Nov 2011 17:15:00 -0000 From: Keith Seitz User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0 MIME-Version: 1.0 To: "gdb-patches@sourceware.org ml" Subject: [RFA/ping] 12843 Content-Type: multipart/mixed; boundary="------------050707030509010803010406" X-IsSubscribed: yes 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 X-SW-Source: 2011-11/txt/msg00281.txt.bz2 This is a multi-part message in MIME format. --------------050707030509010803010406 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1193 Hi, A loooong time ago, we were discussing this bug, which essentially makes it impossible to (re)set a breakpoint on a linespec containing a filename with a Windows-style drive letter. This is especially bad since canonicalization may add this information. Here's a link to the original discussion: http://sourceware.org/ml/gdb-patches/2011-08/msg00473.html I believe that only one correction was asked (by Jan) to fix-up an exec file name in the test suite, and I have fixed this. I think this bug needs to be fixed for 7.4, so I humbly resubmit. Tested against HEAD on x86_64-linux and i686-pc-cygwin (well, at least as best I could: there are a ton of problems with testing on cygwin -- a subject for some other time). Although we may want to move linespecs.exp under gdb.linespec and rename it (to accommodate Tom's pending ambiguous linespec patch)? Keith ChangeLog 2011-11-10 Keith Seitz PR gdb/12843 * linespec.c (locate_first_half): Keep ':' if it looks like it could be part of a Windows path starting with a drive letter. testsuite/ChangeLog 2011-11-10 Keith Seitz PR gdb/12843 * gdb.base/linespecs.exp: New file. --------------050707030509010803010406 Content-Type: text/x-patch; name="12843-ping.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="12843-ping.patch" Content-length: 2674 diff --git a/gdb/linespec.c b/gdb/linespec.c index 37ec368..721bf12 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -43,6 +43,7 @@ #include "arch-utils.h" #include #include "cli/cli-utils.h" +#include "filenames.h" /* Prototypes for local functions. */ @@ -1194,6 +1195,16 @@ locate_first_half (char **argptr, int *is_quote_enclosed) ++p; } } + + + /* Check for a drive letter in the filename. This is done on all hosts + to capture cross-compilation environments. On Unixen, directory + separators are illegal in filenames, so if the user enters "e:/foo.c", + he is referring to a directory named "e:" and a source file named + "foo.c", and we still want to keep these two pieces together. */ + if (isalpha (p[0]) && p[1] == ':' && IS_DIR_SEPARATOR (p[2])) + p += 3; + for (; *p; p++) { if (p[0] == '<') @@ -1218,8 +1229,7 @@ locate_first_half (char **argptr, int *is_quote_enclosed) line, a tab, a colon or a space. But if enclosed in double quotes we do not break on enclosed spaces. */ if (!*p - || p[0] == '\t' - || (p[0] == ':') + || p[0] == '\t' || p[0] == ':' || ((p[0] == ' ') && !*is_quote_enclosed)) break; if (p[0] == '.' && strchr (p, ':') == NULL) diff --git a/gdb/testsuite/gdb.base/linespecs.exp b/gdb/testsuite/gdb.base/linespecs.exp new file mode 100644 index 0000000..559cdcc --- /dev/null +++ b/gdb/testsuite/gdb.base/linespecs.exp @@ -0,0 +1,29 @@ +# Copyright 2011 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Linespec tests + +# We don't currently need our own test case for testing, so grab +# another one. + +if {[prepare_for_testing linespecs.exp linespecs memattr.c]} { + return -1 +} + +# PR gdb/12843 +gdb_test "list c:/foo/bar/baz.c:1" "No source file named c:/foo/bar/baz.c." +gdb_test "list c:/foo/bar/baz.c" "Function \"c:/foo/bar/baz.c\" not defined." +gdb_test "list fooc:/foo/bar/baz.c:1" "No source file named fooc." +gdb_test "list fooc:/foo/bar/baz.c" "No source file named fooc." --------------050707030509010803010406--