Skip to content

Commit 1cb24ca

Browse files
Update HAS_GETPWENT code path for std::string g_login_name
1 parent 291d861 commit 1cb24ca

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

util/env.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ static bool set_user_name(char *tmpbuf)
182182
#ifdef HAS_GETPWENT
183183
passwd* pwd;
184184

185-
if (g_login_name == nullptr)
185+
if (g_login_name.empty())
186186
pwd = getpwuid(getuid());
187187
else
188-
pwd = getpwnam(g_login_name);
188+
pwd = getpwnam(g_login_name.c_str());
189189
if (!pwd)
190190
return 0;
191-
if (!g_login_name)
192-
g_login_name = savestr(pwd->pw_name);
191+
if (g_login_name.empty())
192+
g_login_name = pwd->pw_name;
193193
if (!g_home_dir)
194194
g_home_dir = savestr(pwd->pw_dir);
195195
s = pwd->pw_gecos;

0 commit comments

Comments
 (0)