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

Sync OpenBSD patchset 1111:

Browse Source 
Add a helper function to open the terminal for attach-/new-session.
This commit is contained in:
Tiago Cunha
2012-05-12 15:00:19 +00:00
parent 2f0db58777
commit 1340c012b0
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd-new-session.c
View File

@ -63,7 +63,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
struct termios tio, *tiop;
struct passwd *pw;
const char *newname, *target, *update, *cwd, *errstr;
char *overrides, *cmd, *cause;
char *cmd, *cause;
int detached, idx;
u_int sx, sy, i;
@ -128,14 +128,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
/* Open the terminal if necessary. */
if (!detached && ctx->cmdclient != NULL) {
if (!(ctx->cmdclient->flags & CLIENT_TERMINAL)) {
ctx->error(ctx, "not a terminal");
return (-1);
}
overrides =
options_get_string(&global_s_options, "terminal-overrides");
if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
if (server_client_open(ctx->cmdclient, NULL, &cause) != 0) {
ctx->error(ctx, "open terminal failed: %s", cause);
xfree(cause);
return (-1);