Merging r213894:

------------------------------------------------------------------------
r213894 | hans | 2014-07-24 14:09:45 -0700 (Thu, 24 Jul 2014) | 4 lines

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/branches/release_35@214248 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Hans Wennborg 2014-07-29 23:27:06 +00:00
parent 3d8fb061a9
commit 1b7ea62aa8

View File

@ -213,6 +213,11 @@ WildcardExpand(const wchar_t *Arg, SmallVectorImpl<const char *> &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<char, MAX_PATH> Dir;
if (std::error_code ec = windows::UTF16ToUTF8(Arg, wcslen(Arg), Dir))