nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 09:12:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pre-0.64'

Browse Source
This commit is contained in:
Jacob Nevins 2015-01-08 23:50:34 +00:00
commit 954df095f4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unix/uxplink.c
View File

@ -119,8 +119,6 @@ char *platform_default_s(const char *name)
{ {
if (!strcmp(name, "TermType")) if (!strcmp(name, "TermType"))
return dupstr(getenv("TERM")); return dupstr(getenv("TERM"));
if (!strcmp(name, "UserName"))
return get_username();
if (!strcmp(name, "SerialLine")) if (!strcmp(name, "SerialLine"))
return dupstr("/dev/ttyS0"); return dupstr("/dev/ttyS0");
return NULL; return NULL;
@ -883,6 +881,18 @@ int main(int argc, char **argv)
*/ */
cmdline_run_saved(conf); cmdline_run_saved(conf);
/*
* If we have no better ideas for the remote username, use the local
* one, as 'ssh' does.
*/
if (conf_get_str(conf, CONF_username)[0] == '\0') {
char *user = get_username();
if (user) {
conf_set_str(conf, CONF_username, user);
sfree(user);
}
}
/* /*
* Apply subsystem status. * Apply subsystem status.
*/ */