Add a new back-end function to return the exit code of the remote

[u/mdw/putty] / rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 5c55d5a..ba7dd37 100644 (file)
--- a/rlogin.c
+++ b/rlogin.c
@@ -73,6 +73,11 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
     return 1;
 }
 
+static void rlogin_sent(Plug plug, int bufsize)
+{
+    rlogin_bufsize = bufsize;
+}
+
 /*
  * Called to set up the rlogin connection.
  * 
@@ -81,11 +86,12 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
  * 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,
-       rlogin_receive
+       rlogin_receive,
+       rlogin_sent
     }, *fn_table_ptr = &fn_table;
 
     SockAddr addr;
@@ -94,6 +100,11 @@ static char *rlogin_init(char *host, int port, char **realhost)
     /*
      * Try to find host.
      */
+    {
+       char buf[200];
+       sprintf(buf, "Looking up host \"%.170s\"", host);
+       logevent(buf);
+    }
     addr = sk_namelookup(host, realhost);
     if ((err = sk_addr_error(addr)))
        return err;
@@ -104,7 +115,13 @@ static char *rlogin_init(char *host, int port, char **realhost)
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 1, 0, &fn_table_ptr);
+    {
+       char buf[200], addrbuf[100];
+       sk_getaddr(addr, addrbuf, 100);
+       sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
+       logevent(buf);
+    }
+    s = sk_new(addr, port, 1, 0, nodelay, &fn_table_ptr);
     if ((err = sk_socket_error(s)))
        return err;
 
@@ -137,9 +154,8 @@ static char *rlogin_init(char *host, int port, char **realhost)
  */
 static int rlogin_send(char *buf, int len)
 {
-
     if (s == NULL)
-       return;
+       return 0;
 
     rlogin_bufsize = sk_write(s, buf, len);
 
@@ -161,6 +177,9 @@ static void rlogin_size(void)
 {
     char b[12] = { '\xFF', '\xFF', 0x73, 0x73, 0, 0, 0, 0, 0, 0, 0, 0 };
 
+    if (s == NULL)
+       return;
+    
     b[6] = cols >> 8;
     b[7] = cols & 0xFF;
     b[4] = rows >> 8;
@@ -198,6 +217,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,
@@ -205,6 +230,7 @@ Backend rlogin_backend = {
     rlogin_size,
     rlogin_special,
     rlogin_socket,
+    rlogin_exitcode,
     rlogin_sendok,
     rlogin_ldisc,
     rlogin_unthrottle,