X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/414caa77d5709bf3372d1f9245312781eee7961b..52ef24e4020adcb773adcb0d82b1c2c385610461:/avr/command.c

diff --git a/avr/command.c b/avr/command.c
index ff3a685..8eb5bb7 100644
--- a/avr/command.c
+++ b/avr/command.c
@@ -262,9 +262,6 @@ command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag UNUSED, int argc, char
 #define OPT_USAGE		0x08
 #define OPT_LONG		0x10
 
-	/* reset getopt() */
-	optind = 0;
-
 	int opt;
 	while ((opt = getopt(argc, argv, PSTR("afk"))) != -1) {
 		switch (opt) {
@@ -708,7 +705,7 @@ static cmd_tbl_t *cmd_invocation_ptr;
  * @param argv		Arguments
  * @return 0 if command succeeded, else non-zero (CMD_RET_...)
  */
-command_ret_t cmd_call(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
+static command_ret_t cmd_call(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
 	command_ret_t result;
 
@@ -770,6 +767,7 @@ command_ret_t cmd_process(uint_fast8_t flag, int argc, char * const argv[],
 
 	/* If OK so far, then do the command */
 	if (!rc) {
+		optind = 0;			/* reset getopt() */
 		cmd_invocation_ptr = cmdtp;
 		rc = cmd_call(cmdtp, flag, argc, argv);
 		*repeatable &= (cmdtp->flags & CTBL_RPT) != 0;