projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-spi
[oweals/u-boot.git]
/
common
/
cli_hush.c
diff --git
a/common/cli_hush.c
b/common/cli_hush.c
index e0c436f1a7c799f6d441d3843097a0f8b5205fdf..2b654b754f5d5423f639014cc8f260fef1ee1871 100644
(file)
--- a/
common/cli_hush.c
+++ b/
common/cli_hush.c
@@
-1840,7
+1840,7
@@
static int run_list_real(struct pipe *pi)
if (rmode == RES_DO) {
if (!flag_rep) continue;
}
if (rmode == RES_DO) {
if (!flag_rep) continue;
}
- if (
(rmode == RES_DONE)
) {
+ if (
rmode == RES_DONE
) {
if (flag_rep) {
flag_restore = 1;
} else {
if (flag_rep) {
flag_restore = 1;
} else {
@@
-3170,7
+3170,8
@@
static int parse_stream_outer(struct in_str *inp, int flag)
update_ifs_map();
if (!(flag & FLAG_PARSE_SEMICOLON) || (flag & FLAG_REPARSING)) mapset((uchar *)";$&|", 0);
inp->promptmode=1;
update_ifs_map();
if (!(flag & FLAG_PARSE_SEMICOLON) || (flag & FLAG_REPARSING)) mapset((uchar *)";$&|", 0);
inp->promptmode=1;
- rcode = parse_stream(&temp, &ctx, inp, '\n');
+ rcode = parse_stream(&temp, &ctx, inp,
+ flag & FLAG_CONT_ON_NEWLINE ? -1 : '\n');
#ifdef __U_BOOT__
if (rcode == 1) flag_repeat = 0;
#endif
#ifdef __U_BOOT__
if (rcode == 1) flag_repeat = 0;
#endif
@@
-3569,7
+3570,7
@@
static char **make_list_in(char **inp, char *name)
p3 = insert_var_value(inp[i]);
p1 = p3;
while (*p1) {
p3 = insert_var_value(inp[i]);
p1 = p3;
while (*p1) {
- if (
(*p1 == ' ')
) {
+ if (
*p1 == ' '
) {
p1++;
continue;
}
p1++;
continue;
}