浏览代码

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>
Heiko Schocher 13 年之前
父节点
当前提交
c16a123fd3
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      common/cmd_log.c

+ 3 - 1
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;
 				start = log->v1.start;
 				size = log->v1.size;
 				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);
 				s = lbuf+((start+i)&LOGBUFF_MASK);
 				putc (*s);
 				putc (*s);
 			}
 			}