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

ash: [VAR] Initialise OPTIND after importing environment

Browse Source 
Upstream commit 1:

    Date: Fri, 23 Aug 2013 21:27:42 +1000
    [VAR] Initialise OPTIND after importing environment

    On Sat, Mar 23, 2013 at 01:46:20AM +0000, Chris F.A. Johnson wrote:
    >   According to both the dash man page and the POSIX spec, "When the
    >   shell is invoked, OPTIND is initialized to 1."
    >
    >   However, it actually takes the value of the environment variable
    >   if it exists:
    >
    > $ OPTIND=4 dash -c 'echo "$OPTIND"'
    > 4
    > $ OPTIND=4 bash -c 'echo "$OPTIND"'
    > 1
    > $ OPTIND=4 ksh -c 'echo "$OPTIND"'
    > 1
    > $ OPTIND=4 ksh93 -c 'echo "$OPTIND"'
    > 1

    This patch fixes this by initialising OPTIND after importing the
    environment.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Upstream commit 2:

    Date: Tue, 7 Oct 2014 22:24:42 +0800
    [VAR] Use setvareq to set OPTIND initially

    There is no need to setvarint to set the initial value of OPTIND
    of one.  This patch switchs to setvareq which also lets us avoid
    an unnecessary memory allocation.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-09-30 14:36:59 +02:00
parent 6a0710e954
commit e627ac95be
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/ash.c
View File

@ -1919,7 +1919,7 @@ static const struct {
{ VSTRFIXED|VTEXTFIXED , "PS2=> " , NULL }, { VSTRFIXED|VTEXTFIXED , "PS2=> " , NULL },
{ VSTRFIXED|VTEXTFIXED , "PS4=+ " , NULL }, { VSTRFIXED|VTEXTFIXED , "PS4=+ " , NULL },
#if ENABLE_ASH_GETOPTS #if ENABLE_ASH_GETOPTS
{ VSTRFIXED|VTEXTFIXED , "OPTIND=1" , getoptsreset }, { VSTRFIXED|VTEXTFIXED , defoptindvar, getoptsreset },
#endif #endif
#if ENABLE_ASH_RANDOM_SUPPORT #if ENABLE_ASH_RANDOM_SUPPORT
{ VSTRFIXED|VTEXTFIXED|VUNSET|VDYNAMIC, "RANDOM", change_random }, { VSTRFIXED|VTEXTFIXED|VUNSET|VDYNAMIC, "RANDOM", change_random },
@ -13124,6 +13124,8 @@ init(void)
} }
} }
setvareq((char*)defoptindvar, VTEXTFIXED);
setvar0("PPID", utoa(getppid())); setvar0("PPID", utoa(getppid()));
#if ENABLE_ASH_BASH_COMPAT #if ENABLE_ASH_BASH_COMPAT
p = lookupvar("SHLVL"); p = lookupvar("SHLVL");

1
shell/shell_common.c
View File

@ -21,6 +21,7 @@
#include <sys/resource.h> /* getrlimit */ #include <sys/resource.h> /* getrlimit */
const char defifsvar[] ALIGN1 = "IFS= \t\n"; const char defifsvar[] ALIGN1 = "IFS= \t\n";
const char defoptindvar[] ALIGN1 = "OPTIND=1";
int FAST_FUNC is_well_formed_var_name(const char *s, char terminator) int FAST_FUNC is_well_formed_var_name(const char *s, char terminator)

2
shell/shell_common.h
View File

@ -24,6 +24,8 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
extern const char defifsvar[] ALIGN1; /* "IFS= \t\n" */ extern const char defifsvar[] ALIGN1; /* "IFS= \t\n" */
#define defifs (defifsvar + 4) #define defifs (defifsvar + 4)
extern const char defoptindvar[] ALIGN1; /* "OPTIND=1" */
int FAST_FUNC is_well_formed_var_name(const char *s, char terminator); int FAST_FUNC is_well_formed_var_name(const char *s, char terminator);
/* Builtins */ /* Builtins */