X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b47b21989c2dd9c7ce0e973b3730965f9d99b990..3dd87daecf17d0f7d573f8a2d03488f1ffbff392:/rlogin.c?ds=sidebyside

diff --git a/rlogin.c b/rlogin.c
index 850d906d..eb6a6c2d 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -1,6 +1,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "putty.h"
 
@@ -41,7 +42,7 @@ static int rlogin_receive (Socket skt, int urgent, char *data, int len) {
         char c;
         
         c = *data++; len--;
-        if (c == 0x80)
+        if (c == '\x80')
             rlogin_size();
         /*
          * We should flush everything (aka Telnet SYNCH) if we see
@@ -49,8 +50,22 @@ static int rlogin_receive (Socket skt, int urgent, char *data, int len) {
          * on 0x10 and 0x20 respectively. I'm not convinced it's
          * worth it...
          */
+    } else {
+        /*
+         * Main rlogin protocol. This is really simple: the first
+         * byte is expected to be NULL and is ignored, and the rest
+         * is printed.
+         */
+        static int firstbyte = 1;
+        if (firstbyte) {
+            if (data[0] == '\0') {
+                data++;
+                len--;
+            }
+            firstbyte = 0;
+        }
+        c_write(data, len);
     }
-    c_write(data, len);
     return 1;
 }
 
@@ -78,7 +93,7 @@ static char *rlogin_init (char *host, int port, char **realhost) {
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 1, rlogin_receive);
+    s = sk_new(addr, port, 1, 0, rlogin_receive);
     if ( (err = sk_socket_error(s)) )
 	return err;