Skip to content

Commit

Permalink
hush: return consistent codes from run_command()
Browse files Browse the repository at this point in the history
Attempting to run:
 - an empty string
 - a string with just spaces

returns different error codes, 1 for the empty string and 0
for the string with just spaces.  Make both of them return
0 for consistency.

Signed-off-by: Rabin Vincent <[email protected]>
Acked-by: Simon Glass <[email protected])
  • Loading branch information
vitkyrka authored and trini committed Nov 7, 2014
1 parent 7dbcb76 commit 484408f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion common/cli_hush.c
Original file line number Diff line number Diff line change
Expand Up @@ -3236,8 +3236,10 @@ int parse_string_outer(const char *s, int flag)
#ifdef __U_BOOT__
char *p = NULL;
int rcode;
if ( !s || !*s)
if (!s)
return 1;
if (!*s)
return 0;
if (!(p = strchr(s, '\n')) || *++p) {
p = xmalloc(strlen(s) + 2);
strcpy(p, s);
Expand Down
3 changes: 3 additions & 0 deletions test/command_ut.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#endif
#endif

assert(run_command("", 0) == 0);
assert(run_command(" ", 0) == 0);

printf("%s: Everything went swimmingly\n", __func__);
return 0;
}
Expand Down

0 comments on commit 484408f

Please sign in to comment.