h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-18 03:41:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

lint: replace getpwname() with getpwnam_r()

Browse Source
This commit is contained in:
Kurtis Rader
2017-05-09 22:23:32 -07:00
parent 9b78857894
commit a92a7cbb9c
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/env.cpp
View File

@@ -840,16 +840,19 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
if (env_get_string(L"HOME").missing_or_empty()) {
const env_var_t unam = env_get_string(L"USER");
char *unam_narrow = wcs2str(unam.c_str());
struct passwd *pw = getpwnam(unam_narrow);
if (pw == NULL) {
struct passwd userinfo;
struct passwd *result;
char buf[8192];
int retval = getpwnam_r(unam_narrow, &userinfo, buf, sizeof(buf), &result);
if (retval || !result) {
// Maybe USER is set but it's bogus. Reset USER from the db and try again.
setup_user(true);
const env_var_t unam = env_get_string(L"USER");
unam_narrow = wcs2str(unam.c_str());
pw = getpwnam(unam_narrow);
retval = getpwnam_r(unam_narrow, &userinfo, buf, sizeof(buf), &result);
}
if (pw && pw->pw_dir) {
const wcstring dir = str2wcstring(pw->pw_dir);
if (!retval && result && userinfo.pw_dir) {
const wcstring dir = str2wcstring(userinfo.pw_dir);
env_set(L"HOME", dir.c_str(), ENV_GLOBAL | ENV_EXPORT);
}
free(unam_narrow);