Ported from trunk:

  cvs up -j1.56 -j1.57 plink.c
  cvs up -j1.144 -j1.145 putty.h [svn diff -r1999:2000]
Remove "-log" option from Plink. AFAICT this code has been dead since Roman
Pompejus' improved logging (Jan 2001).

[originally from svn r2001]

diff --git a/plink.c b/plink.c
index 9229fa8ec9e7d39950725ba176496d79417fb856..ed4f134592527577ad75a5d57ee1cded5fd5f4ba 100644 (file)
--- a/plink.c
+++ b/plink.c
@@ -291,8 +291,6 @@ int main(int argc, char **argv)
                continue;
            } else if (!strcmp(p, "-batch")) {
                console_batch_mode = 1;
-           } else if (!strcmp(p, "-log")) {
-               logfile = "putty.log";
            }
        } else if (*p) {
            if (!*cfg.host) {

diff --git a/putty.h b/putty.h
index 46e39c6f853c766d9bf4c57a86eb81d74ebb47b6..d506b664aaa9cdfed0253e4c741ca509daf7eb20 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -132,7 +132,6 @@ GLOBAL unsigned char unitab_ctrl[256];
 #define LGTYP_ASCII 1                 /* logmode: pure ascii */
 #define LGTYP_DEBUG 2                 /* logmode: all chars of traffic */
 #define LGTYP_PACKETS 3                       /* logmode: SSH data packets */
-GLOBAL char *logfile;
 
 /*
  * Window handles for the dialog boxes that can be running during a