From e599810ffaa6412326f61d026fc598c721b3a01c Mon Sep 17 00:00:00 2001 From: Mihail Zenkov Date: Thu, 31 Mar 2016 11:33:11 +0000 Subject: Don't add new message to logf when we dump it to file Fix log file corruption if we have new messages at dumping log to file. Comment removed as it incorrect. We store all messages in direct order (last message at end of file). Change-Id: I4acfa8a0935cc41a889e08f6bc42974fefd1ade2 --- apps/logfdisp.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'apps') diff --git a/apps/logfdisp.c b/apps/logfdisp.c index 8547778f64..54c345faae 100644 --- a/apps/logfdisp.c +++ b/apps/logfdisp.c @@ -218,42 +218,44 @@ bool logfdisplay(void) } #endif /* HAVE_LCD_BITMAP */ -/* Store the logf log to logf.txt in the .rockbox directory. The order of the - * entries will be "reversed" so that the most recently logged entry is on the - * top of the file */ bool logfdump(void) { int fd; splashf(HZ, "Log File Dumped"); - + /* nothing to print ? */ if(logfindex == 0 && !logfwrap) /* nothing is logged just yet */ return false; - + + logfenabled = false; + fd = open(ROCKBOX_DIR "/logf.txt", O_CREAT|O_WRONLY|O_TRUNC, 0666); if(-1 != fd) { int i; - + if(logfwrap) i = logfindex; else i = 0; - + do { if(logfbuffer[i]=='\0') fdprintf(fd, "\n"); else fdprintf(fd, "%c", logfbuffer[i]); - + i++; if(i >= MAX_LOGF_SIZE) i = 0; } while(i != logfindex); - + close(fd); } + + logfenabled = true; + return false; } -- cgit v1.2.3