X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/ec55b2200b3a40631648cfa02ed63207b58832fe..2221af18439a29baed19df4467fc8ba7112712b7:/settings.c?ds=sidebyside

diff --git a/settings.c b/settings.c
index 36db32ee..69394f27 100644
--- a/settings.c
+++ b/settings.c
@@ -78,6 +78,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
                              cfg->cipher == CIPHER_DES ? "des" : "3des");
     write_setting_i (sesskey, "AuthTIS", cfg->try_tis_auth);
     write_setting_i (sesskey, "SshProt", cfg->sshprot);
+    write_setting_i (sesskey, "BuggyMAC", cfg->buggymac);
     write_setting_s (sesskey, "PublicKeyFile", cfg->keyfile);
     write_setting_s (sesskey, "RemoteCommand", cfg->remote_cmd);
     write_setting_i (sesskey, "RFCEnviron", cfg->rfc_environ);
@@ -128,6 +129,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
     }
     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_i (sesskey, "ScrollBar", cfg->scrollbar);
     write_setting_i (sesskey, "ScrollOnKey", cfg->scroll_on_key);
@@ -197,6 +199,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
 	    cfg->cipher = CIPHER_3DES;
     }
     gppi (sesskey, "SshProt", 1, &cfg->sshprot);
+    gppi (sesskey, "BuggyMAC", 0, &cfg->buggymac);
     gppi (sesskey, "AuthTIS", 0, &cfg->try_tis_auth);
     gpps (sesskey, "PublicKeyFile", "", cfg->keyfile, sizeof(cfg->keyfile));
     gpps (sesskey, "RemoteCommand", "", cfg->remote_cmd,
@@ -272,6 +275,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
     }
     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);
     gppi (sesskey, "ScrollBar", 1, &cfg->scrollbar);
     gppi (sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key);
@@ -334,19 +338,28 @@ void get_sesslist(int allocate) {
 	buffer = srealloc(buffer, buflen+1);
 	buffer[buflen] = '\0';
 
+	/*
+	 * Now set up the list of sessions. Note that "Default
+	 * Settings" must always be claimed to exist, even if it
+	 * doesn't really.
+	 */
+
 	p = buffer;
-	nsessions = 0;
+	nsessions = 1;		       /* "Default Settings" counts as one */
 	while (*p) {
-            nsessions++;
+            if (strcmp(p, "Default Settings"))
+		nsessions++;
 	    while (*p) p++;
 	    p++;
 	}
 
-	sessions = smalloc(nsessions * sizeof(char *));
+	sessions = smalloc((nsessions+1) * sizeof(char *));
+	sessions[0] = "Default Settings";
 	p = buffer;
-	i = 0;
+	i = 1;
 	while (*p) {
-            sessions[i++] = p;
+            if (strcmp(p, "Default Settings"))
+		sessions[i++] = p;
 	    while (*p) p++;
 	    p++;
 	}