diff options
| author | Denys Vlasenko | 2010-09-06 10:22:13 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-09-06 10:22:13 +0200 |
| commit | d383b49aefecea99e5bfb2f9eb2956f1c6c013e1 (patch) | |
| tree | 8af8a2837c49cccf9f4cd3dca4cdcd14be4e25db | |
| parent | 96f064d4161ed66d8db95bf8047eece90959f1e1 (diff) | |
| download | busybox-d383b49aefecea99e5bfb2f9eb2956f1c6c013e1.zip busybox-d383b49aefecea99e5bfb2f9eb2956f1c6c013e1.tar.gz | |
hush: remove disabled CMD_SINGLEWORD_NOGLOB_COND, rename o_glob->perform_glob
+ other small tweaks to comments and such
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
| -rw-r--r-- | shell/ash.c | 2 | ||||
| -rw-r--r-- | shell/hush.c | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/shell/ash.c b/shell/ash.c index 28a8bb6..273ecab 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -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 diff --git a/shell/hush.c b/shell/hush.c index 81811cb..2a4e80b 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -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 |