projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reinstate a piece of code accidentally removed in r9214, where Windows
[u/mdw/putty]
/
unix
/
uxputty.c
diff --git
a/unix/uxputty.c
b/unix/uxputty.c
index
f42c428
..
fbaf029
100644
(file)
--- a/
unix/uxputty.c
+++ b/
unix/uxputty.c
@@
-31,23
+31,26
@@
void cleanup_exit(int code)
exit(code);
}
exit(code);
}
-Backend *select_backend(Conf
ig *cfg
)
+Backend *select_backend(Conf
*conf
)
{
{
- Backend *back = backend_from_proto(c
fg->protocol
);
+ Backend *back = backend_from_proto(c
onf_get_int(conf, CONF_protocol)
);
assert(back != NULL);
return back;
}
assert(back != NULL);
return back;
}
-int cfgbox(Conf
ig *cfg
)
+int cfgbox(Conf
*conf
)
{
{
- return do_config_box("PuTTY Configuration", cfg, 0, 0);
+ char *title = dupcat(appname, " Configuration", NULL);
+ int ret = do_config_box(title, conf, 0, 0);
+ sfree(title);
+ return ret;
}
static int got_host = 0;
const int use_event_log = 1, new_session = 1, saved_sessions = 1;
}
static int got_host = 0;
const int use_event_log = 1, new_session = 1, saved_sessions = 1;
-int process_nonoption_arg(char *arg, Conf
ig *cfg
, int *allow_launch)
+int process_nonoption_arg(char *arg, Conf
*conf
, int *allow_launch)
{
char *p, *q = arg;
{
char *p, *q = arg;
@@
-58,7
+61,7
@@
int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
* argument, so that it will be deferred until it's a good
* moment to run it.
*/
* argument, so that it will be deferred until it's a good
* moment to run it.
*/
- int ret = cmdline_process_param("-P", arg, 1, c
fg
);
+ int ret = cmdline_process_param("-P", arg, 1, c
onf
);
assert(ret == 2);
} else if (!strncmp(q, "telnet:", 7)) {
/*
assert(ret == 2);
} else if (!strncmp(q, "telnet:", 7)) {
/*
@@
-71,7
+74,7
@@
int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
q += 7;
if (q[0] == '/' && q[1] == '/')
q += 2;
q += 7;
if (q[0] == '/' && q[1] == '/')
q += 2;
- c
fg->protocol = PROT_TELNET
;
+ c
onf_set_int(conf, CONF_protocol, PROT_TELNET)
;
p = q;
while (*p && *p != ':' && *p != '/')
p++;
p = q;
while (*p && *p != ':' && *p != '/')
p++;
@@
-79,11
+82,10
@@
int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
if (*p)
*p++ = '\0';
if (c == ':')
if (*p)
*p++ = '\0';
if (c == ':')
- c
fg->port = atoi(p
);
+ c
onf_set_int(conf, CONF_port, atoi(p)
);
else
else
- cfg->port = -1;
- strncpy(cfg->host, q, sizeof(cfg->host) - 1);
- cfg->host[sizeof(cfg->host) - 1] = '\0';
+ conf_set_int(conf, CONF_port, -1);
+ conf_set_str(conf, CONF_host, q);
got_host = 1;
} else {
/*
got_host = 1;
} else {
/*
@@
-94,8
+96,7
@@
int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
p++;
if (*p)
*p++ = '\0';
p++;
if (*p)
*p++ = '\0';
- strncpy(cfg->host, q, sizeof(cfg->host) - 1);
- cfg->host[sizeof(cfg->host) - 1] = '\0';
+ conf_set_str(conf, CONF_host, q);
got_host = 1;
}
if (got_host)
got_host = 1;
}
if (got_host)
@@
-105,15
+106,13
@@
int process_nonoption_arg(char *arg, Config *cfg, int *allow_launch)
char *make_default_wintitle(char *hostname)
{
char *make_default_wintitle(char *hostname)
{
- return dupcat(hostname, " -
PuTTY"
, NULL);
+ return dupcat(hostname, " -
", appname
, NULL);
}
/*
* X11-forwarding-related things suitable for Gtk app.
*/
}
/*
* X11-forwarding-related things suitable for Gtk app.
*/
-const char platform_x11_best_transport[] = "unix";
-
char *platform_get_x_display(void) {
const char *display;
/* Try to take account of --display and what have you. */
char *platform_get_x_display(void) {
const char *display;
/* Try to take account of --display and what have you. */
@@
-126,6
+125,8
@@
char *platform_get_x_display(void) {
int main(int argc, char **argv)
{
extern int pt_main(int argc, char **argv);
int main(int argc, char **argv)
{
extern int pt_main(int argc, char **argv);
+ int ret;
+
sk_init();
flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
default_protocol = be_default_protocol;
sk_init();
flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
default_protocol = be_default_protocol;
@@
-136,5
+137,7
@@
int main(int argc, char **argv)
if (b)
default_port = b->default_port;
}
if (b)
default_port = b->default_port;
}
- return pt_main(argc, argv);
+ ret = pt_main(argc, argv);
+ cleanup_exit(ret);
+ return ret; /* not reached, but placates optimisers */
}
}