~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Colin Watson reports that linking with 'gold' doesn't work, because
[sgt/putty]
/
unix
/
uxputty.c
diff --git
a/unix/uxputty.c
b/unix/uxputty.c
index
54e0d71
..
73e1197
100644
(file)
--- a/
unix/uxputty.c
+++ b/
unix/uxputty.c
@@
-33,20
+33,17
@@
void cleanup_exit(int code)
Backend *select_backend(Config *cfg)
{
Backend *select_backend(Config *cfg)
{
- int i;
- Backend *back = NULL;
- for (i = 0; backends[i].backend != NULL; i++)
- if (backends[i].protocol == cfg->protocol) {
- back = backends[i].backend;
- break;
- }
+ Backend *back = backend_from_proto(cfg->protocol);
assert(back != NULL);
return back;
}
int cfgbox(Config *cfg)
{
assert(back != NULL);
return back;
}
int cfgbox(Config *cfg)
{
- return do_config_box("PuTTY Configuration", cfg, 0, 0);
+ char *title = dupcat(appname, " Configuration", NULL);
+ int ret = do_config_box(title, cfg, 0, 0);
+ sfree(title);
+ return ret;
}
static int got_host = 0;
}
static int got_host = 0;
@@
-111,15
+108,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. */
@@
-137,13
+132,10
@@
int main(int argc, char **argv)
default_protocol = be_default_protocol;
/* Find the appropriate default port. */
{
default_protocol = be_default_protocol;
/* Find the appropriate default port. */
{
-
int i
;
+
Backend *b = backend_from_proto(default_protocol)
;
default_port = 0; /* illegal */
default_port = 0; /* illegal */
- for (i = 0; backends[i].backend != NULL; i++)
- if (backends[i].protocol == default_protocol) {
- default_port = backends[i].backend->default_port;
- break;
- }
+ if (b)
+ default_port = b->default_port;
}
return pt_main(argc, argv);
}
}
return pt_main(argc, argv);
}