Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Remove the WSL warning"

Browse source 
This reverts commit 5101bdeb9f.
This commit is contained in:
Mahmoud Al-Qudsi 2019-08-25 18:29:46 -05:00
parent 99c498d3d7
commit 44022e65c2
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/common.cpp
View file

@ -16,7 +16,6 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/utsname.h>
#include <termios.h>
#include <unistd.h>
#include <wctype.h>
@ -32,6 +31,11 @@
#include <sys/ioctl.h>
#endif
#ifdef __linux__
// Includes for WSL detection
#include <sys/utsname.h>
#endif
#ifdef __FreeBSD__
#include <sys/sysctl.h>
#elif __APPLE__
@ -153,10 +157,29 @@ bool is_windows_subsystem_for_linux() {
#elif not defined(__linux__)
return false;
#else
// We are purposely not using std::call_once as it may invoke locking, which is an unnecessary
// overhead since there's no actual race condition here - even if multiple threads call this
// routine simultaneously the first time around, we just end up needlessly querying uname(2) one
// more time.
static bool wsl_state = []() {
utsname info{};
utsname info;
uname(&info);
return std::strstr(info.release, "Microsoft") != nullptr;
// Sample utsname.release under WSL: 4.4.0-17763-Microsoft
if (std::strstr(info.release, "Microsoft") != nullptr) {
const char *dash = std::strchr(info.release, '-');
if (dash == nullptr || strtod(dash + 1, nullptr) < 17763) {
debug(1,
"This version of WSL is not supported and fish will probably not work "
"correctly!\n"
"Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
}
return true;
} else {
return false;
}
}();
// Subsequent calls to this function may take place after fork() and before exec() in