*/
#include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
#include <stdio.h>
#include "putty.h"
#include "storage.h"
}
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);
write_setting_s (sesskey, "TerminalType", cfg->termtype);
write_setting_s (sesskey, "TerminalSpeed", cfg->termspeed);
{
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);
}
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);
gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
+ gppi (sesskey, "PingInterval", 0, &cfg->ping_interval);
gpps (sesskey, "TerminalType", "xterm", cfg->termtype,
sizeof(cfg->termtype));
gpps (sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed,
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,
}
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);
load_settings ("Default Settings", FALSE, cfg);
}
+static int sessioncmp(const void *av, const void *bv) {
+ const char *a = *(const char *const *)av;
+ const char *b = *(const char *const *)bv;
+
+ /*
+ * Alphabetical order, except that "Default Settings" is a
+ * special case and comes first.
+ */
+ if (!strcmp(a, "Default Settings"))
+ return -1; /* a comes first */
+ if (!strcmp(b, "Default Settings"))
+ return +1; /* b comes first */
+ return strcmp(a, b); /* otherwise, compare normally */
+}
+
void get_sesslist(int allocate) {
static char otherbuf[2048];
static char *buffer;
buffer[buflen] = '\0';
p = buffer;
- nsessions = 1; /* "Default Settings" counts as one */
+ nsessions = 0;
while (*p) {
- if (strcmp(p, "Default Settings"))
- nsessions++;
+ nsessions++;
while (*p) p++;
p++;
}
sessions = smalloc(nsessions * sizeof(char *));
- sessions[0] = "Default Settings";
p = buffer;
- i = 1;
+ i = 0;
while (*p) {
- if (strcmp(p, "Default Settings"))
- sessions[i++] = p;
+ sessions[i++] = p;
while (*p) p++;
p++;
}
+
+ qsort(sessions, i, sizeof(char *), sessioncmp);
} else {
sfree (buffer);
sfree (sessions);