diff options
author | Rubidium <rubidium@openttd.org> | 2021-07-10 22:32:35 +0200 |
---|---|---|
committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-07-10 22:55:46 +0200 |
commit | 3e4d3274517d6a5f3fede18e0e29eafcdc30d0c8 (patch) | |
tree | 93524cd39d22bd38a14d30f22ead746022b175e5 /src/fileio.cpp | |
parent | d158eba72c89ae580c55a8421d470528de7637f5 (diff) | |
download | openttd-3e4d3274517d6a5f3fede18e0e29eafcdc30d0c8.tar.xz |
Codechange: use the C++ std::getenv over the POSIX/C getenv
The C++ std::getenv is guaranteed thread-safe by the C++11 specification,
whereas the POSIX/C getenv might not be thread-safe by the C11 specification.
Diffstat (limited to 'src/fileio.cpp')
-rw-r--r-- | src/fileio.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fileio.cpp b/src/fileio.cpp index c000362ef..23562cf6a 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -822,7 +822,7 @@ static std::string GetHomeDir() find_directory(B_USER_SETTINGS_DIRECTORY, &path); return std::string(path.Path()); #else - const char *home_env = getenv("HOME"); // Stack var, shouldn't be freed + const char *home_env = std::getenv("HOME"); // Stack var, shouldn't be freed if (home_env != nullptr) return std::string(home_env); const struct passwd *pw = getpwuid(getuid()); @@ -840,7 +840,7 @@ void DetermineBasePaths(const char *exe) std::string tmp; const std::string homedir = GetHomeDir(); #ifdef USE_XDG - const char *xdg_data_home = getenv("XDG_DATA_HOME"); + const char *xdg_data_home = std::getenv("XDG_DATA_HOME"); if (xdg_data_home != nullptr) { tmp = xdg_data_home; tmp += PATHSEP; @@ -971,7 +971,7 @@ void DeterminePaths(const char *exe, bool only_local_path) #ifdef USE_XDG std::string config_home; const std::string homedir = GetHomeDir(); - const char *xdg_config_home = getenv("XDG_CONFIG_HOME"); + const char *xdg_config_home = std::getenv("XDG_CONFIG_HOME"); if (xdg_config_home != nullptr) { config_home = xdg_config_home; config_home += PATHSEP; |