From patchwork Fri Apr 26 20:11:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Waroquiers X-Patchwork-Id: 32433 Received: (qmail 112838 invoked by alias); 26 Apr 2019 20:11:27 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 112778 invoked by uid 89); 26 Apr 2019 20:11:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=add_com, ls, cli-decode.c, sk:gdb_exc X-HELO: mailsec108.isp.belgacom.be Received: from mailsec108.isp.belgacom.be (HELO mailsec108.isp.belgacom.be) (195.238.20.104) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 26 Apr 2019 20:11:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skynet.be; i=@skynet.be; q=dns/txt; s=securemail; t=1556309485; x=1587845485; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5pg4qBc+Tgfaw6ITzWBPv48cuxDoF5TorFj53K2oz6E=; b=FacgMmdHlCinfMARMmblz7pFZAl+52g2ISm/gC/xEA4wan5TIc6dHT2A e/8lS5SeORzY8EpZf+ts+4RnC31Olw==; Received: from 59.151-129-109.adsl-dyn.isp.belgacom.be (HELO md.home) ([109.129.151.59]) by relay.skynet.be with ESMTP/TLS/DHE-RSA-AES128-GCM-SHA256; 26 Apr 2019 22:11:14 +0200 From: Philippe Waroquiers To: gdb-patches@sourceware.org Cc: Philippe Waroquiers Subject: [RFAv2 4/6] Implement | (pipe) command. Date: Fri, 26 Apr 2019 22:11:06 +0200 Message-Id: <20190426201108.7489-5-philippe.waroquiers@skynet.be> In-Reply-To: <20190426201108.7489-1-philippe.waroquiers@skynet.be> References: <20190426201108.7489-1-philippe.waroquiers@skynet.be> MIME-Version: 1.0 X-IsSubscribed: yes The pipe command allows to run a GDB command, and pipe its output to a shell command: (gdb) help pipe Send the output of a gdb command to a shell command. Usage: pipe [COMMAND] | SHELL_COMMAND Usage: | [COMMAND] | SHELL_COMMAND Usage: pipe -dX COMMAND X SHELL_COMMAND Usage: | -dX COMMAND X SHELL_COMMAND Executes COMMAND and sends its output to SHELL_COMMAND. If COMMAND contains a | character, the option -dX indicates to use the character X to separate COMMAND from SHELL_COMMAND. With no COMMAND, repeat the last executed command and send its output to SHELL_COMMAND. (gdb) For example: (gdb) pipe print some_data_structure | grep -B3 -A3 something The pipe character is defined as an alias for pipe command, so that the above can be typed as: (gdb) | print some_data_structure | grep -B3 -A3 something If no GDB COMMAND is given, then the previous command is relaunched, and its output is sent to the given SHELL_COMMAND. gdb/ChangeLog 2019-04-26 Philippe Waroquiers * cli/cli-cmds.c (pipe_command): New function. (_initialize_cli_cmds): Call add_com for pipe_command. Define | as an alias for pipe. cli/cli-decode.c (find_command_name_length): Recognize | as a single character command. --- gdb/cli/cli-cmds.c | 110 +++++++++++++++++++++++++++++++++++++++++++ gdb/cli/cli-decode.c | 4 +- 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 5f3b973f06..eefdc2cd02 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -24,6 +24,7 @@ #include "completer.h" #include "target.h" /* For baud_rate, remote_debug and remote_timeout. */ #include "common/gdb_wait.h" /* For shell escape implementation. */ +#include "gdbcmd.h" #include "gdb_regex.h" /* Used by apropos_command. */ #include "gdb_vfork.h" #include "linespec.h" @@ -41,6 +42,7 @@ #include "block.h" #include "ui-out.h" +#include "interps.h" #include "top.h" #include "cli/cli-decode.h" @@ -854,6 +856,101 @@ edit_command (const char *arg, int from_tty) xfree (p); } +/* Implementation of the "pipe" command. */ + +static void +pipe_command (const char *arg, int from_tty) +{ + const char *command = arg; + const char *shell_command = arg; + int separator = '|'; + + if (arg == NULL) + error (_("Missing \"[COMMAND] | SHELL_COMMAND\"")); + + shell_command = skip_spaces (shell_command); + + if (*shell_command == '-' && *(shell_command + 1) == 'd') + { + separator = *(shell_command + 2); + if (separator == 0 || separator == ' ') + error (_("Missing separator X after -d in " + "\"| -dX COMMAND X SHELL_COMMAND\"")); + shell_command += 3; + command = shell_command; + } + + shell_command = strchr (shell_command, separator); + + if (shell_command == nullptr) + { + if (separator == '|') + error (_("Missing | SHELL_COMMAND in \"| [COMMAND] | SHELL_COMMAND\"")); + else + error (_("Missing %c SHELL_COMMAND in " + "\"| -d%c COMMAND %c SHELL_COMMAND\""), + separator, separator, separator); + } + + command = skip_spaces (command); + std::string gdb_cmd (command, shell_command - command); + + if (gdb_cmd.empty ()) + { + repeat_previous (); + gdb_cmd = skip_spaces (get_saved_command_line ()); + if (gdb_cmd.empty ()) + error (_("No previous command to relaunch")); + } + + shell_command++; /* skip the separator. */ + shell_command = skip_spaces (shell_command); + if (*shell_command == 0) + { + if (separator == '|') + error (_("Missing SHELL_COMMAND in \"| [COMMAND] | SHELL_COMMAND\"")); + else + error (_("Missing SHELL_COMMAND in " + "\"| -d%c COMMAND %c SHELL_COMMAND\""), + separator, separator); + } + + FILE *to_shell_command = popen (shell_command, "w"); + + if (to_shell_command == NULL) + error (_("Error launching \"%s\""), shell_command); + + try + { + stdio_file pipe_file (to_shell_command); + + execute_command_to_ui_file (&pipe_file, gdb_cmd.c_str (), from_tty); + } + catch (const gdb_exception_error &ex) + { + pclose (to_shell_command); + throw; + } + + int shell_command_status = pclose (to_shell_command); + + if (shell_command_status < 0) + error (_("shell command \"%s\" errno %s"), shell_command, + safe_strerror (errno)); + if (shell_command_status > 0) + { + if (WIFEXITED (shell_command_status)) + warning (_("shell command \"%s\" exit status %d"), shell_command, + WEXITSTATUS (shell_command_status)); + else if (WIFSIGNALED (shell_command_status)) + warning (_("shell command \"%s\" exit with signal %d"), shell_command, + WTERMSIG (shell_command_status)); + else + warning (_("shell command \"%s\" status %d"), shell_command, + shell_command_status); + } +} + static void list_command (const char *arg, int from_tty) { @@ -1845,6 +1942,19 @@ Uses EDITOR environment variable contents as editor (or ex as default).")); c->completer = location_completer; + c = add_com ("pipe", class_support, pipe_command, _("\ +Send the output of a gdb command to a shell command.\n\ +Usage: pipe [COMMAND] | SHELL_COMMAND\n\ +Usage: | [COMMAND] | SHELL_COMMAND\n\ +Usage: pipe -dX COMMAND X SHELL_COMMAND\n\ +Usage: | -dX COMMAND X SHELL_COMMAND\n\ +Executes COMMAND and sends its output to SHELL_COMMAND.\n\ +If COMMAND contains a | character, the option -dX indicates\n\ +to use the character X to separate COMMAND from SHELL_COMMAND.\n\ +With no COMMAND, repeat the last executed command\n\ +and send its output to SHELL_COMMAND.")); + add_com_alias ("|", "pipe", class_support, 0); + add_com ("list", class_files, list_command, _("\ List specified function or line.\n\ With no argument, lists ten more lines after or around previous listing.\n\ diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 50430953c7..46051090cd 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -1311,9 +1311,9 @@ find_command_name_length (const char *text) Note that this is larger than the character set allowed when creating user-defined commands. */ - /* Recognize '!' as a single character command so that, e.g., "!ls" + /* Recognize the single character commands so that, e.g., "!ls" works as expected. */ - if (*p == '!') + if (*p == '!' || *p == '|') return 1; while (isalnum (*p) || *p == '-' || *p == '_'