X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/32874aeac8dacbca26663777b39a79efc5d8dc4b..2d466ffd08675d26db45e524c2fe6a8cf4628e2b:/settings.c

diff --git a/settings.c b/settings.c
index 3e9ee321..618d7538 100644
--- a/settings.c
+++ b/settings.c
@@ -34,18 +34,18 @@ void save_settings(char *section, int do_host, Config * cfg)
     write_setting_i(sesskey, "Present", 1);
     if (do_host) {
 	write_setting_s(sesskey, "HostName", cfg->host);
-	write_setting_i(sesskey, "PortNumber", cfg->port);
 	write_setting_s(sesskey, "LogFileName", cfg->logfilename);
 	write_setting_i(sesskey, "LogType", cfg->logtype);
 	write_setting_i(sesskey, "LogFileClash", cfg->logxfovr);
-	p = "raw";
-	for (i = 0; backends[i].name != NULL; i++)
-	    if (backends[i].protocol == cfg->protocol) {
-		p = backends[i].name;
-		break;
-	    }
-	write_setting_s(sesskey, "Protocol", p);
     }
+    p = "raw";
+    for (i = 0; backends[i].name != NULL; i++)
+	if (backends[i].protocol == cfg->protocol) {
+	    p = backends[i].name;
+	    break;
+	}
+    write_setting_s(sesskey, "Protocol", p);
+    write_setting_i(sesskey, "PortNumber", cfg->port);
     write_setting_i(sesskey, "CloseOnExit", cfg->close_on_exit);
     write_setting_i(sesskey, "WarnOnClose", !!cfg->warn_on_close);
     write_setting_i(sesskey, "PingInterval", cfg->ping_interval / 60);	/* minutes */
@@ -86,6 +86,7 @@ void save_settings(char *section, int do_host, Config * cfg)
     write_setting_s(sesskey, "PublicKeyFile", cfg->keyfile);
     write_setting_s(sesskey, "RemoteCommand", cfg->remote_cmd);
     write_setting_i(sesskey, "RFCEnviron", cfg->rfc_environ);
+    write_setting_i(sesskey, "PassiveTelnet", cfg->passive_telnet);
     write_setting_i(sesskey, "BackspaceIsDelete", cfg->bksp_is_delete);
     write_setting_i(sesskey, "RXVTHomeEnd", cfg->rxvt_homeend);
     write_setting_i(sesskey, "LinuxFunctionKeys", cfg->funky_type);
@@ -99,6 +100,7 @@ void save_settings(char *section, int do_host, Config * cfg)
     write_setting_i(sesskey, "AltOnly", cfg->alt_only);
     write_setting_i(sesskey, "ComposeKey", cfg->compose_key);
     write_setting_i(sesskey, "CtrlAltKeys", cfg->ctrlaltkeys);
+    write_setting_i(sesskey, "TelnetKey", cfg->telnet_keyboard);
     write_setting_i(sesskey, "LocalEcho", cfg->localecho);
     write_setting_i(sesskey, "LocalEdit", cfg->localedit);
     write_setting_s(sesskey, "Answerback", cfg->answerback);
@@ -148,10 +150,7 @@ void save_settings(char *section, int do_host, Config * cfg)
 	}
 	write_setting_s(sesskey, buf, buf2);
     }
-    write_setting_i(sesskey, "KoiWinXlat", cfg->xlat_enablekoiwin);
-    write_setting_i(sesskey, "88592Xlat", cfg->xlat_88592w1250);
-    write_setting_i(sesskey, "88592-CP852", cfg->xlat_88592cp852);
-    write_setting_i(sesskey, "CapsLockCyr", cfg->xlat_capslockcyr);
+    write_setting_s(sesskey, "LineCodePage", cfg->line_codepage);
     write_setting_i(sesskey, "ScrollBar", cfg->scrollbar);
     write_setting_i(sesskey, "ScrollOnKey", cfg->scroll_on_key);
     write_setting_i(sesskey, "ScrollOnDisp", cfg->scroll_on_disp);
@@ -248,6 +247,7 @@ void load_settings(char *section, int do_host, Config * cfg)
     gpps(sesskey, "RemoteCommand", "", cfg->remote_cmd,
 	 sizeof(cfg->remote_cmd));
     gppi(sesskey, "RFCEnviron", 0, &cfg->rfc_environ);
+    gppi(sesskey, "PassiveTelnet", 0, &cfg->passive_telnet);
     gppi(sesskey, "BackspaceIsDelete", 1, &cfg->bksp_is_delete);
     gppi(sesskey, "RXVTHomeEnd", 0, &cfg->rxvt_homeend);
     gppi(sesskey, "LinuxFunctionKeys", 0, &cfg->funky_type);
@@ -261,6 +261,7 @@ void load_settings(char *section, int do_host, Config * cfg)
     gppi(sesskey, "AltOnly", 0, &cfg->alt_only);
     gppi(sesskey, "ComposeKey", 0, &cfg->compose_key);
     gppi(sesskey, "CtrlAltKeys", 1, &cfg->ctrlaltkeys);
+    gppi(sesskey, "TelnetKey", 0, &cfg->telnet_keyboard);
     gppi(sesskey, "LocalEcho", LD_BACKEND, &cfg->localecho);
     gppi(sesskey, "LocalEdit", LD_BACKEND, &cfg->localedit);
     gpps(sesskey, "Answerback", "PuTTY", cfg->answerback,
@@ -270,7 +271,8 @@ void load_settings(char *section, int do_host, Config * cfg)
     gppi(sesskey, "SunkenEdge", 0, &cfg->sunken_edge);
     gppi(sesskey, "CurType", 0, &cfg->cursor_type);
     gppi(sesskey, "BlinkCur", 0, &cfg->blink_cur);
-    gppi(sesskey, "Beep", 1, &cfg->beep);
+    /* pedantic compiler tells me I can't use &cfg->beep as an int * :-) */
+    gppi(sesskey, "Beep", 1, &i); cfg->beep = i;
     gpps(sesskey, "BellWaveFile", "", cfg->bell_wavefile,
 	 sizeof(cfg->bell_wavefile));
     gppi(sesskey, "BellOverload", 1, &cfg->bellovl);
@@ -349,10 +351,8 @@ void load_settings(char *section, int do_host, Config * cfg)
 	    cfg->wordness[j] = atoi(q);
 	}
     }
-    gppi(sesskey, "KoiWinXlat", 0, &cfg->xlat_enablekoiwin);
-    gppi(sesskey, "88592Xlat", 0, &cfg->xlat_88592w1250);
-    gppi(sesskey, "88592-CP852", 0, &cfg->xlat_88592cp852);
-    gppi(sesskey, "CapsLockCyr", 0, &cfg->xlat_capslockcyr);
+    gpps(sesskey, "LineCodePage", "", cfg->line_codepage,
+	 sizeof(cfg->line_codepage));
     gppi(sesskey, "ScrollBar", 1, &cfg->scrollbar);
     gppi(sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key);
     gppi(sesskey, "ScrollOnDisp", 1, &cfg->scroll_on_disp);