diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-09-24 12:31:08 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2007-09-24 12:31:08 +0200 |
commit | 3cbc5c5c12f8419f563efa33153fc87d7158efbd (patch) | |
tree | 5e6f674b85f6e73cba5be7a645c7df38482dad55 /common | |
parent | b0615cc9096be1d2ed2813af3a0d850e1009b9d4 (diff) | |
download | barebox-3cbc5c5c12f8419f563efa33153fc87d7158efbd.tar.gz barebox-3cbc5c5c12f8419f563efa33153fc87d7158efbd.tar.xz |
remove u-boot command paramter flag
Diffstat (limited to 'common')
-rw-r--r-- | common/command.c | 12 | ||||
-rw-r--r-- | common/env.c | 6 | ||||
-rw-r--r-- | common/hush.c | 25 |
3 files changed, 15 insertions, 28 deletions
diff --git a/common/command.c b/common/command.c index de0f83b9af..8685b02778 100644 --- a/common/command.c +++ b/common/command.c @@ -32,7 +32,7 @@ #include <environment.h> int -do_version (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +do_version (cmd_tbl_t *cmdtp, int argc, char *argv[]) { extern char version_string[]; printf ("\n%s\n", version_string); @@ -46,7 +46,7 @@ U_BOOT_CMD_START(version) U_BOOT_CMD_END int -do_true (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +do_true (cmd_tbl_t *cmdtp, int argc, char *argv[]) { return 0; } @@ -58,7 +58,7 @@ U_BOOT_CMD_START(true) U_BOOT_CMD_END int -do_false (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +do_false (cmd_tbl_t *cmdtp, int argc, char *argv[]) { return 1; } @@ -72,7 +72,7 @@ U_BOOT_CMD_END #ifdef CONFIG_SHELL_HUSH int -do_readline (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +do_readline (cmd_tbl_t *cmdtp, int argc, char *argv[]) { char *buf = xzalloc(CONFIG_CBSIZE); @@ -104,7 +104,7 @@ U_BOOT_CMD_START(readline) U_BOOT_CMD_END int -do_exit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +do_exit (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int r; @@ -147,7 +147,7 @@ void u_boot_cmd_usage(cmd_tbl_t *cmdtp) * Use puts() instead of printf() to avoid printf buffer overflow * for long help messages */ -int do_help (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +int do_help (cmd_tbl_t * cmdtp, int argc, char *argv[]) { if (argc == 1) { /*show list of commands */ int cmd_items = &__u_boot_cmd_end - diff --git a/common/env.c b/common/env.c index e97354b2c6..1f3852fc41 100644 --- a/common/env.c +++ b/common/env.c @@ -218,7 +218,7 @@ int export(const char *varname) return -1; } -int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int do_printenv (cmd_tbl_t *cmdtp, int argc, char *argv[]) { struct variable_d *var; struct env_context *c; @@ -265,7 +265,7 @@ U_BOOT_CMD_START(printenv) U_BOOT_CMD_END #ifdef CONFIG_SIMPLE_PARSER -int do_setenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int do_setenv ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { if (argc < 2) { printf ("Usage:\n%s\n", cmdtp->usage); @@ -290,7 +290,7 @@ U_BOOT_CMD_END #endif -int do_export ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +int do_export ( cmd_tbl_t *cmdtp, int argc, char *argv[]) { int i = 1; diff --git a/common/hush.c b/common/hush.c index ddd797ce39..3323f88dfa 100644 --- a/common/hush.c +++ b/common/hush.c @@ -467,7 +467,6 @@ static int run_pipe_real(struct pipe *pi) { int i; int nextin; - int flag = 0; struct child_prog *child; cmd_tbl_t *cmdtp; char *p; @@ -535,30 +534,18 @@ static int run_pipe_real(struct pipe *pi) return last_return_code; } if (strchr(child->argv[i], '/')) { - return execute_script(child->argv[i], child->argc-i,&child->argv[i]); + return execute_script(child->argv[i], child->argc-i, &child->argv[i]); } if ((path = find_execable(child->argv[i]))) { printf("path: %s\n", path); - ret = execute_script(path, child->argc-i,&child->argv[i]); + ret = execute_script(path, child->argc-i, &child->argv[i]); free(path); return ret; } /* Look up command in command table */ if ((cmdtp = find_cmd(child->argv[i]))) { int rcode; -#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) - extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - - /* avoid "bootd" recursion */ - if (cmdtp->cmd == do_bootd) { - if (flag & CMD_FLAG_BOOTD) { - printf ("'bootd' recursion detected\n"); - return -1; - } - else - flag |= CMD_FLAG_BOOTD; - } -#endif /* CFG_CMD_BOOTD */ + /* found - check max args */ if ((child->argc - i) > cmdtp->maxargs) { printf ("Usage:\n%s\n", cmdtp->usage); @@ -567,7 +554,7 @@ static int run_pipe_real(struct pipe *pi) child->argv+=i; /* XXX horrible hack */ /* OK - call function to do the command */ - rcode = cmdtp->cmd(cmdtp, flag,child->argc-i,&child->argv[i]); + rcode = cmdtp->cmd(cmdtp, child->argc-i, &child->argv[i]); child->argv-=i; /* XXX restore hack so free() can work right */ @@ -1486,7 +1473,7 @@ int run_shell(void) return rcode; } -static int do_sh(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_sh(cmd_tbl_t *cmdtp, int argc, char *argv[]) { if (argc < 2) { printf ("Usage:\n%s\n", cmdtp->usage); @@ -1508,7 +1495,7 @@ U_BOOT_CMD_START(sh) U_BOOT_CMD_HELP(cmd_sh_help) U_BOOT_CMD_END -static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_source(cmd_tbl_t *cmdtp, int argc, char *argv[]) { if (argc < 2) { printf ("Usage:\n%s\n", cmdtp->usage); |