diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cmd-run-shell.c | 96 | ||||
| -rw-r--r-- | cmd.c | 1 | ||||
| -rw-r--r-- | tmux.1 | 9 | ||||
| -rw-r--r-- | tmux.h | 1 |
5 files changed, 108 insertions, 1 deletions
@@ -23,7 +23,7 @@ SRCS= attributes.c buffer-poll.c buffer.c cfg.c client-fn.c \ cmd-set-password.c cmd-set-window-option.c cmd-show-buffer.c \ cmd-show-options.c cmd-show-window-options.c cmd-source-file.c \ cmd-split-window.c cmd-start-server.c cmd-string.c cmd-if-shell.c \ - cmd-suspend-client.c cmd-swap-pane.c cmd-swap-window.c \ + cmd-run-shell.c cmd-suspend-client.c cmd-swap-pane.c cmd-swap-window.c \ cmd-switch-client.c cmd-unbind-key.c cmd-unlink-window.c \ cmd-set-environment.c cmd-show-environment.c cmd-choose-client.c \ cmd-up-pane.c cmd-display-message.c cmd-display-panes.c cmd.c \ diff --git a/cmd-run-shell.c b/cmd-run-shell.c new file mode 100644 index 00000000..71e5b96b --- /dev/null +++ b/cmd-run-shell.c @@ -0,0 +1,96 @@ +/* $OpenBSD$ */ + +/* + * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/types.h> +#include <sys/wait.h> + +#include <string.h> + +#include "tmux.h" + +/* + * Runs a command without a window. + */ + +int cmd_run_shell_exec(struct cmd *, struct cmd_ctx *); + +const struct cmd_entry cmd_run_shell_entry = { + "run-shell", "run", + "command", + CMD_ARG1, 0, + cmd_target_init, + cmd_target_parse, + cmd_run_shell_exec, + cmd_target_free, + cmd_target_print +}; + +int +cmd_run_shell_exec(struct cmd *self, struct cmd_ctx *ctx) +{ + struct cmd_target_data *data = self->data; + FILE *fp; + char *buf, *lbuf, *msg; + size_t len; + int has_output, ret, status; + + if ((fp = popen(data->arg, "r")) == NULL) { + ctx->error(ctx, "popen error"); + return (-1); + } + + has_output = 0; + lbuf = NULL; + while ((buf = fgetln(fp, &len)) != NULL) { + if (buf[len - 1] == '\n') + buf[len - 1] = '\0'; + else { + lbuf = xmalloc(len + 1); + memcpy(lbuf, buf, len); + lbuf[len] = '\0'; + buf = lbuf; + } + ctx->print(ctx, "%s", buf); + has_output = 1; + } + if (lbuf != NULL) + xfree(lbuf); + + msg = NULL; + status = pclose(fp); + + if (WIFEXITED(status)) { + if ((ret = WEXITSTATUS(status)) == 0) + return (0); + xasprintf(&msg, "'%s' returned %d", data->arg, ret); + } else if (WIFSIGNALED(status)) { + xasprintf( + &msg, "'%s' terminated by signal %d", data->arg, + WTERMSIG(status)); + } + + if (msg != NULL) { + if (has_output) + ctx->print(ctx, "%s", msg); + else + ctx->info(ctx, "%s", msg); + xfree(msg); + } + + return (0); +} @@ -76,6 +76,7 @@ const struct cmd_entry *cmd_table[] = { &cmd_resize_pane_entry, &cmd_respawn_window_entry, &cmd_rotate_window_entry, + &cmd_run_shell_entry, &cmd_save_buffer_entry, &cmd_scroll_mode_entry, &cmd_select_layout_entry, @@ -1959,6 +1959,15 @@ returns success. .It Ic lock-server .D1 (alias: Ic lock ) Lock the server until a password is entered. +.It Ic run-shell Ar command +.D1 (alias: Ic run ) +Execute +.Ar command +without creating a window. +Any output to stdout is displayed in output mode. +If +.Ar command +doesn't return success, the exit status is also displayed. .It Ic server-info .D1 (alias: Ic info ) Show server information and terminal details. @@ -1338,6 +1338,7 @@ extern const struct cmd_entry cmd_rename_window_entry; extern const struct cmd_entry cmd_resize_pane_entry; extern const struct cmd_entry cmd_respawn_window_entry; extern const struct cmd_entry cmd_rotate_window_entry; +extern const struct cmd_entry cmd_run_shell_entry; extern const struct cmd_entry cmd_save_buffer_entry; extern const struct cmd_entry cmd_scroll_mode_entry; extern const struct cmd_entry cmd_select_layout_entry; |