From e5b70d47aa656833e4609106f9f1ef48b67664cc Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Mon, 4 Apr 2022 08:19:49 -0700
Subject: [PATCH] libutil: cleanup savedCwd logic

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
---
 src/libutil/util.cc | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 28ab77adc..9b34d5d72 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -1698,20 +1698,7 @@ void saveMountNamespace()
 #if __linux__
     static std::once_flag done;
     std::call_once(done, []() {
-#ifdef __GNU__
-        // 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
-
+        savedCwd = absPath(".");
         AutoCloseFD fd = open("/proc/self/ns/mnt", O_RDONLY);
         if (!fd)
             throw SysError("saving parent mount namespace");