X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d082ac49971a1c1a9e84c5b201c30aab675f154f..88103a480c4ed348f28fc9fc20cfc4641206b92c:/settings.c diff --git a/settings.c b/settings.c index 9530b4ae..2dadfa01 100644 --- a/settings.c +++ b/settings.c @@ -20,16 +20,26 @@ static const struct keyval ciphernames[] = { { "des", CIPHER_DES } }; -static void gpps(void *handle, char *name, char *def, char *val, int len) +static void gpps(void *handle, const char *name, const char *def, + char *val, int len) { if (!read_setting_s(handle, name, val, len)) { - strncpy(val, def, len); + char *pdef; + + pdef = platform_default_s(name); + if (pdef) { + strncpy(val, pdef, len); + } else { + strncpy(val, def, len); + } + val[len - 1] = '\0'; } } static void gppi(void *handle, char *name, int def, int *i) { + def = platform_default_i(name, def); *i = read_setting_i(handle, name, def); } @@ -117,13 +127,19 @@ static void wprefs(void *sesskey, char *name, void save_settings(char *section, int do_host, Config * cfg) { - int i; - char *p; void *sesskey; sesskey = open_settings_w(section); if (!sesskey) return; + save_open_settings(sesskey, do_host, cfg); + close_settings_w(sesskey); +} + +void save_open_settings(void *sesskey, int do_host, Config *cfg) +{ + int i; + char *p; write_setting_i(sesskey, "Present", 1); if (do_host) { @@ -140,7 +156,9 @@ void save_settings(char *section, int do_host, Config * cfg) } write_setting_s(sesskey, "Protocol", p); write_setting_i(sesskey, "PortNumber", cfg->port); - write_setting_i(sesskey, "CloseOnExit", cfg->close_on_exit); + /* The CloseOnExit numbers are arranged in a different order from + * the standard FORCE_ON / FORCE_OFF / AUTO. */ + write_setting_i(sesskey, "CloseOnExit", (cfg->close_on_exit+2)%3); write_setting_i(sesskey, "WarnOnClose", !!cfg->warn_on_close); write_setting_i(sesskey, "PingInterval", cfg->ping_interval / 60); /* minutes */ write_setting_i(sesskey, "PingIntervalSecs", cfg->ping_interval % 60); /* seconds */ @@ -150,6 +168,8 @@ void save_settings(char *section, int do_host, Config * cfg) /* proxy settings */ write_setting_s(sesskey, "ProxyExcludeList", cfg->proxy_exclude_list); + write_setting_i(sesskey, "ProxyDNS", (cfg->proxy_dns+2)%3); + write_setting_i(sesskey, "ProxyLocalhost", cfg->even_proxy_localhost); write_setting_i(sesskey, "ProxyType", cfg->proxy_type); write_setting_s(sesskey, "ProxyHost", cfg->proxy_host); write_setting_i(sesskey, "ProxyPort", cfg->proxy_port); @@ -281,6 +301,7 @@ void save_settings(char *section, int do_host, Config * cfg) write_setting_i(sesskey, "BlinkText", cfg->blinktext); write_setting_i(sesskey, "X11Forward", cfg->x11_forward); write_setting_s(sesskey, "X11Display", cfg->x11_display); + write_setting_i(sesskey, "X11AuthType", cfg->x11_auth); write_setting_i(sesskey, "LocalPortAcceptAll", cfg->lport_acceptall); write_setting_i(sesskey, "RemotePortAcceptAll", cfg->rport_acceptall); { @@ -302,28 +323,33 @@ void save_settings(char *section, int do_host, Config * cfg) *p = '\0'; write_setting_s(sesskey, "PortForwardings", buf); } - write_setting_i(sesskey, "BugIgnore1", cfg->sshbug_ignore1); - write_setting_i(sesskey, "BugPlainPW1", cfg->sshbug_plainpw1); - write_setting_i(sesskey, "BugRSA1", cfg->sshbug_rsa1); - write_setting_i(sesskey, "BugHMAC2", cfg->sshbug_hmac2); - write_setting_i(sesskey, "BugDeriveKey2", cfg->sshbug_derivekey2); - write_setting_i(sesskey, "BugRSAPad2", cfg->sshbug_rsapad2); - write_setting_i(sesskey, "BugDHGEx2", cfg->sshbug_dhgex2); + write_setting_i(sesskey, "BugIgnore1", 2-cfg->sshbug_ignore1); + write_setting_i(sesskey, "BugPlainPW1", 2-cfg->sshbug_plainpw1); + write_setting_i(sesskey, "BugRSA1", 2-cfg->sshbug_rsa1); + write_setting_i(sesskey, "BugHMAC2", 2-cfg->sshbug_hmac2); + write_setting_i(sesskey, "BugDeriveKey2", 2-cfg->sshbug_derivekey2); + write_setting_i(sesskey, "BugRSAPad2", 2-cfg->sshbug_rsapad2); + write_setting_i(sesskey, "BugDHGEx2", 2-cfg->sshbug_dhgex2); write_setting_i(sesskey, "StampUtmp", cfg->stamp_utmp); write_setting_i(sesskey, "LoginShell", cfg->login_shell); write_setting_i(sesskey, "ScrollbarOnLeft", cfg->scrollbar_on_left); write_setting_s(sesskey, "BoldFont", cfg->boldfont); write_setting_i(sesskey, "ShadowBoldOffset", cfg->shadowboldoffset); - close_settings_w(sesskey); } void load_settings(char *section, int do_host, Config * cfg) { - int i; - char prot[10]; void *sesskey; sesskey = open_settings_r(section); + load_open_settings(sesskey, do_host, cfg); + close_settings_r(sesskey); +} + +void load_open_settings(void *sesskey, int do_host, Config *cfg) +{ + int i; + char prot[10]; cfg->ssh_subsys = 0; /* FIXME: load this properly */ cfg->remote_cmd_ptr = cfg->remote_cmd; @@ -349,23 +375,9 @@ void load_settings(char *section, int do_host, Config * cfg) break; } - /* - * CloseOnExit defaults to closing only on a clean exit - but - * unfortunately not on Unix (pterm). On Unix, the exit code of - * a shell is the last exit code of one of its child processes, - * even if it's an interactive shell - so some pterms will - * close and some will not for no particularly good reason. The - * mode is still useful for specialist purposes (running a - * single command in its own pterm), but I don't think it's a - * sane default, unfortunately. - */ - gppi(sesskey, "CloseOnExit", -#ifdef _WINDOWS - COE_NORMAL, -#else - COE_ALWAYS, -#endif - &cfg->close_on_exit); + /* The CloseOnExit numbers are arranged in a different order from + * the standard FORCE_ON / FORCE_OFF / AUTO. */ + gppi(sesskey, "CloseOnExit", 1, &i); cfg->close_on_exit = (i+1)%3; gppi(sesskey, "WarnOnClose", 1, &cfg->warn_on_close); { /* This is two values for backward compatibility with 0.50/0.51 */ @@ -383,7 +395,9 @@ void load_settings(char *section, int do_host, Config * cfg) /* proxy settings */ gpps(sesskey, "ProxyExcludeList", "", cfg->proxy_exclude_list, sizeof(cfg->proxy_exclude_list)); - gppi(sesskey, "ProxyType", PROXY_NONE, &i); cfg->proxy_type = i; + gppi(sesskey, "ProxyDNS", 1, &i); cfg->proxy_dns = (i+1)%3; + gppi(sesskey, "ProxyLocalhost", 0, &cfg->even_proxy_localhost); + gppi(sesskey, "ProxyType", PROXY_NONE, &cfg->proxy_type); gpps(sesskey, "ProxyHost", "proxy", cfg->proxy_host, sizeof(cfg->proxy_host)); gppi(sesskey, "ProxyPort", 80, &cfg->proxy_port); @@ -454,8 +468,8 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "CtrlAltKeys", 1, &cfg->ctrlaltkeys); gppi(sesskey, "TelnetKey", 0, &cfg->telnet_keyboard); gppi(sesskey, "TelnetRet", 1, &cfg->telnet_newline); - gppi(sesskey, "LocalEcho", LD_BACKEND, &cfg->localecho); - gppi(sesskey, "LocalEdit", LD_BACKEND, &cfg->localedit); + gppi(sesskey, "LocalEcho", AUTO, &cfg->localecho); + gppi(sesskey, "LocalEdit", AUTO, &cfg->localedit); gpps(sesskey, "Answerback", "PuTTY", cfg->answerback, sizeof(cfg->answerback)); gppi(sesskey, "AlwaysOnTop", 0, &cfg->alwaysontop); @@ -466,8 +480,8 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "CurType", 0, &cfg->cursor_type); gppi(sesskey, "BlinkCur", 0, &cfg->blink_cur); /* pedantic compiler tells me I can't use &cfg->beep as an int * :-) */ - gppi(sesskey, "Beep", 1, &i); cfg->beep = i; - gppi(sesskey, "BeepInd", 0, &i); cfg->beep_ind = i; + gppi(sesskey, "Beep", 1, &cfg->beep); + gppi(sesskey, "BeepInd", 0, &cfg->beep_ind); gpps(sesskey, "BellWaveFile", "", cfg->bell_wavefile, sizeof(cfg->bell_wavefile)); gppi(sesskey, "BellOverload", 1, &cfg->bellovl); @@ -478,21 +492,13 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "DECOriginMode", 0, &cfg->dec_om); gppi(sesskey, "AutoWrapMode", 1, &cfg->wrap_mode); gppi(sesskey, "LFImpliesCR", 0, &cfg->lfhascr); - gppi(sesskey, "WinNameAlways", 0, &cfg->win_name_always); + gppi(sesskey, "WinNameAlways", 1, &cfg->win_name_always); gpps(sesskey, "WinTitle", "", cfg->wintitle, sizeof(cfg->wintitle)); gppi(sesskey, "TermWidth", 80, &cfg->width); gppi(sesskey, "TermHeight", 24, &cfg->height); -#ifdef _WINDOWS - gpps(sesskey, "Font", "Courier New", cfg->font, sizeof(cfg->font)); -#elif defined(macintosh) - gpps(sesskey, "Font", "Monaco", cfg->font, sizeof(cfg->font)); -#else - gpps(sesskey, "Font", "fixed", cfg->font, sizeof(cfg->font)); -#endif + gpps(sesskey, "Font", "XXX", cfg->font, sizeof(cfg->font)); gppi(sesskey, "FontIsBold", 0, &cfg->fontisbold); -#ifdef _WINDOWS - gppi(sesskey, "FontCharSet", ANSI_CHARSET, &cfg->fontcharset); -#endif + gppi(sesskey, "FontCharSet", 0, &cfg->fontcharset); gppi(sesskey, "FontHeight", 10, &cfg->fontheight); #ifdef _WINDOWS if (cfg->fontheight < 0) { @@ -512,7 +518,7 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "TryPalette", 0, &cfg->try_palette); gppi(sesskey, "BoldAsColour", 1, &cfg->bold_colour); for (i = 0; i < 22; i++) { - static char *defaults[] = { + static const char *const defaults[] = { "187,187,187", "255,255,255", "0,0,0", "85,85,85", "0,0,0", "0,255,0", "0,0,0", "85,85,85", "187,0,0", "255,85,85", "0,187,0", "85,255,85", "187,187,0", "255,255,85", "0,0,187", @@ -529,22 +535,13 @@ void load_settings(char *section, int do_host, Config * cfg) cfg->colours[i][2] = c2; } } -#ifndef _WINDOWS - /* Non-raw cut and paste of line-drawing chars works badly on the - * current Unix stub implementation of the Unicode functions. - * So I'm going to temporarily set the default to raw mode so - * that the failure mode isn't quite so drastically horrid. - * When Unicode comes in, this can all be put right. */ - gppi(sesskey, "RawCNP", 1, &cfg->rawcnp); -#else gppi(sesskey, "RawCNP", 0, &cfg->rawcnp); -#endif gppi(sesskey, "PasteRTF", 0, &cfg->rtf_paste); gppi(sesskey, "MouseIsXterm", 0, &cfg->mouse_is_xterm); gppi(sesskey, "RectSelect", 0, &cfg->rect_select); gppi(sesskey, "MouseOverride", 1, &cfg->mouse_override); for (i = 0; i < 256; i += 32) { - static char *defaults[] = { + static const char *const defaults[] = { "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0", "0,1,2,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1", "1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,2", @@ -580,12 +577,13 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "ScrollBarFullScreen", 0, &cfg->scrollbar_in_fullscreen); gppi(sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key); gppi(sesskey, "ScrollOnDisp", 1, &cfg->scroll_on_disp); - gppi(sesskey, "LockSize", 0, &i); cfg->resize_action = i; + gppi(sesskey, "LockSize", 0, &cfg->resize_action); gppi(sesskey, "BCE", 1, &cfg->bce); gppi(sesskey, "BlinkText", 0, &cfg->blinktext); gppi(sesskey, "X11Forward", 0, &cfg->x11_forward); gpps(sesskey, "X11Display", "localhost:0", cfg->x11_display, sizeof(cfg->x11_display)); + gppi(sesskey, "X11AuthType", X11_MIT, &cfg->x11_auth); gppi(sesskey, "LocalPortAcceptAll", 0, &cfg->lport_acceptall); gppi(sesskey, "RemotePortAcceptAll", 0, &cfg->rport_acceptall); @@ -609,28 +607,26 @@ void load_settings(char *section, int do_host, Config * cfg) } *q = '\0'; } - gppi(sesskey, "BugIgnore1", BUG_AUTO, &i); cfg->sshbug_ignore1 = i; - gppi(sesskey, "BugPlainPW1", BUG_AUTO, &i); cfg->sshbug_plainpw1 = i; - gppi(sesskey, "BugRSA1", BUG_AUTO, &i); cfg->sshbug_rsa1 = i; + gppi(sesskey, "BugIgnore1", 0, &i); cfg->sshbug_ignore1 = 2-i; + gppi(sesskey, "BugPlainPW1", 0, &i); cfg->sshbug_plainpw1 = 2-i; + gppi(sesskey, "BugRSA1", 0, &i); cfg->sshbug_rsa1 = 2-i; { int i; - gppi(sesskey, "BugHMAC2", BUG_AUTO, &i); cfg->sshbug_hmac2 = i; - if (cfg->sshbug_hmac2 == BUG_AUTO) { + gppi(sesskey, "BugHMAC2", 0, &i); cfg->sshbug_hmac2 = 2-i; + if (cfg->sshbug_hmac2 == AUTO) { gppi(sesskey, "BuggyMAC", 0, &i); if (i == 1) - cfg->sshbug_hmac2 = BUG_ON; + cfg->sshbug_hmac2 = FORCE_ON; } } - gppi(sesskey, "BugDeriveKey2", BUG_AUTO, &i); cfg->sshbug_derivekey2 = i; - gppi(sesskey, "BugRSAPad2", BUG_AUTO, &i); cfg->sshbug_rsapad2 = i; - gppi(sesskey, "BugDHGEx2", BUG_AUTO, &i); cfg->sshbug_dhgex2 = i; + gppi(sesskey, "BugDeriveKey2", 0, &i); cfg->sshbug_derivekey2 = 2-i; + gppi(sesskey, "BugRSAPad2", 0, &i); cfg->sshbug_rsapad2 = 2-i; + gppi(sesskey, "BugDHGEx2", 0, &i); cfg->sshbug_dhgex2 = 2-i; gppi(sesskey, "StampUtmp", 1, &cfg->stamp_utmp); gppi(sesskey, "LoginShell", 1, &cfg->login_shell); gppi(sesskey, "ScrollbarOnLeft", 0, &cfg->scrollbar_on_left); gpps(sesskey, "BoldFont", "", cfg->boldfont, sizeof(cfg->boldfont)); gppi(sesskey, "ShadowBoldOffset", 1, &cfg->shadowboldoffset); - - close_settings_r(sesskey); } void do_defaults(char *session, Config * cfg)