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

Unify gethostname() behavior across different versions of libc

Browse Source 
The behavior of `gethostname` in case of an insufficient buffer is
library and version dependent. Work around this by using a big enough
buffer then truncating the output to our desired max length.
This commit is contained in:
Mahmoud Al-Qudsi 2018-03-09 14:52:29 -06:00
parent a991fd5a1a
commit ed9c0a7f82
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/env_universal_common.cpp
View File

@ -44,6 +44,7 @@
#include "utf8.h"
#include "util.h" // IWYU pragma: keep
#include "wutil.h"
#include "wcstringutil.h"
#if __APPLE__
#define FISH_NOTIFYD_AVAILABLE 1
@ -912,10 +913,13 @@ static bool get_mac_address(unsigned char macaddr[MAC_ADDRESS_MAX_LEN]) { return
/// Function to get an identifier based on the hostname.
static bool get_hostname_identifier(wcstring *result) {
//The behavior of gethostname if the buffer size is insufficient differs by implementation and libc version
//Work around this by using a "guaranteed" sufficient buffer size then truncating the result.
bool success = false;
char hostname[HOSTNAME_LEN + 1] = {};
if (gethostname(hostname, HOSTNAME_LEN) == 0) {
char hostname[256] = {};
if (gethostname(hostname, sizeof(hostname)) == 0) {
result->assign(str2wcstring(hostname));
result->assign(truncate(*result, HOSTNAME_LEN));
success = true;
}
return success;