From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wDyXB/DOxGZv+A0AWB0awg (envelope-from ) for ; Tue, 20 Aug 2024 13:14:24 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=doIsoudm; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 19E4D1E0D0; Tue, 20 Aug 2024 13:14:24 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 059491E08C for ; Tue, 20 Aug 2024 13:14:22 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BE44A384389D for ; Tue, 20 Aug 2024 17:14:21 +0000 (GMT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id D2B763870849 for ; Tue, 20 Aug 2024 17:11:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D2B763870849 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D2B763870849 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724173865; cv=none; b=v+VauEo40FNWdtnIXnjpWea0gvhmSXaFdqlFLpsOtQ9lJbfPjsME4B/aoeJv2dapECij51arzLIA8zxj/M5T3X8KXsBzEIIXXNE45snMT3QB5QnsfWDkSOcuOu226f81aSpGiUZpcz9pymCptsLwg+9jhK82BiYDTjQDOaajjv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724173865; c=relaxed/simple; bh=gc7CF8aqrfSljFS3I/XtZE0s2W20VlQKZlJYMgKbG5Y=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=KagDCfL7QZjpLvc6iFnuNraXlH7MC25AMEC1nMK+aHuW00nsaMQ8VMqCQvYUfvvnrkA/ho96ORseNM1eexXy0TGpuSF7PUXp6YImTbMJ1VOXN/GtA/iu6yGuees+aOI2hvHVlKnfxHFQtbLiAAHIYEwE8CWNLOP258ESIUCA7SU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724173862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JpLNou6SmIjyle0dz59EJyqS67m0b9Zt4XKhKWbuNYI=; b=doIsoudm6TSZbWHrugnnEtQsxpImPyGVkKL3u3Fg8BMB/vwERQS429pSNrTvBKIOFKGcDL dLwQKwcwNBeaGCAxXvAsIKSnOKS/T6kWXCIRlvRQzxZ7tJYVJ4SslqLiZ7xM8aOQOawBfn zTAU8EHRR4dJ+ywZlHZ27IkqCc0tjrU= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-52-TYMAwF__N_KBVEe6Tiqe4Q-1; Tue, 20 Aug 2024 13:11:01 -0400 X-MC-Unique: TYMAwF__N_KBVEe6Tiqe4Q-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-367962f0cb0so3257552f8f.1 for ; Tue, 20 Aug 2024 10:11:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724173859; x=1724778659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JpLNou6SmIjyle0dz59EJyqS67m0b9Zt4XKhKWbuNYI=; b=iMED06zvvM8VhbFki4ALq9nvV8AJpo8LhyDB78sksRxTPHLJuGRzbQgWBfsRsGoYUY jlajXK1t80aucWO5I/BV0DOfTBmJaJSMKMiWvOnS++BjXKa1oxr1rsbWfF6EnU7ZpM3K FuouSlEjHyZjPs+lCwT/6iYQ59w88OZK/olFVvKsaDCU42zDQSASZxHLGao3En3H8mmT sN6lQp626iu+4tMWHo6zAmKvZkYcJHWeQ0HjSn/4WSuONzolFcLJvDEHPi9TH7vzfyYC A0inhe5myx1m+yaq4ZfXAnUqqRs9BygoQTE+sh4rppI8IWYndQ1MdiPI7Y5N+12YhdW6 G83g== X-Gm-Message-State: AOJu0Yy7Kh4/gaWF241Zu2a3CG3gDETj5tHRkCvf+nJoPlAL/8vIdWqg TVCzm7jCuIi060EoqtsVPwA6GFn3mwjXEjYJA9h9kdwNmCefkgJEJcobbCK/5YHh8mI7etzb73m ntqlU+HwtUggaRT5ocyz1NSaXh/LGV6F4N0k7jCrP5xdQ4GAFh724UHP9QUhlkAgRQODyY6GaUH iqwb5E3KsgK7aY4q346F7zy5au+rFR1sp/XY4RXFR/7d8= X-Received: by 2002:a5d:634c:0:b0:371:8ed7:49e9 with SMTP id ffacd0b85a97d-37194651a96mr10772774f8f.26.1724173859435; Tue, 20 Aug 2024 10:10:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxz4yX/dLngehdPG4R3evKnCco0D5tUfZXbBUmNKX3oiPU3YBv8lu7tJWwpqBz/237swFi+g== X-Received: by 2002:a5d:634c:0:b0:371:8ed7:49e9 with SMTP id ffacd0b85a97d-37194651a96mr10772750f8f.26.1724173858745; Tue, 20 Aug 2024 10:10:58 -0700 (PDT) Received: from localhost (178.126.90.146.dyn.plus.net. [146.90.126.178]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37189897419sm13530573f8f.82.2024.08.20.10.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 10:10:58 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv5 09/14] gdb: implement readline rl_directory_rewrite_hook callback Date: Tue, 20 Aug 2024 18:10:39 +0100 Message-Id: <7246877ddd0af2111d9bce53a0aa147f968bb8fc.1724173728.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Implement the readline rl_directory_rewrite_hook callback function, this is used when readline needs to offer completions from within a directory. The important thing is that this function should remove any escaping, this allows GDB to correctly offer completions in situations like this: (gdb) file /tmp/directory\ with\ spaces/ Note the escaping in 'directory\ with\ spaces'. Without the rl_directory_rewrite_hook callback readline will try to open a directory literally called '/tmp/directory\ with\ spaces' which obviously doesn't exist. There are tests added to cover this new functionality. --- gdb/completer.c | 21 +++++++++++++++++++ .../gdb.base/filename-completion.exp | 12 +++++++++++ 2 files changed, 33 insertions(+) diff --git a/gdb/completer.c b/gdb/completer.c index b0e999ef514..b80649c5260 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -321,6 +321,26 @@ gdb_completer_file_name_dequote (char *filename, int quote_char) return strdup (tmp.c_str ()); } +/* Implement readline's rl_directory_rewrite_hook. Remove any quoting from + the string *DIRNAME,update *DIRNAME, and return non-zero. If *DIRNAME + doesn't need updating then return zero. See readline docs for more + information. */ + +static int +gdb_completer_directory_rewrite (char **dirname) +{ + if (!rl_completion_found_quote) + return 0; + + int quote_char = rl_completion_quote_character; + char *new_dirname + = gdb_completer_file_name_dequote (*dirname, quote_char); + free (*dirname); + *dirname = new_dirname; + + return 1; +} + /* Apply character escaping to the filename in TEXT and return a newly allocated buffer containing the possibly updated filename. @@ -3416,6 +3436,7 @@ _initialize_completer () rl_filename_quote_characters = " \t\n\\\"'"; rl_filename_dequoting_function = gdb_completer_file_name_dequote; rl_filename_quoting_function = gdb_completer_file_name_quote; + rl_directory_rewrite_hook = gdb_completer_directory_rewrite; add_setshow_zuinteger_unlimited_cmd ("max-completions", no_class, &max_completions, _("\ diff --git a/gdb/testsuite/gdb.base/filename-completion.exp b/gdb/testsuite/gdb.base/filename-completion.exp index a4b411c1c67..cf00d007ca7 100644 --- a/gdb/testsuite/gdb.base/filename-completion.exp +++ b/gdb/testsuite/gdb.base/filename-completion.exp @@ -170,6 +170,11 @@ proc run_quoting_and_escaping_tests { root } { set dq "\\\"" } + test_gdb_complete_unique "${cmd} ${qc}${root}/bb2/dir${sp}1/" \ + "${cmd} ${qc}${root}/bb2/dir${sp}1/unique${sp}file${qc}" " " \ + false \ + "expand a unique file name in a directory containing a space" + test_gdb_complete_filename_multiple "$cmd ${qc}${root}/bb2/" \ "d" "ir${sp}" { "dir 1/" @@ -177,6 +182,13 @@ proc run_quoting_and_escaping_tests { root } { } "" "${qc}" false \ "expand multiple directory names containing spaces" + test_gdb_complete_filename_multiple "${cmd} ${qc}${root}/bb2/dir${sp}2/" \ + "f" "ile${sp}" { + "file 1" + "file 2" + } "" "${qc}" false \ + "expand contents of a directory containing a space" + test_gdb_complete_filename_multiple "$cmd ${qc}${root}/aaa/" \ "a" "a${sp}" { "aa bb" -- 2.25.4