emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: minor fixes

Browse Source 
Ensure that login_sh is initialised in procargs even when running
an embedded script.

The argc argument to ash_main isn't unused when embedded scripts
are present.

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2018-11-05 13:13:08 +00:00 committed by Denys Vlasenko
parent 084bac472b
commit 8767c12774
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ash.c
View File

@ -14052,11 +14052,11 @@ procargs(char **argv)
int login_sh; int login_sh;
xargv = argv; xargv = argv;
login_sh = xargv[0] && xargv[0][0] == '-';
#if NUM_SCRIPTS > 0 #if NUM_SCRIPTS > 0
if (minusc) if (minusc)
goto setarg0; goto setarg0;
#endif #endif
login_sh = xargv[0] && xargv[0][0] == '-';
arg0 = xargv[0]; arg0 = xargv[0];
/* if (xargv[0]) - mmm, this is always true! */ /* if (xargv[0]) - mmm, this is always true! */
xargv++; xargv++;
@ -14164,7 +14164,11 @@ extern int etext();
* is used to figure out how far we had gotten. * is used to figure out how far we had gotten.
*/ */
int ash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
#if NUM_SCRIPTS > 0
int ash_main(int argc, char **argv)
#else
int ash_main(int argc UNUSED_PARAM, char **argv) int ash_main(int argc UNUSED_PARAM, char **argv)
#endif
/* note: 'argc' is used only if embedded scripts are enabled */ /* note: 'argc' is used only if embedded scripts are enabled */
{ {
volatile smallint state; volatile smallint state;