diff options
-rw-r--r-- | lash.c | 9 | ||||
-rw-r--r-- | sh.c | 9 | ||||
-rw-r--r-- | shell/lash.c | 9 |
3 files changed, 24 insertions, 3 deletions
@@ -1010,7 +1010,14 @@ static int expand_arguments(char *command) | |||
1010 | * (char*) into cmd (char**, one word per string) */ | 1010 | * (char*) into cmd (char**, one word per string) */ |
1011 | { | 1011 | { |
1012 | 1012 | ||
1013 | int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE; | 1013 | int flags = GLOB_NOCHECK |
1014 | #ifdef GLOB_BRACE | ||
1015 | | GLOB_BRACE | ||
1016 | #endif | ||
1017 | #ifdef GLOB_TILDE | ||
1018 | | GLOB_TILDE | ||
1019 | #endif | ||
1020 | ; | ||
1014 | char *tmpcmd, *cmd, *cmd_copy; | 1021 | char *tmpcmd, *cmd, *cmd_copy; |
1015 | /* We need a clean copy, so strsep can mess up the copy while | 1022 | /* We need a clean copy, so strsep can mess up the copy while |
1016 | * we write stuff into the original (in a minute) */ | 1023 | * we write stuff into the original (in a minute) */ |
@@ -1010,7 +1010,14 @@ static int expand_arguments(char *command) | |||
1010 | * (char*) into cmd (char**, one word per string) */ | 1010 | * (char*) into cmd (char**, one word per string) */ |
1011 | { | 1011 | { |
1012 | 1012 | ||
1013 | int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE; | 1013 | int flags = GLOB_NOCHECK |
1014 | #ifdef GLOB_BRACE | ||
1015 | | GLOB_BRACE | ||
1016 | #endif | ||
1017 | #ifdef GLOB_TILDE | ||
1018 | | GLOB_TILDE | ||
1019 | #endif | ||
1020 | ; | ||
1014 | char *tmpcmd, *cmd, *cmd_copy; | 1021 | char *tmpcmd, *cmd, *cmd_copy; |
1015 | /* We need a clean copy, so strsep can mess up the copy while | 1022 | /* We need a clean copy, so strsep can mess up the copy while |
1016 | * we write stuff into the original (in a minute) */ | 1023 | * we write stuff into the original (in a minute) */ |
diff --git a/shell/lash.c b/shell/lash.c index dcec14aba..3c52e2a28 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
@@ -1010,7 +1010,14 @@ static int expand_arguments(char *command) | |||
1010 | * (char*) into cmd (char**, one word per string) */ | 1010 | * (char*) into cmd (char**, one word per string) */ |
1011 | { | 1011 | { |
1012 | 1012 | ||
1013 | int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE; | 1013 | int flags = GLOB_NOCHECK |
1014 | #ifdef GLOB_BRACE | ||
1015 | | GLOB_BRACE | ||
1016 | #endif | ||
1017 | #ifdef GLOB_TILDE | ||
1018 | | GLOB_TILDE | ||
1019 | #endif | ||
1020 | ; | ||
1014 | char *tmpcmd, *cmd, *cmd_copy; | 1021 | char *tmpcmd, *cmd, *cmd_copy; |
1015 | /* We need a clean copy, so strsep can mess up the copy while | 1022 | /* We need a clean copy, so strsep can mess up the copy while |
1016 | * we write stuff into the original (in a minute) */ | 1023 | * we write stuff into the original (in a minute) */ |