diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
| commit | 1a6e696b08113ca17ee8e881844167cf94276846 (patch) | |
| tree | 60ecdd8c9e51bff46624e48d9373686b858d2fb1 /cmd-pipe-pane.c | |
| parent | d401340c516131ae8e07bfb978b670347486d077 (diff) | |
| parent | d15d54c2c8e6b95695169442eb2a27d814efc078 (diff) | |
| download | rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.gz rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.bz2 rtmux-1a6e696b08113ca17ee8e881844167cf94276846.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-pipe-pane.c')
| -rw-r--r-- | cmd-pipe-pane.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cmd-pipe-pane.c b/cmd-pipe-pane.c index ec91dd32..ff37b0d8 100644 --- a/cmd-pipe-pane.c +++ b/cmd-pipe-pane.c @@ -32,7 +32,7 @@ * Open pipe to redirect pane output. If already open, close first. */ -static enum cmd_retval cmd_pipe_pane_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_pipe_pane_exec(struct cmd *, struct cmdq_item *); static void cmd_pipe_pane_error_callback(struct bufferevent *, short, void *); @@ -50,13 +50,13 @@ const struct cmd_entry cmd_pipe_pane_entry = { }; static enum cmd_retval -cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; - struct client *c = cmdq->state.c; - struct window_pane *wp = cmdq->state.tflag.wp; - struct session *s = cmdq->state.tflag.s; - struct winlink *wl = cmdq->state.tflag.wl; + struct client *c = item->state.c; + struct window_pane *wp = item->state.tflag.wp; + struct session *s = item->state.tflag.s; + struct winlink *wl = item->state.tflag.wl; char *cmd; int old_fd, pipe_fd[2], null_fd; struct format_tree *ft; @@ -84,12 +84,12 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq) /* Open the new pipe. */ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_fd) != 0) { - cmdq_error(cmdq, "socketpair error: %s", strerror(errno)); + cmdq_error(item, "socketpair error: %s", strerror(errno)); return (CMD_RETURN_ERROR); } /* Expand the command. */ - ft = format_create(cmdq, 0); + ft = format_create(item, 0); format_defaults(ft, c, s, wl, wp); cmd = format_expand_time(ft, args->argv[0], time(NULL)); format_free(ft); @@ -97,7 +97,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq) /* Fork the child. */ switch (fork()) { case -1: - cmdq_error(cmdq, "fork error: %s", strerror(errno)); + cmdq_error(item, "fork error: %s", strerror(errno)); free(cmd); return (CMD_RETURN_ERROR); |