d383b49ae
Denys Vlasenko
2010-09-06
Subject
hush: remove disabled CMD_SINGLEWORD_NOGLOB_COND, rename o_glob->perform_glob
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c+1 -1
| @@ -74,7 +74,7 @@ | |
| //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, _BB_DIR_BIN, _BB_SUID_DROP, sh)) | |
| //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, _BB_DIR_BIN, _BB_SUID_DROP, bash)) | |
| - | //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o |
| + | //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o |
| //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o | |
| //config:config ASH | |
shell/hush.c+1 -11
| @@ -475,20 +475,10 @@ struct command { | |
| smallint cmd_type; /* CMD_xxx */ | |
| #define CMD_NORMAL 0 | |
| #define CMD_SUBSHELL 1 | |
| - | |
| - | /* used for "[[ EXPR ]]" */ |
| #if ENABLE_HUSH_BASH_COMPAT | |
| + | /* used for "[[ EXPR ]]" */ |
| # define CMD_SINGLEWORD_NOGLOB 2 | |
| #endif | |
| - | |
| - | /* used for "export noglob=* glob* a=`echo a b`" */ |
| - | //#define CMD_SINGLEWORD_NOGLOB_COND 3 |
| - | // It is hard to implement correctly, it adds significant amounts of tricky code, |
| - | // and all this is only useful for really obscure export statements |
| - | // almost nobody would use anyway. #ifdef CMD_SINGLEWORD_NOGLOB_COND |
| - | // guards the code which implements it, but I have doubts it works |
| - | // in all cases (especially with mixed globbed/non-globbed arguments) |
| - | |
| #if ENABLE_HUSH_FUNCTIONS | |
| # define CMD_FUNCDEF 3 | |
| #endif | |