github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-01 22:42:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use __GLIBC_PREREQ instead of parsing gnu_get_libc_version

Browse Source 
__GLIBC_PREREQ is the preferred way to conditionally enable features
based on glibc versions. Use it to avoid expensive parsing and
locale sensitivity. See #8204
This commit is contained in:
ridiculousfish 2021-10-15 21:12:26 -07:00
parent 7ccf001bc3
commit f0d4fd85b1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/env_dispatch.cpp
View File

@ -268,8 +268,6 @@ extern "C" {
const char *gnu_get_libc_version(); const char *gnu_get_libc_version();
} }
// Disallow posix_spawn entirely on glibc <= 2.24.
// See #8021.
static bool allow_use_posix_spawn() { static bool allow_use_posix_spawn() {
// OpenBSD's posix_spawn returns status 127, instead of erroring with ENOEXEC, when faced with a // OpenBSD's posix_spawn returns status 127, instead of erroring with ENOEXEC, when faced with a
// shebangless script. Disable posix_spawn on OpenBSD. // shebangless script. Disable posix_spawn on OpenBSD.
@ -279,14 +277,17 @@ static bool allow_use_posix_spawn() {
bool result = true; bool result = true;
// uClibc defines __GLIBC__. // uClibc defines __GLIBC__.
#if defined(__GLIBC__) && !defined(__UCLIBC__) #if defined(__GLIBC__) && !defined(__UCLIBC__)
const char *version = gnu_get_libc_version(); // Disallow posix_spawn entirely on glibc < 2.24.
result = version && strtod_l(version, nullptr, fish_c_locale()) >= 2.24; // See #8021.
if (!__GLIBC_PREREQ(2, 24)) {
result = false;
}
#endif #endif
return result; return result;
} }
static void handle_fish_use_posix_spawn_change(const environment_t &vars) { static void handle_fish_use_posix_spawn_change(const environment_t &vars) {
// Note if the variable is missing or empty, we default to true. // Note if the variable is missing or empty, we default to true if allowed.
if (!allow_use_posix_spawn()) { if (!allow_use_posix_spawn()) {
g_use_posix_spawn = false; g_use_posix_spawn = false;
} else if (auto var = vars.get(L"fish_use_posix_spawn")) { } else if (auto var = vars.get(L"fish_use_posix_spawn")) {