projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
afc3d2c
..
ff2af31
100644
(file)
--- a/
rlogin.c
+++ b/
rlogin.c
@@
-19,6
+19,7
@@
typedef struct rlogin_tag {
Socket s;
int bufsize;
Socket s;
int bufsize;
+ int firstbyte;
int term_width, term_height;
void *frontend;
} *Rlogin;
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.
*/
* 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--;
}
if (data[0] == '\0') {
data++;
len--;
}
- firstbyte = 0;
+
rlogin->
firstbyte = 0;
}
if (len > 0)
c_write(rlogin, data, len);
}
if (len > 0)
c_write(rlogin, data, len);
@@
-116,6
+116,7
@@
static char *rlogin_init(void *frontend_handle, void **backend_handle,
rlogin->frontend = frontend_handle;
rlogin->term_width = cfg->width;
rlogin->term_height = cfg->height;
rlogin->frontend = frontend_handle;
rlogin->term_width = cfg->width;
rlogin->term_height = cfg->height;
+ rlogin->firstbyte = 1;
*backend_handle = rlogin;
/*
*backend_handle = rlogin;
/*
@@
-127,7
+128,7
@@
static char *rlogin_init(void *frontend_handle, void **backend_handle,
logevent(rlogin->frontend, buf);
sfree(buf);
}
logevent(rlogin->frontend, buf);
sfree(buf);
}
- addr = name_lookup(host, port, realhost);
+ addr = name_lookup(host, port, realhost
, cfg
);
if ((err = sk_addr_error(addr)) != NULL)
return err;
if ((err = sk_addr_error(addr)) != NULL)
return err;
@@
-145,7
+146,7
@@
static char *rlogin_init(void *frontend_handle, void **backend_handle,
sfree(buf);
}
rlogin->s = new_connection(addr, *realhost, port, 1, 0,
sfree(buf);
}
rlogin->s = new_connection(addr, *realhost, port, 1, 0,
- nodelay, (Plug) rlogin);
+ nodelay, (Plug) rlogin
, cfg
);
if ((err = sk_socket_error(rlogin->s)) != NULL)
return err;
if ((err = sk_socket_error(rlogin->s)) != NULL)
return err;