diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2009-08-11 16:12:03 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-08-11 16:12:03 +0000 |
| commit | 9a5174c8a3a1a2a358be57ecb72fa2740b10cd0d (patch) | |
| tree | 14ae27cf4eae86d8e64d1dcaece7549531f328c2 /firmware/logf.c | |
| parent | e74ba2b63d687bff39defd82cec1f04fb35f5921 (diff) | |
| download | rockbox-9a5174c8a3a1a2a358be57ecb72fa2740b10cd0d.tar.gz rockbox-9a5174c8a3a1a2a358be57ecb72fa2740b10cd0d.zip | |
Fix logf() multilines handling
Each line (of MAX_LOGF_ENTRY characters) would be marked with
LOGF_TERMINATE_CONTINUE_LINE, but still be padded with a '\0'
This also reverts r22250 which worked around the problem in logfdump()
Flyspray: FS#10513
Author: Amaury Pouly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22253 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/logf.c')
| -rw-r--r-- | firmware/logf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/firmware/logf.c b/firmware/logf.c index 6e3e532450..02ab79d0a0 100644 --- a/firmware/logf.c +++ b/firmware/logf.c @@ -145,16 +145,17 @@ void _logf(const char *format, ...) while(len > MAX_LOGF_ENTRY) { ptr = logfbuffer[logfindex]; - strlcpy(ptr, buf + tlen, MAX_LOGF_ENTRY); + memcpy(ptr, buf + tlen, MAX_LOGF_ENTRY); ptr[MAX_LOGF_ENTRY] = LOGF_TERMINATE_CONTINUE_LINE; logfindex++; check_logfindex(); - len -= MAX_LOGF_ENTRY-1; - tlen += MAX_LOGF_ENTRY-1; + len -= MAX_LOGF_ENTRY; + tlen += MAX_LOGF_ENTRY; multiline = true; } + ptr = logfbuffer[logfindex]; - strcpy(ptr, buf + tlen); + memcpy(ptr, buf + tlen,len-tlen); if(len < MAX_LOGF_ENTRY) /* pad with spaces up to the MAX_LOGF_ENTRY byte border */ |