X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/cf293dd490ce2144daf986e11e27df11bcc0dd9b..8eebd22198133e95ce25af1dd15dead0a5389371:/rlogin.c diff --git a/rlogin.c b/rlogin.c index cee653ac..4038a2ff 100644 --- a/rlogin.c +++ b/rlogin.c @@ -68,7 +68,8 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len) } firstbyte = 0; } - c_write(data, len); + if (len > 0) + c_write(data, len); } return 1; } @@ -86,7 +87,7 @@ static void rlogin_sent(Plug plug, int bufsize) * Also places the canonical host name into `realhost'. It must be * freed by the caller. */ -static char *rlogin_init(char *host, int port, char **realhost) +static char *rlogin_init(char *host, int port, char **realhost, int nodelay) { static struct plug_function_table fn_table = { rlogin_closing, @@ -121,7 +122,7 @@ static char *rlogin_init(char *host, int port, char **realhost) sprintf(buf, "Connecting to %.100s port %d", addrbuf, port); logevent(buf); } - s = sk_new(addr, port, 1, 0, &fn_table_ptr); + s = new_connection(addr, *realhost, port, 1, 0, nodelay, &fn_table_ptr); if ((err = sk_socket_error(s))) return err; @@ -217,6 +218,12 @@ static int rlogin_ldisc(int option) return 0; } +static int rlogin_exitcode(void) +{ + /* If we ever implement RSH, we'll probably need to do this properly */ + return 0; +} + Backend rlogin_backend = { rlogin_init, rlogin_send, @@ -224,6 +231,7 @@ Backend rlogin_backend = { rlogin_size, rlogin_special, rlogin_socket, + rlogin_exitcode, rlogin_sendok, rlogin_ldisc, rlogin_unthrottle,