===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshpty.c,v
retrieving revision 1.12
retrieving revision 1.12.6.1
diff -u -r1.12 -r1.12.6.1
--- src/usr.bin/ssh/sshpty.c	2004/06/21 17:36:31	1.12
+++ src/usr.bin/ssh/sshpty.c	2006/10/06 03:19:33	1.12.6.1
@@ -1,3 +1,4 @@
+/* $OpenBSD: sshpty.c,v 1.12.6.1 2006/10/06 03:19:33 brad Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,10 +12,20 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-#include "includes.h"
-RCSID("$OpenBSD: sshpty.c,v 1.12 2004/06/21 17:36:31 avsm Exp $");
-
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <paths.h>
+#include <pwd.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>
 #include <util.h>
+#include <stdarg.h>
+
 #include "sshpty.h"
 #include "log.h"
 
@@ -35,7 +46,7 @@
  */
 
 int
-pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
+pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen)
 {
 	char buf[64];
 	int i;
@@ -111,11 +122,12 @@
 /* Changes the window size associated with the pty. */
 
 void
-pty_change_window_size(int ptyfd, int row, int col,
-	int xpixel, int ypixel)
+pty_change_window_size(int ptyfd, u_int row, u_int col,
+	u_int xpixel, u_int ypixel)
 {
 	struct winsize w;
 
+	/* may truncate u_int -> u_short */
 	w.ws_row = row;
 	w.ws_col = col;
 	w.ws_xpixel = xpixel;