Introduced wrapper macros snew(), snewn() and sresize() for the

[u/mdw/putty] / rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 61f4afb..c3ef25c 100644 (file)
--- a/rlogin.c
+++ b/rlogin.c
@@ -1,4 +1,3 @@
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -20,6 +19,7 @@ typedef struct rlogin_tag {
 
     Socket s;
     int bufsize;
+    int firstbyte;
     int term_width, term_height;
     void *frontend;
 } *Rlogin;
@@ -42,7 +42,7 @@ static int rlogin_closing(Plug plug, char *error_msg, int error_code,
     }
     if (error_msg) {
        /* A socket error has occurred. */
-       logevent(error_msg);
+       logevent(rlogin->frontend, error_msg);
        connection_fatal("%s", error_msg);
     }                                 /* Otherwise, the remote side closed the connection normally. */
     return 0;
@@ -70,13 +70,12 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
         * byte is expected to be NULL and is ignored, and the rest
         * is printed.
         */
-       static int firstbyte = 1;
-       if (firstbyte) {
+       if (rlogin->firstbyte) {
            if (data[0] == '\0') {
                data++;
                len--;
            }
-           firstbyte = 0;
+           rlogin->firstbyte = 0;
        }
        if (len > 0)
             c_write(rlogin, data, len);
@@ -99,6 +98,7 @@ static void rlogin_sent(Plug plug, int bufsize)
  * freed by the caller.
  */
 static char *rlogin_init(void *frontend_handle, void **backend_handle,
+                        Config *cfg,
                         char *host, int port, char **realhost, int nodelay)
 {
     static const struct plug_function_table fn_table = {
@@ -110,24 +110,26 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
     char *err;
     Rlogin rlogin;
 
-    rlogin = smalloc(sizeof(*rlogin));
+    rlogin = snew(struct rlogin_tag);
     rlogin->fn = &fn_table;
     rlogin->s = NULL;
     rlogin->frontend = frontend_handle;
-    rlogin->term_width = cfg.width;
-    rlogin->term_height = cfg.height;
+    rlogin->term_width = cfg->width;
+    rlogin->term_height = cfg->height;
+    rlogin->firstbyte = 1;
     *backend_handle = rlogin;
 
     /*
      * Try to find host.
      */
     {
-       char buf[200];
-       sprintf(buf, "Looking up host \"%.170s\"", host);
-       logevent(buf);
+       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, cfg);
+    if ((err = sk_addr_error(addr)) != NULL)
        return err;
 
     if (port < 0)
@@ -137,14 +139,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);
-       logevent(buf);
+       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)))
+                              nodelay, (Plug) rlogin, cfg);
+    if ((err = sk_socket_error(rlogin->s)) != NULL)
        return err;
 
     sk_addr_free(addr);
@@ -157,20 +160,39 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
        char z = 0;
        char *p;
        sk_write(rlogin->s, &z, 1);
-       sk_write(rlogin->s, cfg.localusername, strlen(cfg.localusername));
+       sk_write(rlogin->s, cfg->localusername,
+                strlen(cfg->localusername));
        sk_write(rlogin->s, &z, 1);
-       sk_write(rlogin->s, cfg.username, strlen(cfg.username));
+       sk_write(rlogin->s, cfg->username,
+                strlen(cfg->username));
        sk_write(rlogin->s, &z, 1);
-       sk_write(rlogin->s, cfg.termtype, strlen(cfg.termtype));
+       sk_write(rlogin->s, cfg->termtype,
+                strlen(cfg->termtype));
        sk_write(rlogin->s, "/", 1);
-       for (p = cfg.termspeed; isdigit(*p); p++);
-       sk_write(rlogin->s, cfg.termspeed, p - cfg.termspeed);
+       for (p = cfg->termspeed; isdigit((unsigned char)*p); p++) continue;
+       sk_write(rlogin->s, cfg->termspeed, p - cfg->termspeed);
        rlogin->bufsize = sk_write(rlogin->s, &z, 1);
     }
 
     return NULL;
 }
 
+static void rlogin_free(void *handle)
+{
+    Rlogin rlogin = (Rlogin) handle;
+
+    if (rlogin->s)
+       sk_close(rlogin->s);
+    sfree(rlogin);
+}
+
+/*
+ * Stub routine (we don't have any need to reconfigure this backend).
+ */
+static void rlogin_reconfig(void *handle, Config *cfg)
+{
+}
+
 /*
  * Called to send data down the rlogin connection.
  */
@@ -234,7 +256,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 +268,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;
 }
 
@@ -255,15 +277,22 @@ static void rlogin_provide_ldisc(void *handle, void *ldisc)
     /* This is a stub. */
 }
 
+static void rlogin_provide_logctx(void *handle, void *logctx)
+{
+    /* This is a stub. */
+}
+
 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;
 }
 
 Backend rlogin_backend = {
     rlogin_init,
+    rlogin_free,
+    rlogin_reconfig,
     rlogin_send,
     rlogin_sendbuffer,
     rlogin_size,
@@ -273,6 +302,7 @@ Backend rlogin_backend = {
     rlogin_sendok,
     rlogin_ldisc,
     rlogin_provide_ldisc,
+    rlogin_provide_logctx,
     rlogin_unthrottle,
     1
 };