X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/9b41d3a8fae7c9f0a1d279c205a86a91e85728d1..c85623f918b8a6c639afc15604414f9b113bb20d:/unix/uxplink.c diff --git a/unix/uxplink.c b/unix/uxplink.c index 5ca5bb2c..2778bc5a 100644 --- a/unix/uxplink.c +++ b/unix/uxplink.c @@ -72,11 +72,12 @@ struct termios orig_termios; static Backend *back; static void *backhandle; +static Config cfg; /* * Default settings that are specific to pterm. */ -char *platform_default_s(char *name) +char *platform_default_s(const char *name) { if (!strcmp(name, "X11Display")) return getenv("DISPLAY"); @@ -124,7 +125,7 @@ char *platform_default_s(char *name) return NULL; } -int platform_default_i(char *name, int def) +int platform_default_i(const char *name, int def) { if (!strcmp(name, "TermWidth") || !strcmp(name, "TermHeight")) { @@ -135,7 +136,7 @@ int platform_default_i(char *name, int def) return def; } -char *x_get_default(char *key) +char *x_get_default(const char *key) { return NULL; /* this is a stub */ } @@ -544,14 +545,14 @@ int main(int argc, char **argv) /* * 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); - 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);