Merge upstream 0.66 tag

http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commit;h=8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d

1 files changed, 17 insertions, 0 deletions

diff --git a/CMDLINE.C b/CMDLINE.C
index c203408f..e4e18ce0 100644
--- a/CMDLINE.C
+++ b/CMDLINE.C
@@ -579,6 +579,23 @@ int cmdline_process_param(char *p, char *value, int need_save, Conf *conf)
 	    nextitem += length + skip;
 	}
     }
+
+    if (!strcmp(p, "-sessionlog") ||
+        !strcmp(p, "-sshlog") ||
+        !strcmp(p, "-sshrawlog")) {
+	Filename *fn;
+	RETURN(2);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
+	fn = filename_from_str(value);
+	conf_set_filename(conf, CONF_logfilename, fn);
+	conf_set_int(conf, CONF_logtype,
+                     !strcmp(p, "-sessionlog") ? LGTYP_DEBUG :
+                     !strcmp(p, "-sshlog") ? LGTYP_PACKETS :
+                     /* !strcmp(p, "-sshrawlog") ? */ LGTYP_SSHRAW);
+        filename_free(fn);
+    }
+
     return ret;			       /* unrecognised */
 }