X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6e8f9cab2a96d296bcc6717356782f3438cab80f..bccbeb7195c0a1b8bbc8a92f0c5f6e696c08cd8d:/logging.c

diff --git a/logging.c b/logging.c
index c448bd7e..bd5705cb 100644
--- a/logging.c
+++ b/logging.c
@@ -85,7 +85,7 @@ static void logfopen_callback(void *handle, int mode)
 	ctx->state = L_ERROR;	       /* disable logging */
     } else {
 	fmode = (mode == 1 ? "ab" : "wb");
-	ctx->lgfp = f_open(ctx->currlogfilename, fmode);
+	ctx->lgfp = f_open(ctx->currlogfilename, fmode, TRUE);
 	if (ctx->lgfp)
 	    ctx->state = L_OPEN;
 	else
@@ -149,7 +149,7 @@ void logfopen(void *handle)
     /* substitute special codes in file name */
     xlatlognam(&ctx->currlogfilename, ctx->cfg.logfilename,ctx->cfg.host, &tm);
 
-    ctx->lgfp = f_open(ctx->currlogfilename, "r");  /* file already present? */
+    ctx->lgfp = f_open(ctx->currlogfilename, "r", FALSE);  /* file already present? */
     if (ctx->lgfp) {
 	fclose(ctx->lgfp);
 	if (ctx->cfg.logxfovr != LGXF_ASK) {
@@ -204,6 +204,9 @@ void log_eventlog(void *handle, const char *event)
 	fprintf(stderr, "%s\n", event);
 	fflush(stderr);
     }
+    /* If we don't have a context yet (eg winnet.c init) then skip entirely */
+    if (!ctx)
+	return;
     if (ctx->cfg.logtype != LGTYP_PACKETS &&
 	ctx->cfg.logtype != LGTYP_SSHRAW)
 	return;