From: Hans Wennborg Date: Thu, 24 Jul 2014 21:09:45 +0000 (+0000) Subject: Windows: Don't wildcard expand /? or -? X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=dee5e2cf7fa5cfc9c9407d66dae9169586041a51 Windows: Don't wildcard expand /? or -? Even if there's a file called c:\a, we want /? to be preserved as an option, not expanded to a filename. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213894 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Support/Windows/Process.inc b/lib/Support/Windows/Process.inc index 9eeca62d9d6..61749a72727 100644 --- a/lib/Support/Windows/Process.inc +++ b/lib/Support/Windows/Process.inc @@ -213,6 +213,11 @@ WildcardExpand(const wchar_t *Arg, SmallVectorImpl &Args, return ConvertAndPushArg(Arg, Args, Allocator); } + if (wcscmp(Arg, L"/?") == 0 || wcscmp(Arg, L"-?") == 0) { + // Don't wildcard expand /?. Always treat it as an option. + return ConvertAndPushArg(Arg, Args, Allocator); + } + // Extract any directory part of the argument. SmallVector Dir; if (std::error_code ec = windows::UTF16ToUTF8(Arg, wcslen(Arg), Dir))