mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
applying fix from:
0000152: ash: quoting rules for local variables different to globals
This commit is contained in:
parent
27cbffddd8
commit
c3850c83d9
33
shell/ash.c
33
shell/ash.c
@ -1353,6 +1353,7 @@ struct builtincmd {
|
|||||||
|
|
||||||
#define IS_BUILTIN_SPECIAL(builtincmd) ((builtincmd)->name[0] & 1)
|
#define IS_BUILTIN_SPECIAL(builtincmd) ((builtincmd)->name[0] & 1)
|
||||||
#define IS_BUILTIN_REGULAR(builtincmd) ((builtincmd)->name[0] & 2)
|
#define IS_BUILTIN_REGULAR(builtincmd) ((builtincmd)->name[0] & 2)
|
||||||
|
#define IS_BUILTIN_ASSIGN(builtincmd) ((builtincmd)->name[0] & 4)
|
||||||
|
|
||||||
static const struct builtincmd builtincmd[] = {
|
static const struct builtincmd builtincmd[] = {
|
||||||
{ BUILTIN_SPEC_REG ".", dotcmd },
|
{ BUILTIN_SPEC_REG ".", dotcmd },
|
||||||
@ -3208,7 +3209,14 @@ parse_command_args(char **argv, const char **path)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static inline int
|
||||||
|
isassignment(const char *p)
|
||||||
|
{
|
||||||
|
const char *q = endofname(p);
|
||||||
|
if (p == q)
|
||||||
|
return 0;
|
||||||
|
return *q == '=';
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Execute a simple command.
|
* Execute a simple command.
|
||||||
@ -3232,6 +3240,8 @@ evalcommand(union node *cmd, int flags)
|
|||||||
int cmd_is_exec;
|
int cmd_is_exec;
|
||||||
int status;
|
int status;
|
||||||
char **nargv;
|
char **nargv;
|
||||||
|
struct builtincmd *bcmd;
|
||||||
|
int pseudovarflag = 0;
|
||||||
|
|
||||||
/* First expand the arguments. */
|
/* First expand the arguments. */
|
||||||
TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
|
TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
|
||||||
@ -3246,11 +3256,21 @@ evalcommand(union node *cmd, int flags)
|
|||||||
*arglist.lastp = NULL;
|
*arglist.lastp = NULL;
|
||||||
|
|
||||||
argc = 0;
|
argc = 0;
|
||||||
|
if (cmd->ncmd.args)
|
||||||
|
{
|
||||||
|
bcmd = find_builtin(cmd->ncmd.args->narg.text);
|
||||||
|
pseudovarflag = bcmd && IS_BUILTIN_ASSIGN(bcmd);
|
||||||
|
}
|
||||||
|
|
||||||
for (argp = cmd->ncmd.args; argp; argp = argp->narg.next) {
|
for (argp = cmd->ncmd.args; argp; argp = argp->narg.next) {
|
||||||
struct strlist **spp;
|
struct strlist **spp;
|
||||||
|
|
||||||
spp = arglist.lastp;
|
spp = arglist.lastp;
|
||||||
expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
|
if (pseudovarflag && isassignment(argp->narg.text))
|
||||||
|
expandarg(argp, &arglist, EXP_VARTILDE);
|
||||||
|
else
|
||||||
|
expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
|
||||||
|
|
||||||
for (sp = *spp; sp; sp = sp->next)
|
for (sp = *spp; sp; sp = sp->next)
|
||||||
argc++;
|
argc++;
|
||||||
}
|
}
|
||||||
@ -9356,15 +9376,6 @@ static void setprompt(int);
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
static inline int
|
|
||||||
isassignment(const char *p)
|
|
||||||
{
|
|
||||||
const char *q = endofname(p);
|
|
||||||
if (p == q)
|
|
||||||
return 0;
|
|
||||||
return *q == '=';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Read and parse a command. Returns NEOF on end of file. (NULL is a
|
* Read and parse a command. Returns NEOF on end of file. (NULL is a
|
||||||
|
Loading…
Reference in New Issue
Block a user