Put the \001 prefix back on scp error messages when they're sent to

[u/mdw/putty] / settings.c

diff --git a/settings.c b/settings.c
index 3eec545..256e2b2 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -34,6 +34,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
        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) {
@@ -95,6 +96,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
     write_setting_i (sesskey, "AltSpace", cfg->alt_space);
     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, "LocalEcho", cfg->localecho);
     write_setting_i (sesskey, "LocalEdit", cfg->localedit);
     write_setting_s (sesskey, "Answerback", cfg->answerback);
@@ -103,6 +105,11 @@ void save_settings (char *section, int do_host, Config *cfg) {
     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_s (sesskey, "BellWaveFile", cfg->bell_wavefile);
+    write_setting_i (sesskey, "BellOverload", cfg->bellovl);
+    write_setting_i (sesskey, "BellOverloadN", cfg->bellovl_n);
+    write_setting_i (sesskey, "BellOverloadT", cfg->bellovl_t);
+    write_setting_i (sesskey, "BellOverloadS", cfg->bellovl_s);
     write_setting_i (sesskey, "ScrollbackLines", cfg->savelines);
     write_setting_i (sesskey, "DECOriginMode", cfg->dec_om);
     write_setting_i (sesskey, "AutoWrapMode", cfg->wrap_mode);
@@ -169,6 +176,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gpps (sesskey, "LogFileName", "putty.log",
          cfg->logfilename, sizeof(cfg->logfilename));
     gppi (sesskey, "LogType", 0, &cfg->logtype);
+    gppi (sesskey, "LogFileClash", LGXF_ASK, &cfg->logxfovr);
 
     gpps (sesskey, "Protocol", "default", prot, 10);
     cfg->protocol = default_protocol;
@@ -246,6 +254,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "AltSpace", 0, &cfg->alt_space);
     gppi (sesskey, "AltOnly", 0, &cfg->alt_only);
     gppi (sesskey, "ComposeKey", 0, &cfg->compose_key);
+    gppi (sesskey, "CtrlAltKeys", 1, &cfg->ctrlaltkeys);
     gppi (sesskey, "LocalEcho", LD_BACKEND, &cfg->localecho);
     gppi (sesskey, "LocalEdit", LD_BACKEND, &cfg->localedit);
     gpps (sesskey, "Answerback", "PuTTY", cfg->answerback, sizeof(cfg->answerback));
@@ -254,6 +263,12 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "CurType", 0, &cfg->cursor_type);
     gppi (sesskey, "BlinkCur", 0, &cfg->blink_cur);
     gppi (sesskey, "Beep", 1, &cfg->beep);
+    gpps (sesskey, "BellWaveFile", "", cfg->bell_wavefile,
+         sizeof(cfg->bell_wavefile));
+    gppi (sesskey, "BellOverload", 1, &cfg->bellovl);
+    gppi (sesskey, "BellOverloadN", 5, &cfg->bellovl_n);
+    gppi (sesskey, "BellOverloadT", 2000, &cfg->bellovl_t);
+    gppi (sesskey, "BellOverloadS", 5000, &cfg->bellovl_s);
     gppi (sesskey, "ScrollbackLines", 200, &cfg->savelines);
     gppi (sesskey, "DECOriginMode", 0, &cfg->dec_om);
     gppi (sesskey, "AutoWrapMode", 1, &cfg->wrap_mode);