From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Jan 2018 10:17:38 +0000 (+0100)
Subject: tree-wide: port all code to use safe_getcwd()
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=08bd72638f8996f535848058bbb06e2bd77c2a56;p=elogind.git

tree-wide: port all code to use safe_getcwd()
---

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 97cb5046a..c483d0471 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -112,6 +112,7 @@ int safe_getcwd(char **ret) {
 
 int path_make_absolute_cwd(const char *p, char **ret) {
         char *c;
+        int r;
 
         assert(p);
         assert(ret);
@@ -124,9 +125,9 @@ int path_make_absolute_cwd(const char *p, char **ret) {
         else {
                 _cleanup_free_ char *cwd = NULL;
 
-                cwd = get_current_dir_name();
-                if (!cwd)
-                        return negative_errno();
+                r = safe_getcwd(&cwd);
+                if (r < 0)
+                        return r;
 
                 c = strjoin(cwd, "/", p);
         }
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 22aa64f4c..b41abd1e0 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -326,7 +326,7 @@ static void test_readlink_and_make_absolute(void) {
         free(r);
         assert_se(unlink(name_alias) >= 0);
 
-        assert_se(pwd = get_current_dir_name());
+        assert_se(safe_getcwd(&pwd) >= 0);
 
         assert_se(chdir(tempdir) >= 0);
         assert_se(symlink(name2, name_alias) >= 0);