From f24b57e5523aa2ebb892357cf525cb4220dd6ba8 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Mon, 21 Apr 2014 10:26:50 +0100 Subject: Move handling of Windows globbing out of upstream code --- applets/applets.c | 5 ----- libbb/appletlib.c | 5 ----- 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 @@ #include "busybox.h" #if ENABLE_BUILD_LIBBUSYBOX -#if ENABLE_NOGLOB -/* disable MSVCRT command line globbing */ -int _CRT_glob = 0; -#endif - int main(int argc UNUSED_PARAM, char **argv) { 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) #if ENABLE_BUILD_LIBBUSYBOX int lbb_main(char **argv) #else -#if ENABLE_NOGLOB -/* disable MSVCRT command line globbing */ -int _CRT_glob = 0; -#endif - int main(int argc UNUSED_PARAM, char **argv) #endif { 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 @@ #include "libbb.h" #include +#if ENABLE_NOGLOB +/* disable MSVCRT command line globbing */ +int _CRT_glob = 0; +#endif + unsigned int _CRT_fmode = _O_BINARY; static int err_win_to_posix(DWORD winerr) -- cgit v1.2.3-55-g6feb