X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/0c728c8de88d86247d2a75348e71f5af37838c28..fcf1d5b30bd3b341fb7596aef395f347c6dc97b4:/avr/cmd_misc.c diff --git a/avr/cmd_misc.c b/avr/cmd_misc.c index c9a3c45..a0ee26e 100644 --- a/avr/cmd_misc.c +++ b/avr/cmd_misc.c @@ -1,14 +1,14 @@ /* - * (C) Copyright 2014 Leo C. + * (C) Copyright 2014,2016 Leo C. * * Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0 */ #include "common.h" -#include +#include "eval_arg.h" #include #include "command.h" @@ -17,14 +17,14 @@ #include "getopt-min.h" -command_ret_t do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_echo(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { bool put_newline = true; (void) cmdtp; (void) flag; /* reset getopt() */ - optind = 1; + optind = 0; int opt; while ((opt = getopt(argc, argv, PSTR("n"))) != -1) { @@ -52,7 +52,7 @@ command_ret_t do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } -command_ret_t do_sleep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_sleep(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { unsigned long start = get_timer(0); unsigned long delay; @@ -64,7 +64,7 @@ command_ret_t do_sleep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] if (argc != 2) return CMD_RET_USAGE; - delay = strtoul(argv[1], &sp, 10); + delay = eval_arg(argv[1], &sp); if (*sp == 'm') { millisec = 1;