Merge r9365 (bump version number to 0.62).

[PuTTY.git] / logging.c

diff --git a/logging.c b/logging.c
index 49269ec3c949efcd5a63044304a03f6ac83b4a1c..7465480423421606defe0b3c25d45634d168d7e0 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -43,9 +43,12 @@ static void logwrite(struct LogContext *ctx, void *data, int len)
        bufchain_add(&ctx->queue, data, len);
     } else if (ctx->state == L_OPEN) {
        assert(ctx->lgfp);
-       if (fwrite(data, 1, len, ctx->lgfp) < len) {
+       if (fwrite(data, 1, len, ctx->lgfp) < (size_t)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" :