Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 06:24:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cat: Update command to use fs_load_alloc()

Browse source 
Use this new function since it implements the required functionality and
reduces duplicated code.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-06-01 10:22:39 -06:00 • committed by Tom Rini
parent de7b5a8a1a
commit 822f7a4543
1 changed files with 18 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
cmd/cat.c
View file

@ -17,8 +17,8 @@ static int do_cat(struct cmd_tbl *cmdtp, int flag, int argc,
char *dev; char *dev;
char *file; char *file;
char *buffer; char *buffer;
phys_addr_t addr; ulong file_size;
loff_t file_size; int ret;
if (argc < 4) if (argc < 4)
return CMD_RET_USAGE; return CMD_RET_USAGE;
@ -27,40 +27,27 @@ static int do_cat(struct cmd_tbl *cmdtp, int flag, int argc,
dev = argv[2]; dev = argv[2];
file = argv[3]; file = argv[3];
// check file exists ret = fs_load_alloc(ifname, dev, file, 0, 0, (void **)&buffer,
if (fs_set_blk_dev(ifname, dev, FS_TYPE_ANY)) &file_size);
return CMD_RET_FAILURE;
if (!fs_exists(file)) { // check file exists
switch (ret) {
case 0:
break;
case -ENOMEDIUM:
return CMD_RET_FAILURE;
case -ENOENT:
log_err("File does not exist: ifname=%s dev=%s file=%s\n", ifname, dev, file); log_err("File does not exist: ifname=%s dev=%s file=%s\n", ifname, dev, file);
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} case -E2BIG:
log_err("File is too large: ifname=%s dev=%s file=%s\n", ifname, dev, file);
// get file size
if (fs_set_blk_dev(ifname, dev, FS_TYPE_ANY))
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
case -ENOMEM:
if (fs_size(file, &file_size)) { log_err("Not enough memory: ifname=%s dev=%s file=%s\n", ifname, dev, file);
log_err("Cannot read file size: ifname=%s dev=%s file=%s\n", ifname, dev, file);
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} default:
case -EIO:
// allocate memory for file content log_err("File-read failed: ifname=%s dev=%s file=%s\n", ifname, dev, file);
buffer = calloc(sizeof(char), file_size + 1);
if (!buffer) {
log_err("Out of memory\n");
return CMD_RET_FAILURE;
}
// map pointer to system memory
addr = map_to_sysmem(buffer);
// read file to memory
if (fs_set_blk_dev(ifname, dev, FS_TYPE_ANY))
return CMD_RET_FAILURE;
if (fs_read(file, addr, 0, 0, &file_size)) {
log_err("Cannot read file: ifname=%s dev=%s file=%s\n", ifname, dev, file);
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }