First phase of porting. pterm now compiles and runs under Linux+gtk.

[u/mdw/putty] / logging.c

diff --git a/logging.c b/logging.c
index 76dcb95..c843118 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -1,5 +1,3 @@
-#include <windows.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -11,7 +9,6 @@
 
 /* log session to file stuff ... */
 static FILE *lgfp = NULL;
-static char timdatbuf[20];
 static char currlogfilename[FILENAME_MAX];
 
 static void xlatlognam(char *d, char *s, char *hostname, struct tm *tm);
@@ -33,11 +30,24 @@ void logtraffic(unsigned char c, int logmode)
 }
 
 /*
+ * Log an Event Log entry (used in SSH packet logging mode).
+ */
+void log_eventlog(char *event)
+{
+    if (cfg.logtype != LGTYP_PACKETS)
+       return;
+    if (!lgfp)
+       logfopen();
+    if (lgfp)
+       fprintf(lgfp, "Event Log: %s\n", event);
+}
+
+/*
  * Log an SSH packet.
  */
 void log_packet(int direction, int type, char *texttype, void *data, int len)
 {
-    int i, j, c;
+    int i, j;
     char dumpdata[80], smalldata[5];
 
     if (cfg.logtype != LGTYP_PACKETS)
@@ -72,6 +82,10 @@ void logfopen(void)
     struct tm tm;
     char writemod[4];
 
+    /* Prevent repeat calls */
+    if (lgfp)
+       return;
+
     if (!cfg.logtype)
        return;
     sprintf(writemod, "wb");          /* default to rewrite */
@@ -98,20 +112,21 @@ void logfopen(void)
 
     lgfp = fopen(currlogfilename, writemod);
     if (lgfp) {                               /* enter into event log */
-       sprintf(buf, "%s session log (%s mode) to file : ",
+       /* --- write header line into log file */
+       fputs("=~=~=~=~=~=~=~=~=~=~=~= PuTTY log ", lgfp);
+       strftime(buf, 24, "%Y.%m.%d %H:%M:%S", &tm);
+       fputs(buf, lgfp);
+       fputs(" =~=~=~=~=~=~=~=~=~=~=~=\r\n", lgfp);
+
+       sprintf(buf, "%s session log (%s mode) to file: ",
                (writemod[0] == 'a') ? "Appending" : "Writing new",
                (cfg.logtype == LGTYP_ASCII ? "ASCII" :
-                cfg.logtype == LGTYP_DEBUG ? "raw" : "<ukwn>"));
+                cfg.logtype == LGTYP_DEBUG ? "raw" :
+                cfg.logtype == LGTYP_PACKETS ? "SSH packets" : "<ukwn>"));
        /* Make sure we do not exceed the output buffer size */
        strncat(buf, currlogfilename, 128);
        buf[strlen(buf)] = '\0';
        logevent(buf);
-
-       /* --- write header line into log file */
-       fputs("=~=~=~=~=~=~=~=~=~=~=~= PuTTY log ", lgfp);
-       strftime(buf, 24, "%Y.%m.%d %H:%M:%S", &tm);
-       fputs(buf, lgfp);
-       fputs(" =~=~=~=~=~=~=~=~=~=~=~=\r\n", lgfp);
     }
 }
 
@@ -132,7 +147,6 @@ void logfclose(void)
 static void xlatlognam(char *d, char *s, char *hostname, struct tm *tm) {
     char buf[10], *bufp;
     int size;
-    char *ds = d; /* save start pos. */
     int len = FILENAME_MAX-1;
 
     while (*s) {
@@ -141,6 +155,7 @@ static void xlatlognam(char *d, char *s, char *hostname, struct tm *tm) {
        if (*s == '&') {
            char c;
            s++;
+           size = 0;
            if (*s) switch (c = *s++, tolower(c)) {
              case 'y':
                size = strftime(buf, sizeof(buf), "%Y", tm);