V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove interleave of non-U-Boot code in hush 

There is a nasty interleave of #ifdefs in hush.c where the two code
paths have different indents. Remove this ickiness.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2011-12-06 19:47:53 +00:00 committed by Wolfgang Denk
parent bdf8e34b93
commit 7344f9128d
1 changed files with 11 additions and 13 deletions
common
hush.c

24
common/hush.c
View File

@ -1642,6 +1642,15 @@ static int run_pipe_real(struct pipe *pi)
* Is it really safe for inline use? Experimentally,
* things seem to work with glibc. */
setup_redirects(child, squirrel);
child->argv += i; /* XXX horrible hack */
rcode = x->function(child);
/* XXX restore hack so free() can work right */
child->argv -= i;
restore_redirects(squirrel);
}
return rcode;
}
#else
/* check ";", because ,example , argv consist from
* "help;flinfo" must not execute
@ -1674,22 +1683,11 @@ static int run_pipe_real(struct pipe *pi)
if ((child->argc - i) > cmdtp->maxargs)
return cmd_usage(cmdtp);
#endif
child->argv+=i; /* XXX horrible hack */
#ifndef __U_BOOT__
rcode = x->function(child);
#else
/* OK - call function to do the command */
rcode = cmd_call(cmdtp, flag, child->argc-i,
&child->argv[i]);
rcode = cmd_call(cmdtp, flag, child->argc,
child->argv);
if (!cmdtp->repeatable)
flag_repeat = 0;
#endif
child->argv-=i; /* XXX restore hack so free() can work right */
#ifndef __U_BOOT__
restore_redirects(squirrel);
#endif
return rcode;
}
}