sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nshlib: refine dd verify printing format

Browse Source 
before:
infile sector 0
7f454c46010101000000000000000000
02002800010000007d13001834000000
8cbd2a00000400053400200004002800

now:
infile sector 0:
0000: 7f 45 4c 46 01 01 01 00 00 00 00 00 00 00 00 00 .ELF............
0010: 02 00 28 00 01 00 00 00 7d 13 00 18 34 00 00 00 ..(.....}...4...
0020: 8c bd 2a 00 00 04 00 05 34 00 20 00 04 00 28 00 ..*.....4. ...(.

Signed-off-by: wanggang26 <wanggang26@xiaomi.com>
This commit is contained in:
wanggang26 2023-07-26 15:07:34 +08:00 committed by Xiang Xiao
parent 9621aca73c
commit f585d74b8c
1 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nshlib/nsh_ddcmd.c
View File

@ -29,6 +29,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
@ -230,38 +231,11 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
if (memcmp(dd->buffer, buffer, dd->nbytes) != 0)
{
int i;
nsh_output(dd->vtbl, "infile sector %d", sector);
for (i = 0; i < dd->nbytes; i++)
{
if (i % 16 == 0)
{
nsh_output(dd->vtbl, "\n");
}
nsh_output(dd->vtbl, "%02x", dd->buffer[i]);
if (i + 1 % 2 == 0)
{
nsh_output(dd->vtbl, " ");
}
}
nsh_output(dd->vtbl, "\noutfile sector %d", sector);
for (i = 0; i < dd->nbytes; i++)
{
if (i % 16 == 0)
{
nsh_output(dd->vtbl, "\n");
}
nsh_output(dd->vtbl, "%02x", dd->buffer[i]);
if (i + 1 % 2 == 0)
{
nsh_output(dd->vtbl, " ");
}
}
char msg[32];
snprintf(msg, sizeof(msg), "infile sector %d", sector);
nsh_dumpbuffer(dd->vtbl, msg, dd->buffer, dd->nbytes);
snprintf(msg, sizeof(msg), "\noutfile sector %d", sector);
nsh_dumpbuffer(dd->vtbl, msg, buffer, dd->nbytes);
nsh_output(dd->vtbl, "\n");
ret = ERROR;
break;