extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-08 21:44:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas
2013-03-25 16:30:37 +00:00
parent be390c1991 972da2d498
commit 00af2df102
7 changed files with 33 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd-split-window.c
View File

@ -58,8 +58,8 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
struct window *w;
struct window_pane *wp, *new_wp = NULL;
struct environ env;
const char *cmd, *cwd, *shell, *prefix;
char *cause, *new_cause, *cmd1;
const char *cmd, *cwd, *shell;
char *cause, *new_cause;
u_int hlimit;
int size, percentage;
enum layout_type type;
@ -122,18 +122,9 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
goto error;
}
new_wp = window_add_pane(w, hlimit);
if (*cmd != '\0') {
prefix = options_get_string(&w->options, "command-prefix");
xasprintf(&cmd1, "%s%s", prefix, cmd);
} else
cmd1 = xstrdup("");
if (window_pane_spawn(new_wp, cmd1, shell, cwd, &env, s->tio,
&cause) != 0) {
free(cmd1);
if (window_pane_spawn(
new_wp, cmd, shell, cwd, &env, s->tio, &cause) != 0)
goto error;
}
free(cmd1);
layout_assign_pane(lc, new_wp);
server_redraw_window(w);