diff --git a/commands/Kconfig b/commands/Kconfig index 6ec7031..8d1ca9d 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -27,6 +27,10 @@ default y prompt "help" +config CMD_READLINE + tristate + prompt "readline" + endmenu menu "file commands " diff --git a/commands/Makefile b/commands/Makefile index b010d66..f57d1de 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -32,4 +32,4 @@ obj-$(CONFIG_CMD_FLASH) += flash.o obj-$(CONFIG_CMD_MEMINFO) += meminfo.o obj-$(CONFIG_CMD_TIMEOUT) += timeout.o - +obj-$(CONFIG_CMD_READLINE) += readline.o diff --git a/commands/readline.c b/commands/readline.c new file mode 100644 index 0000000..921b72a --- /dev/null +++ b/commands/readline.c @@ -0,0 +1,60 @@ +/* + * (C) Copyright 2000-2003 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include + +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 (readline(argv[1], buf, CONFIG_CBSIZE) < 0) { + free(buf); + return 1; + } + + setenv(argv[2], buf); + free(buf); + + return 0; +} + +static __maybe_unused char cmd_readline_help[] = +"Usage: readline VAR\n" +"readline reads a line of user input into variable VAR.\n"; + +U_BOOT_CMD_START(readline) + .maxargs = 3, + .cmd = do_readline, + .usage = "prompt for user input", + U_BOOT_CMD_HELP(cmd_readline_help) +U_BOOT_CMD_END + diff --git a/common/command.c b/common/command.c index c78da7e..40ac8de 100644 --- a/common/command.c +++ b/common/command.c @@ -73,37 +73,6 @@ #ifdef CONFIG_SHELL_HUSH -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 (readline(argv[1], buf, CONFIG_CBSIZE) < 0) { - free(buf); - return 1; - } - - setenv(argv[2], buf); - free(buf); - - return 0; -} - -static __maybe_unused char cmd_readline_help[] = -"Usage: readline VAR\n" -"readline reads a line of user input into variable VAR.\n"; - -U_BOOT_CMD_START(readline) - .maxargs = 3, - .cmd = do_readline, - .usage = "prompt for user input", - U_BOOT_CMD_HELP(cmd_readline_help) -U_BOOT_CMD_END - static int do_exit (cmd_tbl_t *cmdtp, int argc, char *argv[]) { int r;