Experimental Rlogin support, thanks to Delian Delchev. Local flow

[u/mdw/putty] / settings.c

diff --git a/settings.c b/settings.c
index a541441..67fd748 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -3,14 +3,8 @@
  */
 
 #include <windows.h>
-#ifndef AUTO_WINSOCK
-#ifdef WINSOCK_TWO
-#include <winsock2.h>
-#else
-#include <winsock.h>
-#endif
-#endif
 #include <stdio.h>
+#include <stdlib.h>
 #include "putty.h"
 #include "storage.h"
 
@@ -38,6 +32,8 @@ void save_settings (char *section, int do_host, Config *cfg) {
     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);
         p = "raw";
         for (i = 0; backends[i].name != NULL; i++)
             if (backends[i].protocol == cfg->protocol) {
@@ -48,7 +44,8 @@ void save_settings (char *section, int do_host, Config *cfg) {
     }
     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_i (sesskey, "PingInterval", cfg->ping_interval / 60);     /* minutes */
+    write_setting_i (sesskey, "PingIntervalSecs", cfg->ping_interval % 60); /* seconds */
     write_setting_s (sesskey, "TerminalType", cfg->termtype);
     write_setting_s (sesskey, "TerminalSpeed", cfg->termspeed);
     {
@@ -71,7 +68,9 @@ void save_settings (char *section, int do_host, Config *cfg) {
        write_setting_s (sesskey, "Environment", buf);
     }
     write_setting_s (sesskey, "UserName", cfg->username);
+    write_setting_s (sesskey, "LocalUserName", cfg->localusername);
     write_setting_i (sesskey, "NoPTY", cfg->nopty);
+    write_setting_i (sesskey, "Compression", cfg->compression);
     write_setting_i (sesskey, "AgentFwd", cfg->agentfwd);
     write_setting_s (sesskey, "RemoteCmd", cfg->remote_cmd);
     write_setting_s (sesskey, "Cipher", cfg->cipher == CIPHER_BLOWFISH ? "blowfish" :
@@ -85,6 +84,8 @@ void save_settings (char *section, int do_host, Config *cfg) {
     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);
+    write_setting_i (sesskey, "NoApplicationKeys", cfg->no_applic_k);
+    write_setting_i (sesskey, "NoApplicationCursors", cfg->no_applic_c);
     write_setting_i (sesskey, "ApplicationCursorKeys", cfg->app_cursor);
     write_setting_i (sesskey, "ApplicationKeypad", cfg->app_keypad);
     write_setting_i (sesskey, "NetHackKeypad", cfg->nethack_keypad);
@@ -93,6 +94,8 @@ 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, "LdiscTerm", cfg->ldisc_term);
+    write_setting_i (sesskey, "AlwaysOnTop", cfg->alwaysontop);
+    write_setting_i (sesskey, "CurType", cfg->cursor_type);
     write_setting_i (sesskey, "BlinkCur", cfg->blink_cur);
     write_setting_i (sesskey, "Beep", cfg->beep);
     write_setting_i (sesskey, "ScrollbackLines", cfg->savelines);
@@ -152,6 +155,9 @@ void load_settings (char *section, int do_host, Config *cfg) {
 
     gpps (sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
     gppi (sesskey, "PortNumber", default_port, &cfg->port);
+    gpps (sesskey, "LogFileName", "putty.log",
+         cfg->logfilename, sizeof(cfg->logfilename));
+    gppi (sesskey, "LogType", 0, &cfg->logtype);
 
     gpps (sesskey, "Protocol", "default", prot, 10);
     cfg->protocol = default_protocol;
@@ -163,7 +169,13 @@ void load_settings (char *section, int do_host, Config *cfg) {
 
     gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
     gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
-    gppi (sesskey, "PingInterval", 0, &cfg->ping_interval);
+    {
+      /* This is two values for backward compatibility with 0.50/0.51 */
+      int pingmin, pingsec;
+      gppi (sesskey, "PingInterval", 0, &pingmin);
+      gppi (sesskey, "PingIntervalSecs", 0, &pingsec);
+      cfg->ping_interval = pingmin*60 + pingsec;
+    }
     gpps (sesskey, "TerminalType", "xterm", cfg->termtype,
          sizeof(cfg->termtype));
     gpps (sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed,
@@ -188,7 +200,9 @@ void load_settings (char *section, int do_host, Config *cfg) {
        *q = '\0';
     }
     gpps (sesskey, "UserName", "", cfg->username, sizeof(cfg->username));
+    gpps (sesskey, "LocalUserName", "", cfg->localusername, sizeof(cfg->localusername));
     gppi (sesskey, "NoPTY", 0, &cfg->nopty);
+    gppi (sesskey, "Compression", 0, &cfg->compression);
     gppi (sesskey, "AgentFwd", 0, &cfg->agentfwd);
     gpps (sesskey, "RemoteCmd", "", cfg->remote_cmd, sizeof(cfg->remote_cmd));
     {
@@ -211,6 +225,8 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "BackspaceIsDelete", 1, &cfg->bksp_is_delete);
     gppi (sesskey, "RXVTHomeEnd", 0, &cfg->rxvt_homeend);
     gppi (sesskey, "LinuxFunctionKeys", 0, &cfg->funky_type);
+    gppi (sesskey, "NoApplicationKeys", 0, &cfg->no_applic_k);
+    gppi (sesskey, "NoApplicationCursors", 0, &cfg->no_applic_c);
     gppi (sesskey, "ApplicationCursorKeys", 0, &cfg->app_cursor);
     gppi (sesskey, "ApplicationKeypad", 0, &cfg->app_keypad);
     gppi (sesskey, "NetHackKeypad", 0, &cfg->nethack_keypad);
@@ -219,6 +235,8 @@ 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, "LdiscTerm", 0, &cfg->ldisc_term);
+    gppi (sesskey, "AlwaysOnTop", 0, &cfg->alwaysontop);
+    gppi (sesskey, "CurType", 0, &cfg->cursor_type);
     gppi (sesskey, "BlinkCur", 0, &cfg->blink_cur);
     gppi (sesskey, "Beep", 1, &cfg->beep);
     gppi (sesskey, "ScrollbackLines", 200, &cfg->savelines);