diff options
author | David Majnemer <david.majnemer@gmail.com> | 2013-10-06 20:44:34 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2013-10-06 20:44:34 +0000 |
commit | b262556c45bb7b3add826bc3f050c99db6990c37 (patch) | |
tree | 78000a447829d54c2c4dfdae66314a83c8d2700a /lib/Support/Windows/Process.inc | |
parent | 5a1a1856a4dfa1335d937437fade5c0bbab06560 (diff) | |
download | external_llvm-b262556c45bb7b3add826bc3f050c99db6990c37.zip external_llvm-b262556c45bb7b3add826bc3f050c99db6990c37.tar.gz external_llvm-b262556c45bb7b3add826bc3f050c99db6990c37.tar.bz2 |
Revert "Windows: Add support for unicode command lines"
This is causing MinGW bots to fail.
This reverts commit r192069.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192070 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/Windows/Process.inc')
-rw-r--r-- | lib/Support/Windows/Process.inc | 64 |
1 files changed, 12 insertions, 52 deletions
diff --git a/lib/Support/Windows/Process.inc b/lib/Support/Windows/Process.inc index 7f7e06c..5d77650 100644 --- a/lib/Support/Windows/Process.inc +++ b/lib/Support/Windows/Process.inc @@ -11,25 +11,18 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/Allocator.h" - #include "Windows.h" #include <direct.h> #include <io.h> #include <malloc.h> #include <psapi.h> -#include <Shellapi.h> #ifdef __MINGW32__ #if (HAVE_LIBPSAPI != 1) #error "libpsapi.a should be present" #endif - #if (HAVE_LIBSHELL32 != 1) - #error "libshell32.a should be present" - #endif #else -#pragma comment(lib, "psapi.lib") -#pragma comment(lib, "Shell32.lib") + #pragma comment(lib, "psapi.lib") #endif //===----------------------------------------------------------------------===// @@ -158,58 +151,25 @@ Optional<std::string> Process::GetEnv(StringRef Name) { // Environment variable can be encoded in non-UTF8 encoding, and there's no // way to know what the encoding is. The only reliable way to look up // multibyte environment variable is to use GetEnvironmentVariableW(). - SmallVector<wchar_t, MAX_PATH> Buf; - size_t Size = MAX_PATH; - do { - Buf.reserve(Size); - Size = GetEnvironmentVariableW(&NameUTF16[0], &Buf[0], Buf.capacity()); - if (Size == 0) - return None; - + std::vector<wchar_t> Buf(16); + size_t Size = 0; + for (;;) { + Size = GetEnvironmentVariableW(&NameUTF16[0], &Buf[0], Buf.size()); + if (Size < Buf.size()) + break; // Try again with larger buffer. - } while (Size > Buf.capacity()); - Buf.set_size(Size); + Buf.resize(Size + 1); + } + if (Size == 0) + return None; // Convert the result from UTF-16 to UTF-8. - SmallVector<char, MAX_PATH> Res; + SmallVector<char, 128> Res; if (error_code ec = windows::UTF16ToUTF8(&Buf[0], Size, Res)) return None; return std::string(&Res[0]); } -error_code -Process::GetArgumentVector(SmallVectorImpl<const char *> &Args, - ArrayRef<const char *>, - SpecificBumpPtrAllocator<char> &ArgAllocator) { - int NewArgCount; - error_code ec; - - wchar_t **UnicodeCommandLine = CommandLineToArgvW(GetCommandLineW(), - &NewArgCount); - if (!UnicodeCommandLine) - return windows_error(::GetLastError()); - - Args.reserve(NewArgCount); - - for (int i = 0; i < NewArgCount; ++i) { - SmallVector<char, MAX_PATH> NewArgString; - ec = windows::UTF16ToUTF8(UnicodeCommandLine[i], - wcslen(UnicodeCommandLine[i]), - NewArgString); - if (ec) - break; - - char *Buffer = ArgAllocator.Allocate(NewArgString.size() + 1); - ::memcpy(Buffer, NewArgString.data(), NewArgString.size() + 1); - Args.push_back(Buffer); - } - LocalFree(UnicodeCommandLine); - if (ec) - return ec; - - return error_code::success(); -} - bool Process::StandardInIsUserInput() { return FileDescriptorIsDisplayed(0); } |