command, log: print with "log show" a full logbuffer

If the logbuffer contains LOGBUFF_LEN chars, they never got
printed with the "log show" command, because chars get
printed with the following for loop:

for (i = 0; i < (size & LOGBUFF_MASK); i++) {

with size = LOGBUFF_LEN and LOGBUFF_MASK = (LOGBUFF_LEN-1)
for loop never executed ...

Fix this.

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Fixed merge conflict.
Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/common/cmd_log.c b/common/cmd_log.c
index f9fbe002c6bcaf76d0670ea8cee383998592400f..9a3fdc3a4954e5fee1fa84b3ab0bd4da833c40ec 100644 (file)
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -219,7 +219,9 @@ int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                start = log->v1.start;
                                size = log->v1.size;
                        }
-                       for (i=0; i < (size&LOGBUFF_MASK); i++) {
+                       if (size > LOGBUFF_LEN)
+                               size = LOGBUFF_LEN;
+                       for (i = 0; i < size; i++) {
                                s = lbuf+((start+i)&LOGBUFF_MASK);
                                putc (*s);
                        }