One way to massive patch. <sigh> It compiles and works under Linux..

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index 3a0f977b0901cd3166b9ed5e0890ec150b16cd6b..44a79d0e08ddc2f8cb18af3956615e6c8325401b 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.41 2000/12/05 20:34:10 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.42 2000/12/19 23:17:56 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -123,8 +123,8 @@ static int stdin_eof;               /* EOF has been encountered on standard error. */
 static Buffer stdin_buffer;    /* Buffer for stdin data. */
 static Buffer stdout_buffer;   /* Buffer for stdout data. */
 static Buffer stderr_buffer;   /* Buffer for stderr data. */
-static unsigned long stdin_bytes, stdout_bytes, stderr_bytes;
-static unsigned int buffer_high;/* Soft max buffer size. */
+static u_long stdin_bytes, stdout_bytes, stderr_bytes;
+static u_int buffer_high;/* Soft max buffer size. */
 static int max_fd;             /* Maximum file descriptor number in select(). */
 static int connection_in;      /* Connection to server (input). */
 static int connection_out;     /* Connection to server (output). */
@@ -280,7 +280,7 @@ client_check_initial_eof_on_stdin()
                         * and also process it as an escape character if
                         * appropriate.
                         */
-                       if ((unsigned char) buf[0] == escape_char)
+                       if ((u_char) buf[0] == escape_char)
                                escape_pending = 1;
                        else {
                                buffer_append(&stdin_buffer, buf, 1);
@@ -300,7 +300,7 @@ client_check_initial_eof_on_stdin()
 void
 client_make_packets_from_stdin_data()
 {
-       unsigned int len;
+       u_int len;
 
        /* Send buffered stdin data to the server. */
        while (buffer_len(&stdin_buffer) > 0 &&
@@ -522,8 +522,8 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
        char string[1024];
        pid_t pid;
        int bytes = 0;
-       unsigned int i;
-       unsigned char ch;
+       u_int i;
+       u_char ch;
        char *s;
 
        for (i = 0; i < len; i++) {
@@ -984,7 +984,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
 void
 client_input_stdout_data(int type, int plen, void *ctxt)
 {
-       unsigned int data_len;
+       u_int data_len;
        char *data = packet_get_string(&data_len);
        packet_integrity_check(plen, 4 + data_len, type);
        buffer_append(&stdout_buffer, data, data_len);
@@ -995,7 +995,7 @@ client_input_stdout_data(int type, int plen, void *ctxt)
 void
 client_input_stderr_data(int type, int plen, void *ctxt)
 {
-       unsigned int data_len;
+       u_int data_len;
        char *data = packet_get_string(&data_len);
        packet_integrity_check(plen, 4 + data_len, type);
        buffer_append(&stderr_buffer, data, data_len);
@@ -1113,7 +1113,7 @@ client_input_channel_open(int type, int plen, void *ctxt)
 {
        Channel *c = NULL;
        char *ctype;
-       unsigned int len;
+       u_int len;
        int rchan;
        int rmaxpack;
        int rwindow;
@@ -1213,7 +1213,7 @@ void
 client_input_channel_req(int id, void *arg)
 {
        Channel *c = NULL;
-       unsigned int len;
+       u_int len;
        int success = 0;
        int reply;
        char *rtype;