Miscellaneous fixes to finish up `remove-statics'. rlogin.c had a

[u/mdw/putty] / rlogin.c

diff --git a/rlogin.c b/rlogin.c
index 942a07e..ff2af31 100644 (file)
--- a/rlogin.c
+++ b/rlogin.c
@@ -19,6 +19,7 @@ typedef struct rlogin_tag {
 
     Socket s;
     int bufsize;
+    int firstbyte;
     int term_width, term_height;
     void *frontend;
 } *Rlogin;
@@ -69,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);
@@ -98,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 = {
@@ -113,20 +114,22 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
     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);
+       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)
@@ -136,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);
+       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);
@@ -156,14 +160,17 @@ 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(*p); p++) continue;
+       sk_write(rlogin->s, cfg->termspeed, p - cfg->termspeed);
        rlogin->bufsize = sk_write(rlogin->s, &z, 1);
     }
 
@@ -171,6 +178,13 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
 }
 
 /*
+ * 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.
  */
 static int rlogin_send(void *handle, char *buf, int len)
@@ -268,6 +282,7 @@ static int rlogin_exitcode(void *handle)
 
 Backend rlogin_backend = {
     rlogin_init,
+    rlogin_reconfig,
     rlogin_send,
     rlogin_sendbuffer,
     rlogin_size,