GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Command improvements for ubifs

Browse source 
Check that an argument is passed to ubifsmount and that addresses and
sizes are actually numbers for ubifsload. Also improve the instructions
a bit.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Simon Kagstrom 2009-07-07 16:01:02 +02:00 • committed by Stefan Roese
parent 25c8f40059
commit 2896b5851f
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/cmd_ubifs.c
View file

@ -47,6 +47,10 @@ int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *vol_name; char *vol_name;
int ret; int ret;
if (argc != 2) {
cmd_usage(cmdtp);
return 1;
}
vol_name = argv[1]; vol_name = argv[1];
debug("Using volume %s\n", vol_name); debug("Using volume %s\n", vol_name);
@ -88,6 +92,7 @@ int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
char *filename; char *filename;
char *endp;
int ret; int ret;
u32 addr; u32 addr;
u32 size = 0; u32 size = 0;
@ -98,15 +103,25 @@ int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
} }
if (argc < 3) { if (argc < 3) {
printf("Usage:\n%s\n", cmdtp->usage); cmd_usage(cmdtp);
return -1; return -1;
} }
addr = simple_strtoul(argv[1], NULL, 16); addr = simple_strtoul(argv[1], &endp, 16);
if (endp == argv[1]) {
cmd_usage(cmdtp);
return 1;
}
filename = argv[2]; filename = argv[2];
if (argc == 4) if (argc == 4) {
size = simple_strtoul(argv[3], NULL, 16); size = simple_strtoul(argv[3], &endp, 16);
if (endp == argv[3]) {
cmd_usage(cmdtp);
return 1;
}
}
debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size); debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size);
ret = ubifs_load(filename, addr, size); ret = ubifs_load(filename, addr, size);
@ -119,7 +134,8 @@ int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD( U_BOOT_CMD(
ubifsmount, 2, 0, do_ubifs_mount, ubifsmount, 2, 0, do_ubifs_mount,
"mount UBIFS volume", "mount UBIFS volume",
"" "<volume-name>\n"
" - mount 'volume-name' volume"
); );
U_BOOT_CMD(ubifsls, 2, 0, do_ubifs_ls, U_BOOT_CMD(ubifsls, 2, 0, do_ubifs_ls,