diff options
author | Ron Yorston <rmy@pobox.com> | 2014-04-21 10:26:50 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-04-21 10:26:50 +0100 |
commit | f24b57e5523aa2ebb892357cf525cb4220dd6ba8 (patch) | |
tree | 7f23e8b11e4799d24b2e9a71c3c04b26324d085e | |
parent | 60d938a3579786138cdec207b73fe24af47908ad (diff) | |
download | busybox-w32-f24b57e5523aa2ebb892357cf525cb4220dd6ba8.tar.gz busybox-w32-f24b57e5523aa2ebb892357cf525cb4220dd6ba8.tar.bz2 busybox-w32-f24b57e5523aa2ebb892357cf525cb4220dd6ba8.zip |
Move handling of Windows globbing out of upstream code
-rw-r--r-- | applets/applets.c | 5 | ||||
-rw-r--r-- | libbb/appletlib.c | 5 | ||||
-rw-r--r-- | win32/mingw.c | 5 |
3 files changed, 5 insertions, 10 deletions
diff --git a/applets/applets.c b/applets/applets.c index 0e2f94f40..98c2b44f5 100644 --- a/applets/applets.c +++ b/applets/applets.c | |||
@@ -9,11 +9,6 @@ | |||
9 | #include "busybox.h" | 9 | #include "busybox.h" |
10 | 10 | ||
11 | #if ENABLE_BUILD_LIBBUSYBOX | 11 | #if ENABLE_BUILD_LIBBUSYBOX |
12 | #if ENABLE_NOGLOB | ||
13 | /* disable MSVCRT command line globbing */ | ||
14 | int _CRT_glob = 0; | ||
15 | #endif | ||
16 | |||
17 | int main(int argc UNUSED_PARAM, char **argv) | 12 | int main(int argc UNUSED_PARAM, char **argv) |
18 | { | 13 | { |
19 | return lbb_main(argv); | 14 | return lbb_main(argv); |
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 5e96ae75f..1d0a8f711 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
@@ -792,11 +792,6 @@ void FAST_FUNC run_applet_and_exit(const char *name, char **argv) | |||
792 | #if ENABLE_BUILD_LIBBUSYBOX | 792 | #if ENABLE_BUILD_LIBBUSYBOX |
793 | int lbb_main(char **argv) | 793 | int lbb_main(char **argv) |
794 | #else | 794 | #else |
795 | #if ENABLE_NOGLOB | ||
796 | /* disable MSVCRT command line globbing */ | ||
797 | int _CRT_glob = 0; | ||
798 | #endif | ||
799 | |||
800 | int main(int argc UNUSED_PARAM, char **argv) | 795 | int main(int argc UNUSED_PARAM, char **argv) |
801 | #endif | 796 | #endif |
802 | { | 797 | { |
diff --git a/win32/mingw.c b/win32/mingw.c index 2645aadca..501c886e0 100644 --- a/win32/mingw.c +++ b/win32/mingw.c | |||
@@ -1,6 +1,11 @@ | |||
1 | #include "libbb.h" | 1 | #include "libbb.h" |
2 | #include <userenv.h> | 2 | #include <userenv.h> |
3 | 3 | ||
4 | #if ENABLE_NOGLOB | ||
5 | /* disable MSVCRT command line globbing */ | ||
6 | int _CRT_glob = 0; | ||
7 | #endif | ||
8 | |||
4 | unsigned int _CRT_fmode = _O_BINARY; | 9 | unsigned int _CRT_fmode = _O_BINARY; |
5 | 10 | ||
6 | static int err_win_to_posix(DWORD winerr) | 11 | static int err_win_to_posix(DWORD winerr) |