From: Andrew Burgess <aburgess@redhat.com>
Date: Mon, 2 Jun 2025 19:33:36 +0000 (+0100)
Subject: gdb: filename completion for pipe command -- the shell command bit
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a66ed82cf04ed4527882af57e2bffec065ed47e0;p=thirdparty%2Fbinutils-gdb.git

gdb: filename completion for pipe command -- the shell command bit

This commit adds filename completion for the shell command part of
the pipe command.  This is a follow on from this commit:

  commit 036e5c0c9121d0ac691dbf408a3bdf2bf3501d0f
  Date:   Mon May 19 20:54:54 2025 +0100

      gdb: use quoted filename completion for the shell command

which fixed the completion for the 'shell' command itself.

Like with the 'shell' command, we don't offer completions of command
names pulled from $PATH, we just offer filename completion, which is
often useful for arguments being passed to commands.  Maybe in the
future we could add completion for command names too (for both 'pipe'
and the 'shell' command), but that is left for a future commit.

There's some additional testing.
---

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index d812c493937..054fff4bd2d 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1193,8 +1193,32 @@ pipe_command_completer (struct cmd_list_element *ignore,
       return;
     }
 
-  /* We're past the delimiter.  What follows is a shell command, which
-     we don't know how to complete.  */
+  /* We're past the delimiter now, or at least, DELIM points to the
+     delimiter string.  Update TEXT to point to the start of whatever
+     appears after the delimiter.  */
+  text = skip_spaces (delim + strlen (delimiter));
+
+  /* We really are past the delimiter now, so offer completions.  This is
+     like GDB's "shell" command, currently we only offer filename
+     completion, but in the future this could be improved by offering
+     completion of command names from $PATH.
+
+     What we don't do here is offer completions for the empty string.  It
+     is assumed that the first word after the delimiter is going to be a
+     command name from $PATH, not a filename, so if the user has typed
+     nothing (yet) and tries to complete, there's no point offering a list
+     of files from the current directory.
+
+     Once the user has started to type something though, then we do start
+     offering filename completions.  */
+  if (*text == '\0')
+    return;
+
+  tracker.set_use_custom_word_point (true);
+  tracker.advance_custom_word_point_by (text - org_text);
+  const char *word
+    = advance_to_filename_maybe_quoted_complete_word_point (tracker, text);
+  filename_maybe_quoted_completer (ignore, tracker, text, word);
 }
 
 /* Helper for the list_command function.  Prints the lines around (and
diff --git a/gdb/testsuite/gdb.base/filename-completion.exp b/gdb/testsuite/gdb.base/filename-completion.exp
index 742a182e11b..c10941c9717 100644
--- a/gdb/testsuite/gdb.base/filename-completion.exp
+++ b/gdb/testsuite/gdb.base/filename-completion.exp
@@ -414,7 +414,7 @@ proc run_quoting_and_escaping_tests { root } {
     # focuses on completion of the final filename.  There is also some
     # testing of the shell command above, this tests completion within
     # the line.
-    foreach_with_prefix shell_cmd { "shell " "!" } {
+    foreach_with_prefix shell_cmd { "shell " "!" "pipe print 1 | " } {
 	foreach suffix { "aaa/aa bb" "bb2/dir 1/unique file" } {
 	    set dir $root/$suffix