ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ash: disable check for "good" function name, bash does not check this

Browse source 
function                                             old     new   delta
.rodata                                           105304  105261     -43
parse_command                                       1696    1633     -63
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-106)           Total: -106 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2023-07-04 14:35:41 +02:00
parent e5692e2342
commit 07a95cfcab
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
shell/ash.c
View file

@ -12123,18 +12123,19 @@ simplecmd(void)
if (args && app == &args->narg.next
&& !vars && !redir
) {
struct builtincmd *bcmd;
const char *name;
// struct builtincmd *bcmd;
// const char *name;
/* We have a function */
if (IF_BASH_FUNCTION(!function_flag &&) readtoken() != TRP)
raise_error_unexpected_syntax(TRP);
name = n->narg.text;
if (!goodname(name)
|| ((bcmd = find_builtin(name)) && IS_BUILTIN_SPECIAL(bcmd))
) {
raise_error_syntax("bad function name");
}
//bash allows functions named "123", "..", "return"!
// name = n->narg.text;
// if (!goodname(name)
// || ((bcmd = find_builtin(name)) && IS_BUILTIN_SPECIAL(bcmd))
// ) {
// raise_error_syntax("bad function name");
// }
n->type = NDEFUN;
checkkwd = CHKNL | CHKKWD | CHKALIAS;
n->ndefun.text = n->narg.text;

7
shell/hush.c
View file

@ -4306,7 +4306,7 @@ static int done_word(struct parse_context *ctx)
|| endofname(command->argv[0])[0] != '\0'
) {
/* bash says just "not a valid identifier" */
syntax_error("bad variable name in for");
syntax_error("bad for loop variable");
return 1;
}
/* Force FOR to have just one word (variable name) */
@ -4683,6 +4683,11 @@ static int parse_group(struct parse_context *ctx,
syntax_error_unexpected_ch(ch);
return -1;
}
//bash allows functions named "123", "..", "return"!
// if (endofname(command->argv[0])[0] != '\0') {
// syntax_error("bad function name");
// return -1;
// }
nommu_addchr(&ctx->as_string, ch);
command->cmd_type = CMD_FUNCDEF;
goto skip;

4
shell/hush_test/hush-vars/readonly0.right
View file

@ -1,5 +1,5 @@
readonly a=A
readonly b=B
readonly a='A'
readonly b='B'
Ok:0
hush: a=A: readonly variable