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]
/
unix
/
uxplink.c
diff --git
a/unix/uxplink.c
b/unix/uxplink.c
index
5ca5bb2
..
2778bc5
100644
(file)
--- a/
unix/uxplink.c
+++ b/
unix/uxplink.c
@@
-72,11
+72,12
@@
struct termios orig_termios;
static Backend *back;
static void *backhandle;
static Backend *back;
static void *backhandle;
+static Config cfg;
/*
* Default settings that are specific to pterm.
*/
/*
* Default settings that are specific to pterm.
*/
-char *platform_default_s(char *name)
+char *platform_default_s(c
onst c
har *name)
{
if (!strcmp(name, "X11Display"))
return getenv("DISPLAY");
{
if (!strcmp(name, "X11Display"))
return getenv("DISPLAY");
@@
-124,7
+125,7
@@
char *platform_default_s(char *name)
return NULL;
}
return NULL;
}
-int platform_default_i(char *name, int def)
+int platform_default_i(c
onst c
har *name, int def)
{
if (!strcmp(name, "TermWidth") ||
!strcmp(name, "TermHeight")) {
{
if (!strcmp(name, "TermWidth") ||
!strcmp(name, "TermHeight")) {
@@
-135,7
+136,7
@@
int platform_default_i(char *name, int def)
return def;
}
return def;
}
-char *x_get_default(char *key)
+char *x_get_default(c
onst c
har *key)
{
return NULL; /* this is a stub */
}
{
return NULL; /* this is a stub */
}
@@
-544,14
+545,14
@@
int main(int argc, char **argv)
/*
* Start up the connection.
*/
/*
* Start up the connection.
*/
- logctx = log_init(NULL);
+ logctx = log_init(NULL
, &cfg
);
{
char *error;
char *realhost;
/* nodelay is only useful if stdin is a terminal device */
int nodelay = cfg.tcp_nodelay && isatty(0);
{
char *error;
char *realhost;
/* nodelay is only useful if stdin is a terminal device */
int nodelay = cfg.tcp_nodelay && isatty(0);
- error = back->init(NULL, &backhandle, cfg.host, cfg.port,
+ error = back->init(NULL, &backhandle,
&cfg,
cfg.host, cfg.port,
&realhost, nodelay);
if (error) {
fprintf(stderr, "Unable to open connection:\n%s\n", error);
&realhost, nodelay);
if (error) {
fprintf(stderr, "Unable to open connection:\n%s\n", error);