diff options
author | Sascha Hauer <sha@pengutronix.de> | 2009-10-17 12:44:19 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-19 10:18:52 +0200 |
commit | 87e01f28ccc85474e18e1218c9d84f98e2e8977d (patch) | |
tree | c1918930683559d745dcc955d9572b5f568a02f5 /commands | |
parent | 0ecf7f1aeb906e3b30500080fbc4e1d1b770f1a2 (diff) | |
download | barebox-87e01f28ccc85474e18e1218c9d84f98e2e8977d.tar.gz barebox-87e01f28ccc85474e18e1218c9d84f98e2e8977d.tar.xz |
commands: return COMMAND_ERROR_USAGE
instead of calling u_boot_cmd_usage in each command to safe
space.
Signed-off-by: Sascha Hauer <sha@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r-- | commands/bootm.c | 6 | ||||
-rw-r--r-- | commands/cp.c | 6 | ||||
-rw-r--r-- | commands/crc.c | 6 | ||||
-rw-r--r-- | commands/dfu.c | 6 | ||||
-rw-r--r-- | commands/edit.c | 6 | ||||
-rw-r--r-- | commands/exec.c | 6 | ||||
-rw-r--r-- | commands/export.c | 6 | ||||
-rw-r--r-- | commands/flash.c | 12 | ||||
-rw-r--r-- | commands/go.c | 6 | ||||
-rw-r--r-- | commands/insmod.c | 6 | ||||
-rw-r--r-- | commands/mem.c | 24 | ||||
-rw-r--r-- | commands/memtest.c | 6 | ||||
-rw-r--r-- | commands/mkdir.c | 6 | ||||
-rw-r--r-- | commands/mount.c | 6 | ||||
-rw-r--r-- | commands/net.c | 12 | ||||
-rwxr-xr-x | commands/partition.c | 6 | ||||
-rw-r--r-- | commands/readline.c | 6 | ||||
-rw-r--r-- | commands/rm.c | 6 | ||||
-rw-r--r-- | commands/rmdir.c | 6 | ||||
-rw-r--r-- | commands/setenv.c | 6 | ||||
-rw-r--r-- | commands/sleep.c | 6 | ||||
-rw-r--r-- | commands/splash.c | 6 | ||||
-rw-r--r-- | commands/timeout.c | 6 | ||||
-rw-r--r-- | commands/umount.c | 6 |
24 files changed, 58 insertions, 116 deletions
diff --git a/commands/bootm.c b/commands/bootm.c index d6d9609cd7..b9c58b1414 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -408,10 +408,8 @@ static int do_bootm (cmd_tbl_t *cmdtp, int argc, char *argv[]) } } - if (optind == argc) { - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; - } + if (optind == argc) + return COMMAND_ERROR_USAGE; os_handle = map_image(argv[optind], data.verify); if (!os_handle) diff --git a/commands/cp.c b/commands/cp.c index 0a90c163b0..0fe3242e0c 100644 --- a/commands/cp.c +++ b/commands/cp.c @@ -44,10 +44,8 @@ static int do_cp ( cmd_tbl_t *cmdtp, int argc, char *argv[]) int last_is_dir = 0; int i; - if (argc < 3) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc < 3) + return COMMAND_ERROR_USAGE; if (!stat(argv[argc - 1], &statbuf)) { if (S_ISDIR(statbuf.st_mode)) diff --git a/commands/crc.c b/commands/crc.c index 008cbb845f..7ac69c60f9 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -53,10 +53,8 @@ static int do_crc (cmd_tbl_t *cmdtp, int argc, char *argv[]) } } - if (!filegiven && optind == argc) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (!filegiven && optind == argc) + return COMMAND_ERROR_USAGE; if (optind < argc) { if (parse_area_spec(argv[optind], &start, &size)) { diff --git a/commands/dfu.c b/commands/dfu.c index 1f62cda9c5..d35b129651 100644 --- a/commands/dfu.c +++ b/commands/dfu.c @@ -124,10 +124,8 @@ static int do_dfu(cmd_tbl_t *cmdtp, int argc, char *argv[]) } } - if (argc != optind + 1) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc != optind + 1) + return COMMAND_ERROR_USAGE; argstr = argv[optind]; diff --git a/commands/edit.c b/commands/edit.c index 6fb4a61efd..66f90e918c 100644 --- a/commands/edit.c +++ b/commands/edit.c @@ -396,10 +396,8 @@ static int do_edit(cmd_tbl_t * cmdtp, int argc, char *argv[]) int linepos; char c; - if (argc != 2) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc != 2) + return COMMAND_ERROR_USAGE; /* check if we are called as "sedit" insted of "edit" */ if (*argv[0] == 's') diff --git a/commands/exec.c b/commands/exec.c index b2b0fea238..4a232b6d05 100644 --- a/commands/exec.c +++ b/commands/exec.c @@ -34,10 +34,8 @@ static int do_exec(cmd_tbl_t * cmdtp, int argc, char *argv[]) int i; char *script; - if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; - } + if (argc < 2) + return COMMAND_ERROR_USAGE; for (i=1; i<argc; ++i) { script = read_file(argv[i]); diff --git a/commands/export.c b/commands/export.c index 9ab75e454c..55d61554a3 100644 --- a/commands/export.c +++ b/commands/export.c @@ -33,10 +33,8 @@ static int do_export ( cmd_tbl_t *cmdtp, int argc, char *argv[]) int i = 1; char *ptr; - if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; - } + if (argc < 2) + return COMMAND_ERROR_USAGE; while (i < argc) { if ((ptr = strchr(argv[i], '='))) { diff --git a/commands/flash.c b/commands/flash.c index c0c6e12ad1..35c34daa3c 100644 --- a/commands/flash.c +++ b/commands/flash.c @@ -45,10 +45,8 @@ static int do_flerase (cmd_tbl_t *cmdtp, int argc, char *argv[]) unsigned long start = 0, size = ~0; int ret = 0; - if (argc == 1) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc == 1) + return COMMAND_ERROR_USAGE; filename = argv[1]; @@ -119,10 +117,8 @@ static int do_protect (cmd_tbl_t *cmdtp, int argc, char *argv[]) unsigned long start = 0, size = ~0; int ret = 0, err; - if (argc == 1) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc == 1) + return COMMAND_ERROR_USAGE; filename = argv[1]; diff --git a/commands/go.c b/commands/go.c index 627f21e938..82a20d7f71 100644 --- a/commands/go.c +++ b/commands/go.c @@ -36,10 +36,8 @@ static int do_go (cmd_tbl_t *cmdtp, int argc, char *argv[]) int rcode = 1; int fd = -1; - if (argc < 2) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc < 2) + return COMMAND_ERROR_USAGE; if (!isdigit(*argv[1])) { fd = open(argv[1], O_RDONLY); diff --git a/commands/insmod.c b/commands/insmod.c index 28a59ead56..0b7c91ff00 100644 --- a/commands/insmod.c +++ b/commands/insmod.c @@ -11,10 +11,8 @@ static int do_insmod (cmd_tbl_t *cmdtp, int argc, char *argv[]) void *buf; int len; - if (argc < 2) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc < 2) + return COMMAND_ERROR_USAGE; buf = read_file(argv[1], &len); if (!buf) { diff --git a/commands/mem.c b/commands/mem.c index 6b3165950f..b31a8f47d1 100644 --- a/commands/mem.c +++ b/commands/mem.c @@ -254,10 +254,8 @@ static int do_mem_mw ( cmd_tbl_t *cmdtp, int argc, char *argv[]) if (mem_parse_options(argc, argv, "bwld:", &mode, NULL, &filename) < 0) return 1; - if (optind + 1 >= argc) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (optind + 1 >= argc) + return COMMAND_ERROR_USAGE; adr = strtoul_suffix(argv[optind++], NULL, 0); @@ -322,10 +320,8 @@ static int do_mem_cmp(cmd_tbl_t *cmdtp, int argc, char *argv[]) if (mem_parse_options(argc, argv, "bwls:d:", &mode, &sourcefile, &destfile) < 0) return 1; - if (optind + 2 > argc) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (optind + 2 > argc) + return COMMAND_ERROR_USAGE; addr1 = strtoul_suffix(argv[optind], NULL, 0); addr2 = strtoul_suffix(argv[optind + 1], NULL, 0); @@ -433,10 +429,8 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int argc, char *argv[]) if (mem_parse_options(argc, argv, "bwls:d:", &mode, &sourcefile, &destfile) < 0) return 1; - if (optind + 2 > argc) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (optind + 2 > argc) + return COMMAND_ERROR_USAGE; src = strtoul_suffix(argv[optind], NULL, 0); dest = strtoul_suffix(argv[optind + 1], NULL, 0); @@ -530,10 +524,8 @@ static int do_memset(cmd_tbl_t *cmdtp, int argc, char *argv[]) if (mem_parse_options(argc, argv, "bwld:", &mode, NULL, &file) < 0) return 1; - if (optind + 3 > argc) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (optind + 3 > argc) + return COMMAND_ERROR_USAGE; s = strtoul_suffix(argv[optind], NULL, 0); c = strtoul_suffix(argv[optind + 1], NULL, 0); diff --git a/commands/memtest.c b/commands/memtest.c index f44459abc1..07b7b22d3b 100644 --- a/commands/memtest.c +++ b/commands/memtest.c @@ -326,10 +326,8 @@ static int do_mem_mtest (cmd_tbl_t *cmdtp, int argc, char *argv[]) { ulong start, end, pattern = 0; - if (argc < 3) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc < 3) + return COMMAND_ERROR_USAGE; start = simple_strtoul(argv[1], NULL, 0); end = simple_strtoul(argv[2], NULL, 0); diff --git a/commands/mkdir.c b/commands/mkdir.c index a2c298240a..4d9bcb602b 100644 --- a/commands/mkdir.c +++ b/commands/mkdir.c @@ -43,10 +43,8 @@ static int do_mkdir (cmd_tbl_t *cmdtp, int argc, char *argv[]) } } - if (optind == argc) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (optind == argc) + return COMMAND_ERROR_USAGE; while (optind < argc) { if (parent) diff --git a/commands/mount.c b/commands/mount.c index 54260e230f..530bd8ca1b 100644 --- a/commands/mount.c +++ b/commands/mount.c @@ -48,10 +48,8 @@ static int do_mount (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } - if (argc != 4) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc != 4) + return COMMAND_ERROR_USAGE; if ((ret = mount(argv[1], argv[2], argv[3]))) { perror("mount"); diff --git a/commands/net.c b/commands/net.c index f25a35d2f1..f059e7284b 100644 --- a/commands/net.c +++ b/commands/net.c @@ -171,10 +171,8 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[]) char *localfile; char *remotefile; - if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; - } + if (argc < 2) + return COMMAND_ERROR_USAGE; remotefile = argv[1]; @@ -275,10 +273,8 @@ static int do_ethact (cmd_tbl_t *cmdtp, int argc, char *argv[]) return 0; } - if (argc != 2) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc != 2) + return COMMAND_ERROR_USAGE; edev = eth_get_byname(argv[1]); if (edev) diff --git a/commands/partition.c b/commands/partition.c index 30f7407175..877f82b4a6 100755 --- a/commands/partition.c +++ b/commands/partition.c @@ -107,10 +107,8 @@ static int do_addpart(cmd_tbl_t * cmdtp, int argc, char *argv[]) off_t devsize; struct stat s; - if (argc != 3) { - printf("Usage:\n %s\n", cmdtp->usage); - return 1; - } + if (argc != 3) + return COMMAND_ERROR_USAGE; if (stat(argv[1], &s)) { perror("addpart"); diff --git a/commands/readline.c b/commands/readline.c index cd24f3508a..f3fad4bb52 100644 --- a/commands/readline.c +++ b/commands/readline.c @@ -31,10 +31,8 @@ static int do_readline (cmd_tbl_t *cmdtp, int argc, char *argv[]) { char *buf = xzalloc(CONFIG_CBSIZE); - if (argc < 3) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc < 3) + return COMMAND_ERROR_USAGE; if (readline(argv[1], buf, CONFIG_CBSIZE) < 0) { free(buf); diff --git a/commands/rm.c b/commands/rm.c index f8a84f3eab..d211718f5f 100644 --- a/commands/rm.c +++ b/commands/rm.c @@ -28,10 +28,8 @@ static int do_rm (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int i = 1; - if (argc < 2) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc < 2) + return COMMAND_ERROR_USAGE; while (i < argc) { if (unlink(argv[i])) { diff --git a/commands/rmdir.c b/commands/rmdir.c index aaa7f80a72..2d8d5162b2 100644 --- a/commands/rmdir.c +++ b/commands/rmdir.c @@ -7,10 +7,8 @@ static int do_rmdir (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int i = 1; - if (argc < 2) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc < 2) + return COMMAND_ERROR_USAGE; while (i < argc) { if (rmdir(argv[i])) { diff --git a/commands/setenv.c b/commands/setenv.c index b6fd81ad4b..9fbacd74c5 100644 --- a/commands/setenv.c +++ b/commands/setenv.c @@ -30,10 +30,8 @@ static int do_setenv ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { - if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; - } + if (argc < 2) + return COMMAND_ERROR_USAGE; setenv(argv[1], argv[2]); diff --git a/commands/sleep.c b/commands/sleep.c index 955eb718d6..3c18a8694f 100644 --- a/commands/sleep.c +++ b/commands/sleep.c @@ -29,10 +29,8 @@ static int do_sleep (cmd_tbl_t *cmdtp, int argc, char *argv[]) uint64_t start; ulong delay; - if (argc != 2) { - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; - } + if (argc != 2) + return COMMAND_ERROR_USAGE; delay = simple_strtoul(argv[1], NULL, 10); diff --git a/commands/splash.c b/commands/splash.c index 9fd4ded8c5..f59978eafb 100644 --- a/commands/splash.c +++ b/commands/splash.c @@ -50,10 +50,8 @@ static int do_splash(cmd_tbl_t *cmdtp, int argc, char *argv[]) char *src, *dst; unsigned long *dstl, *srcl; - if (argc == 1) { - printf ("Usage:\n%s\n", cmdtp->usage); - return 1; - } + if (argc == 1) + return COMMAND_ERROR_USAGE; if (!fbd) { printf("No framebuffer found\n"); diff --git a/commands/timeout.c b/commands/timeout.c index 3fa687c393..dbf17a7906 100644 --- a/commands/timeout.c +++ b/commands/timeout.c @@ -58,10 +58,8 @@ static int do_timeout(cmd_tbl_t *cmdtp, int argc, char *argv[]) } } - if (optind == argc) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (optind == argc) + return COMMAND_ERROR_USAGE; timeout = simple_strtoul(argv[optind], NULL, 0); diff --git a/commands/umount.c b/commands/umount.c index 1314473cdd..44b8407e16 100644 --- a/commands/umount.c +++ b/commands/umount.c @@ -28,10 +28,8 @@ static int do_umount (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int ret = 0; - if (argc != 2) { - u_boot_cmd_usage(cmdtp); - return 1; - } + if (argc != 2) + return COMMAND_ERROR_USAGE; if ((ret = umount(argv[1]))) { perror("umount"); |