X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a832773496d46caa5e328d36a15b4918f24a804e..6f1e7b78af0f9c4c502609392f62771cf2528d8f:/rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 7b556048..9c249f27 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -1,4 +1,3 @@
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -122,12 +121,13 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
      * Try to find host.
      */
     {
-	char buf[200];
-	sprintf(buf, "Looking up host \"%.170s\"", host);
+	char *buf;
+	buf = dupprintf("Looking up host \"%s\"", host);
 	logevent(rlogin->frontend, buf);
+	sfree(buf);
     }
-    addr = sk_namelookup(host, realhost);
-    if ((err = sk_addr_error(addr)))
+    addr = name_lookup(host, port, realhost);
+    if ((err = sk_addr_error(addr)) != NULL)
 	return err;
 
     if (port < 0)
@@ -137,14 +137,15 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
      * Open socket.
      */
     {
-	char buf[200], addrbuf[100];
+	char *buf, addrbuf[100];
 	sk_getaddr(addr, addrbuf, 100);
-	sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
+	buf = dupprintf("Connecting to %s port %d", addrbuf, port);
 	logevent(rlogin->frontend, buf);
+	sfree(buf);
     }
     rlogin->s = new_connection(addr, *realhost, port, 1, 0,
 			       nodelay, (Plug) rlogin);
-    if ((err = sk_socket_error(rlogin->s)))
+    if ((err = sk_socket_error(rlogin->s)) != NULL)
 	return err;
 
     sk_addr_free(addr);
@@ -163,7 +164,7 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
 	sk_write(rlogin->s, &z, 1);
 	sk_write(rlogin->s, cfg.termtype, strlen(cfg.termtype));
 	sk_write(rlogin->s, "/", 1);
-	for (p = cfg.termspeed; isdigit(*p); p++);
+	for (p = cfg.termspeed; isdigit(*p); p++) continue;
 	sk_write(rlogin->s, cfg.termspeed, p - cfg.termspeed);
 	rlogin->bufsize = sk_write(rlogin->s, &z, 1);
     }
@@ -234,7 +235,7 @@ static Socket rlogin_socket(void *handle)
 
 static int rlogin_sendok(void *handle)
 {
-    Rlogin rlogin = (Rlogin) handle;
+    /* Rlogin rlogin = (Rlogin) handle; */
     return 1;
 }
 
@@ -246,7 +247,7 @@ static void rlogin_unthrottle(void *handle, int backlog)
 
 static int rlogin_ldisc(void *handle, int option)
 {
-    Rlogin rlogin = (Rlogin) handle;
+    /* Rlogin rlogin = (Rlogin) handle; */
     return 0;
 }
 
@@ -262,7 +263,7 @@ static void rlogin_provide_logctx(void *handle, void *logctx)
 
 static int rlogin_exitcode(void *handle)
 {
-    Rlogin rlogin = (Rlogin) handle;
+    /* Rlogin rlogin = (Rlogin) handle; */
     /* If we ever implement RSH, we'll probably need to do this properly */
     return 0;
 }