From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 118387 invoked by alias); 22 Sep 2017 11:57:37 -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 118362 invoked by uid 89); 22 Sep 2017 11:57:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= 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; Fri, 22 Sep 2017 11:57:34 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F44C267C8 for ; Fri, 22 Sep 2017 11:57:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9F44C267C8 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=palves@redhat.com Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27C495C269; Fri, 22 Sep 2017 11:57:30 +0000 (UTC) Subject: Re: [PATCH v3 3/5] Introduce gdb_tilde_expand To: Sergio Durigan Junior , GDB Patches References: <20170912042325.14927-1-sergiodj@redhat.com> <20170921225926.23132-1-sergiodj@redhat.com> <20170921225926.23132-4-sergiodj@redhat.com> From: Pedro Alves Message-ID: <2045d081-c89b-e83f-97a7-d4e3397aa476@redhat.com> Date: Fri, 22 Sep 2017 11:57:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20170921225926.23132-4-sergiodj@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2017-09/txt/msg00671.txt.bz2 On 09/21/2017 11:59 PM, Sergio Durigan Junior wrote: > diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c > index cbafb13837..507fdc4120 100644 > --- a/gdb/cli/cli-cmds.c > +++ b/gdb/cli/cli-cmds.c > @@ -54,6 +54,8 @@ > #include "tui/tui.h" /* For tui_active et.al. */ > #endif > > +#include "gdb_tilde_expand.h" > + > #include > #include > #include > @@ -410,10 +412,8 @@ cd_command (char *dir, int from_tty) > repeat might be useful but is more likely to be a mistake. */ > dont_repeat (); > > - gdb::unique_xmalloc_ptr dir_holder > - (tilde_expand (dir != NULL ? dir : "~")); > - dir = dir_holder.get (); > - > + std::string expanded_path = gdb_tilde_expand (dir != NULL ? dir : "~"); > + dir = (char *) expanded_path.c_str (); > if (chdir (dir) < 0) > perror_with_name (dir); > > @@ -438,7 +438,7 @@ cd_command (char *dir, int from_tty) > len--; > } > > - dir_holder.reset (savestring (dir, len)); > + gdb::unique_xmalloc_ptr dir_holder (savestring (dir, len)); > if (IS_ABSOLUTE_PATH (dir_holder.get ())) > { > xfree (current_directory); I realized something: in light of the fact that "cd" is not what is used to specify the inferior's cwd anymore since v1, patching this particular use of tilde_expand, and not others seems arbitrary. I.e., this now looks like kind of a spurious change to me, and I think you should drop the changes to this file... > +/* See common/gdb_tilde_expand.h. */ > + > +std::string > +gdb_tilde_expand (const char *dir) > +{ > + gdb_glob glob (dir, GLOB_TILDE | GLOB_TILDE_CHECK | GLOB_ONLYDIR, NULL); By my reading of man glob, GLOB_TILDE_CHECK already implies GLOB_TILDE. I'm not sure whether GLOB_ONLYDIR is the right thing to do in a function whose name doesn't suggest that it concern itself with anything other than tilde expansion. E.g., if we replaced tilde_expand with gdb_tilde_expand in place that expect to match files (like e.g., gdb_print_filename), then would this work as is? Maybe you should rename this to gdb_tilde_expand_dir (leaving the file names as is). Thanks, Pedro Alves