From 32f8610c8978673aa5d4f51097f955cdd14c13d8 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sun, 12 Apr 2015 13:07:19 +0100 Subject: Allow globbing to be enabled with mingw64 mingw64 handles globbing differently from mingw32. Add code to allow globbing to be enabled. (By default mingw64 has globbing disabled, though the default can be changed when it's compiled.) Also change the configuration option from ENABLE_NOGLOB to ENABLE_GLOBBING, because double negatives make me think too much. The default is still for globbing to be disabled. --- win32/mingw.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'win32') diff --git a/win32/mingw.c b/win32/mingw.c index d76f17820..514d00692 100644 --- a/win32/mingw.c +++ b/win32/mingw.c @@ -1,18 +1,27 @@ #include "libbb.h" #include -#if ENABLE_NOGLOB -/* disable MSVCRT command line globbing */ -int _CRT_glob = 0; +#if defined(__MINGW64_VERSION_MAJOR) +#if ENABLE_GLOBBING +int _dowildcard = -1; +#else +int _dowildcard = 0; #endif -#if !defined(__MINGW64_VERSION_MAJOR) -unsigned int _CRT_fmode = _O_BINARY; -#else #undef _fmode int _fmode = _O_BINARY; #endif +#if !defined(__MINGW64_VERSION_MAJOR) +#if ENABLE_GLOBBING +int _CRT_glob = 1; +#else +int _CRT_glob = 0; +#endif + +unsigned int _CRT_fmode = _O_BINARY; +#endif + smallint bb_got_signal; static int err_win_to_posix(DWORD winerr) -- cgit v1.2.3-55-g6feb