summaryrefslogtreecommitdiff
path: root/sshpty.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-26 14:04:36 +1100
committerDamien Miller <djm@mindrot.org>2006-03-26 14:04:36 +1100
commit71a73671305a2248a6c4a243134ebf28f7d8ee7a (patch)
treec81a7c7ae47bfc385a42cf4f86a9df3af7eeda3e /sshpty.c
parent6d39bcf898f2cf296333590330a2d945f2f123a4 (diff)
- deraadt@cvs.openbsd.org 2006/03/20 18:14:02
[channels.c clientloop.c monitor_wrap.c monitor_wrap.h serverloop.c] [ssh.c sshpty.c sshpty.h] sprinkle u_int throughout pty subsystem, ok markus
Diffstat (limited to 'sshpty.c')
-rw-r--r--sshpty.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sshpty.c b/sshpty.c
index 2e42aee11..9ac4903ef 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -46,7 +46,7 @@
46 */ 46 */
47 47
48int 48int
49pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) 49pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen)
50{ 50{
51 /* openpty(3) exists in OSF/1 and some other os'es */ 51 /* openpty(3) exists in OSF/1 and some other os'es */
52 char *name; 52 char *name;
@@ -169,11 +169,12 @@ pty_make_controlling_tty(int *ttyfd, const char *tty)
169/* Changes the window size associated with the pty. */ 169/* Changes the window size associated with the pty. */
170 170
171void 171void
172pty_change_window_size(int ptyfd, int row, int col, 172pty_change_window_size(int ptyfd, u_int row, u_int col,
173 int xpixel, int ypixel) 173 u_int xpixel, u_int ypixel)
174{ 174{
175 struct winsize w; 175 struct winsize w;
176 176
177 /* may truncate u_int -> u_short */
177 w.ws_row = row; 178 w.ws_row = row;
178 w.ws_col = col; 179 w.ws_col = col;
179 w.ws_xpixel = xpixel; 180 w.ws_xpixel = xpixel;