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

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 97cb5046a1a7ab0cb31e6f09f751d5b15e35a3e1..c483d04715686403702bc973678a9b5058caad99 100644 (file)
--- 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 22aa64f4cb680bdf62fd7dc9fe518a10c56c71d3..b41abd1e04016b896327f7b5ca734ea43ba5c534 100644 (file)
--- 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);