Naveen Kumar ChaudharyandTom Rini
3c82b041f7
The help text advertises "<addr> [byte count]" but do_strings() stores argv[2] directly into last_addr and the loop condition tests "addr < last_addr", i.e. it treats the value as an absolute end address. When invoked as documented (e.g. "strings 0x40000000 0x100") the loop condition fails immediately because the supplied count is far below start_addr, and the command prints nothing. Compute last_addr as start_addr + hextoul(argv[2], NULL) so the argument is used as a length in bytes, matching the help. The existing repeat-mode fixup (last_addr = addr + (last_addr - start_addr)) continues to preserve the same byte-count window across CMD_FLAG_REPEAT. Signed-off-by: Naveen Kumar Chaudhary <naveen.osdev@gmail.com>
48 lines
960 B
C
48 lines
960 B
C
/*
|
|
* cmd_strings.c - just like `strings` command
|
|
*
|
|
* Copyright (c) 2008 Analog Devices Inc.
|
|
*
|
|
* Licensed under the GPL-2 or later.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <command.h>
|
|
#include <vsprintf.h>
|
|
#include <linux/string.h>
|
|
|
|
static char *start_addr, *last_addr;
|
|
|
|
int do_strings(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
|
{
|
|
if (argc == 1)
|
|
return CMD_RET_USAGE;
|
|
|
|
if ((flag & CMD_FLAG_REPEAT) == 0) {
|
|
start_addr = (char *)hextoul(argv[1], NULL);
|
|
if (argc > 2)
|
|
last_addr = start_addr + hextoul(argv[2], NULL);
|
|
else
|
|
last_addr = (char *)-1;
|
|
}
|
|
|
|
char *addr = start_addr;
|
|
do {
|
|
puts(addr);
|
|
puts("\n");
|
|
addr += strlen(addr) + 1;
|
|
} while (addr[0] && addr < last_addr);
|
|
|
|
last_addr = addr + (last_addr - start_addr);
|
|
start_addr = addr;
|
|
|
|
return 0;
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
strings, 3, 1, do_strings,
|
|
"display strings",
|
|
"<addr> [byte count]\n"
|
|
" - display strings at <addr> for at least [byte count] or first double NUL"
|
|
);
|