From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Sun, 30 Aug 2009 11:09:22 +0000 (+0000)
Subject: Minor improvements to error reporting in logging.
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/ea5c6c702ec5543e6f5518ffd482291addb63e51?hp=e436e0602b66c82acf0741ced8f9a19bd2060e70

Minor improvements to error reporting in logging.


git-svn-id: svn://svn.tartarus.org/sgt/putty@8637 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/logging.c b/logging.c
index 49269ec3..7c9b1287 100644
--- a/logging.c
+++ b/logging.c
@@ -46,6 +46,9 @@ static void logwrite(struct LogContext *ctx, void *data, int len)
 	if (fwrite(data, 1, len, ctx->lgfp) < len) {
 	    logfclose(ctx);
 	    ctx->state = L_ERROR;
+	    /* Log state is L_ERROR so this won't cause a loop */
+	    logevent(ctx->frontend,
+		     "Disabled writing session log due to error while writing");
 	}
     }				       /* else L_ERROR, so ignore the write */
 }
@@ -104,8 +107,9 @@ static void logfopen_callback(void *handle, int mode)
     }
 
     event = dupprintf("%s session log (%s mode) to file: %s",
-		      (mode == 0 ? "Disabled writing" :
-                       mode == 1 ? "Appending" : "Writing new"),
+		      ctx->state == L_ERROR ?
+		      (mode == 0 ? "Disabled writing" : "Error writing") :
+		      (mode == 1 ? "Appending" : "Writing new"),
 		      (ctx->cfg.logtype == LGTYP_ASCII ? "ASCII" :
 		       ctx->cfg.logtype == LGTYP_DEBUG ? "raw" :
 		       ctx->cfg.logtype == LGTYP_PACKETS ? "SSH packets" :