lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libutil: cleanup savedCwd logic

Browse source 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
This commit is contained in:
Cole Helbling 2022-04-04 08:19:49 -07:00
parent 2a45cf54e4
commit e5b70d47aa
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libutil/util.cc
View file

@ -1698,20 +1698,7 @@ void saveMountNamespace()
#if __linux__ #if __linux__
static std::once_flag done; static std::once_flag done;
std::call_once(done, []() { std::call_once(done, []() {
#ifdef __GNU__ savedCwd = absPath(".");
// getcwd allocating its return value is a GNU extension.
char *cwd = getcwd(NULL, 0);
if (cwd == NULL)
#else
char cwd[PATH_MAX];
if (!getcwd(cwd, sizeof(cwd)))
#endif
throw SysError("getting cwd");
savedCwd.emplace(cwd);
#ifdef __GNU__
free(cwd);
#endif
AutoCloseFD fd = open("/proc/self/ns/mnt", O_RDONLY); AutoCloseFD fd = open("/proc/self/ns/mnt", O_RDONLY);
if (!fd) if (!fd)
throw SysError("saving parent mount namespace"); throw SysError("saving parent mount namespace");