authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-01 00:30:35-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-01 00:33:02-04:00
log8b1900e5df76a126404c6905b9e91136c738da55
tree1edd5524c2af6ba134e89f1026a1450507b47f02
parentec6f15b0f5e1de517ac130241e3576f1afdd50cf
signaturelock-open Commit is signed but in an unrecognized format.

Revert "Merge pull request #2991 from emekoi/mingw-ci"

This reverts commit ec7d7a5b14540ea3b2bab9f11318630338467965, reversing changes made to 81c441f8855d4c58f0b2ff86d3d007cf0bf395d3. It looks like this broke colors in Windows Command Prompt (#3147) and this method of detecting native C ABI isn't working well (#3121).

4 files changed, 20 insertions(+), 40 deletions(-)

src/os.cpp+15-15
......@@ -1125,27 +1125,29 @@ Error os_get_cwd(Buf *out_cwd) {
11251125#endif
11261126}
11271127
1128#if defined(ZIG_OS_WINDOWS)
11281129#define is_wprefix(s, prefix) \
11291130 (wcsncmp((s), (prefix), sizeof(prefix) / sizeof(WCHAR) - 1) == 0)
1130bool ATTRIBUTE_MUST_USE os_is_cygwin_pty(int fd) {
1131#if defined(ZIG_OS_WINDOWS)
1132 HANDLE handle = (HANDLE)_get_osfhandle(fd);
1133
1134 // Cygwin/msys's pty is a pipe.
1135 if (handle == INVALID_HANDLE_VALUE || GetFileType(handle) != FILE_TYPE_PIPE) {
1131static bool is_stderr_cyg_pty(void) {
1132 HANDLE stderr_handle = GetStdHandle(STD_ERROR_HANDLE);
1133 if (stderr_handle == INVALID_HANDLE_VALUE)
11361134 return false;
1137 }
11381135
11391136 int size = sizeof(FILE_NAME_INFO) + sizeof(WCHAR) * MAX_PATH;
1137 FILE_NAME_INFO *nameinfo;
11401138 WCHAR *p = NULL;
11411139
1142 FILE_NAME_INFO *nameinfo = (FILE_NAME_INFO *)allocate<char>(size);
1140 // Cygwin/msys's pty is a pipe.
1141 if (GetFileType(stderr_handle) != FILE_TYPE_PIPE) {
1142 return 0;
1143 }
1144 nameinfo = (FILE_NAME_INFO *)allocate<char>(size);
11431145 if (nameinfo == NULL) {
1144 return false;
1146 return 0;
11451147 }
11461148 // Check the name of the pipe:
11471149 // '\{cygwin,msys}-XXXXXXXXXXXXXXXX-ptyN-{from,to}-master'
1148 if (GetFileInformationByHandleEx(handle, FileNameInfo, nameinfo, size)) {
1150 if (GetFileInformationByHandleEx(stderr_handle, FileNameInfo, nameinfo, size)) {
11491151 nameinfo->FileName[nameinfo->FileNameLength / sizeof(WCHAR)] = L'\0';
11501152 p = nameinfo->FileName;
11511153 if (is_wprefix(p, L"\\cygwin-")) { /* Cygwin */
......@@ -1178,14 +1180,12 @@ bool ATTRIBUTE_MUST_USE os_is_cygwin_pty(int fd) {
11781180 }
11791181 free(nameinfo);
11801182 return (p != NULL);
1181#else
1182 return false;
1183#endif
11841183}
1184#endif
11851185
11861186bool os_stderr_tty(void) {
11871187#if defined(ZIG_OS_WINDOWS)
1188 return _isatty(fileno(stderr)) != 0 || os_is_cygwin_pty(fileno(stderr));
1188 return _isatty(_fileno(stderr)) != 0 || is_stderr_cyg_pty();
11891189#elif defined(ZIG_OS_POSIX)
11901190 return isatty(STDERR_FILENO) != 0;
11911191#else
......@@ -1486,7 +1486,7 @@ WORD original_console_attributes = FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BL
14861486
14871487void os_stderr_set_color(TermColor color) {
14881488#if defined(ZIG_OS_WINDOWS)
1489 if (os_stderr_tty()) {
1489 if (is_stderr_cyg_pty()) {
14901490 set_color_posix(color);
14911491 return;
14921492 }
src/os.hpp-8
......@@ -11,7 +11,6 @@
1111#include "list.hpp"
1212#include "buffer.hpp"
1313#include "error.hpp"
14#include "target.hpp"
1514#include "zig_llvm.h"
1615#include "windows_sdk.h"
1716
......@@ -89,11 +88,6 @@ struct Termination {
8988#define OsFile int
9089#endif
9190
92#if defined(ZIG_OS_WINDOWS)
93#undef fileno
94#define fileno _fileno
95#endif
96
9791struct OsTimeStamp {
9892 uint64_t sec;
9993 uint64_t nsec;
......@@ -158,8 +152,6 @@ Error ATTRIBUTE_MUST_USE os_get_win32_ucrt_include_path(ZigWindowsSDK *sdk, Buf
158152Error ATTRIBUTE_MUST_USE os_get_win32_ucrt_lib_path(ZigWindowsSDK *sdk, Buf *output_buf, ZigLLVM_ArchType platform_type);
159153Error ATTRIBUTE_MUST_USE os_get_win32_kern32_path(ZigWindowsSDK *sdk, Buf *output_buf, ZigLLVM_ArchType platform_type);
160154
161bool ATTRIBUTE_MUST_USE os_is_cygwin_pty(int fd);
162
163155Error ATTRIBUTE_MUST_USE os_self_exe_shared_libs(ZigList<Buf *> &paths);
164156
165157#endif
src/target.cpp+1-14
......@@ -491,16 +491,6 @@ Error target_parse_glibc_version(ZigGLibCVersion *glibc_ver, const char *text) {
491491 return ErrorNone;
492492}
493493
494static ZigLLVM_EnvironmentType target_get_win32_abi() {
495 FILE* files[] = { stdin, stdout, stderr, nullptr };
496 for (int i = 0; files[i] != nullptr; i++) {
497 if (os_is_cygwin_pty(fileno(files[i]))) {
498 return ZigLLVM_GNU;
499 }
500 }
501 return ZigLLVM_MSVC;
502}
503
504494void get_native_target(ZigTarget *target) {
505495 // first zero initialize
506496 *target = {};
......@@ -515,9 +505,6 @@ void get_native_target(ZigTarget *target) {
515505 &target->abi,
516506 &oformat);
517507 target->os = get_zig_os_type(os_type);
518 if (target->os == OsWindows) {
519 target->abi = target_get_win32_abi();
520 }
521508 target->is_native = true;
522509 if (target->abi == ZigLLVM_UnknownEnvironment) {
523510 target->abi = target_default_abi(target->arch, target->os);
......@@ -1614,7 +1601,7 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) {
16141601 return ZigLLVM_GNU;
16151602 case OsUefi:
16161603 case OsWindows:
1617 return ZigLLVM_MSVC;
1604 return ZigLLVM_MSVC;
16181605 case OsLinux:
16191606 case OsWASI:
16201607 return ZigLLVM_Musl;
std/os/windows.zig+4-3
......@@ -65,7 +65,7 @@ pub const CreateFileError = error{
6565 InvalidUtf8,
6666
6767 /// On Windows, file paths cannot contain these characters:
68 /// '*', '?', '"', '<', '>', '|', and '/' (when the ABI is not GNU)
68 /// '/', '*', '?', '"', '<', '>', '|'
6969 BadPathName,
7070
7171 Unexpected,
......@@ -836,10 +836,11 @@ pub fn sliceToPrefixedSuffixedFileW(s: []const u8, comptime suffix: []const u16)
836836 // > converting the name to an NT-style name, except when using the "\\?\"
837837 // > prefix as detailed in the following sections.
838838 // from https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file#maximum-path-length-limitation
839 // Because we want the larger maximum path length for absolute paths, we
840 // disallow forward slashes in zig std lib file functions on Windows.
839841 for (s) |byte| {
840842 switch (byte) {
841 '*', '?', '"', '<', '>', '|' => return error.BadPathName,
842 '/' => if (builtin.abi == .msvc) return error.BadPathName,
843 '/', '*', '?', '"', '<', '>', '|' => return error.BadPathName,
843844 else => {},
844845 }
845846 }