mirror of
https://github.com/tmate-io/tmate-ssh-server.git
synced 2020-11-18 19:53:51 -08:00
Sync OpenBSD patchset 327:
The default terminal size should be 80x24, not 80x25.
This commit is contained in:
parent
960cd3da69
commit
dbaa28492e
@ -1,4 +1,4 @@
|
|||||||
/* $Id: cmd-new-session.c,v 1.64 2009-09-13 20:56:52 tcunha Exp $ */
|
/* $Id: cmd-new-session.c,v 1.65 2009-09-15 23:52:30 tcunha Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -224,7 +224,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
|
|||||||
/* Find new session size. */
|
/* Find new session size. */
|
||||||
if (detached) {
|
if (detached) {
|
||||||
sx = 80;
|
sx = 80;
|
||||||
sy = 25;
|
sy = 24;
|
||||||
} else if (ctx->cmdclient != NULL) {
|
} else if (ctx->cmdclient != NULL) {
|
||||||
sx = ctx->cmdclient->tty.sx;
|
sx = ctx->cmdclient->tty.sx;
|
||||||
sy = ctx->cmdclient->tty.sy;
|
sy = ctx->cmdclient->tty.sy;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: server-msg.c,v 1.83 2009-09-03 20:44:38 tcunha Exp $ */
|
/* $Id: server-msg.c,v 1.84 2009-09-15 23:52:30 tcunha Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -248,7 +248,7 @@ server_msg_identify(struct client *c, struct msg_identify_data *data, int fd)
|
|||||||
c->tty.sx = 80;
|
c->tty.sx = 80;
|
||||||
c->tty.sy = data->sy;
|
c->tty.sy = data->sy;
|
||||||
if (c->tty.sy == 0)
|
if (c->tty.sy == 0)
|
||||||
c->tty.sy = 25;
|
c->tty.sy = 24;
|
||||||
|
|
||||||
c->cwd = NULL;
|
c->cwd = NULL;
|
||||||
data->cwd[(sizeof data->cwd) - 1] = '\0';
|
data->cwd[(sizeof data->cwd) - 1] = '\0';
|
||||||
@ -278,7 +278,7 @@ server_msg_resize(struct client *c, struct msg_resize_data *data)
|
|||||||
c->tty.sx = 80;
|
c->tty.sx = 80;
|
||||||
c->tty.sy = data->sy;
|
c->tty.sy = data->sy;
|
||||||
if (c->tty.sy == 0)
|
if (c->tty.sy == 0)
|
||||||
c->tty.sy = 25;
|
c->tty.sy = 24;
|
||||||
|
|
||||||
c->tty.cx = UINT_MAX;
|
c->tty.cx = UINT_MAX;
|
||||||
c->tty.cy = UINT_MAX;
|
c->tty.cy = UINT_MAX;
|
||||||
|
4
server.c
4
server.c
@ -1,4 +1,4 @@
|
|||||||
/* $Id: server.c,v 1.187 2009-09-15 23:50:32 tcunha Exp $ */
|
/* $Id: server.c,v 1.188 2009-09-15 23:52:30 tcunha Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -96,7 +96,7 @@ server_create_client(int fd)
|
|||||||
|
|
||||||
c->session = NULL;
|
c->session = NULL;
|
||||||
c->tty.sx = 80;
|
c->tty.sx = 80;
|
||||||
c->tty.sy = 25;
|
c->tty.sy = 24;
|
||||||
screen_init(&c->status, c->tty.sx, 1, 0);
|
screen_init(&c->status, c->tty.sx, 1, 0);
|
||||||
|
|
||||||
c->message_string = NULL;
|
c->message_string = NULL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user