[llvm-branch-commits] [llvm-branch] r214248 - Merging r213894:

[Hans Wennborg]

Author: hans
Date: Tue Jul 29 18:27:06 2014
New Revision: 214248

URL: http://llvm.org/viewvc/llvm-project?rev=214248&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/   (props changed)
    llvm/branches/release_35/lib/Support/Windows/Process.inc

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 29 18:27:06 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213749,213847,213915
+/llvm/trunk:155241,213653,213749,213847,213894,213915

Modified: llvm/branches/release_35/lib/Support/Windows/Process.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Support/Windows/Process.inc?rev=214248&r1=214247&r2=214248&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Support/Windows/Process.inc (original)
+++ llvm/branches/release_35/lib/Support/Windows/Process.inc Tue Jul 29 18:27:06 2014
@@ -213,6 +213,11 @@ WildcardExpand(const wchar_t *Arg, Small
     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))