basic/path-util: allow flags for path_equal_or_files_same

No functional change, just a new parameters and the tests that
AT_SYMLINK_NOFOLLOW works as expected.

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 0e4e76dc42e5ae82e071559cb9c9dc55f48a4068..acd1007e3c08feb72b8767071574c7698d649d7b 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -444,8 +444,8 @@ bool path_equal(const char *a, const char *b) {
         return path_compare(a, b) == 0;
 }
 
-bool path_equal_or_files_same(const char *a, const char *b) {
-        return path_equal(a, b) || files_same(a, b) > 0;
+bool path_equal_or_files_same(const char *a, const char *b, int flags) {
+        return path_equal(a, b) || files_same(a, b, flags) > 0;
 }
 
 char* path_join(const char *root, const char *path, const char *rest) {

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 487ae139622ee6f6d71051a4ce96ff6a3e429616..3c0dbb321ee09d06f504cfcd8c1da0942c0c3355 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -52,7 +52,7 @@ char* path_kill_slashes(char *path);
 char* path_startswith(const char *path, const char *prefix) _pure_;
 int path_compare(const char *a, const char *b) _pure_;
 bool path_equal(const char *a, const char *b) _pure_;
-bool path_equal_or_files_same(const char *a, const char *b);
+bool path_equal_or_files_same(const char *a, const char *b, int flags);
 char* path_join(const char *root, const char *path, const char *rest);
 
 static inline bool path_equal_ptr(const char *a, const char *b) {

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 08ec66fb31a5f647747a77ce7c4174c37d1ad5fe..cb41fbf3199f266881ee6de908dd06f52393c56c 100644 (file)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -814,7 +814,7 @@ int pid_from_same_root_fs(pid_t pid) {
 
         root = procfs_file_alloca(pid, "root");
 
-        return files_same(root, "/proc/1/root");
+        return files_same(root, "/proc/1/root", 0);
 }
 #endif // 0
 

diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index 87a7bd845fba3195f813e1ba3d11d49a82874751..225a212963e0e4f2160b53d961cb4b9fa3ff674a 100644 (file)
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -184,7 +184,7 @@ int rm_rf(const char *path, RemoveFlags flags) {
         /* We refuse to clean the root file system with this
          * call. This is extra paranoia to never cause a really
          * seriously broken system. */
-        if (path_equal_or_files_same(path, "/")) {
+        if (path_equal_or_files_same(path, "/", 0)) {
                 log_error("Attempted to remove entire root file system, and we can't allow that.");
                 return -EPERM;
         }

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 23e960e023fa19872fe27f3cf13ab289c7a6ebb3..c1312c1d2940721cbc88b1cf9124ae9822d6111d 100644 (file)
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -412,7 +412,7 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
                         return false;
 
                 if (a->sockaddr.un.sun_path[0]) {
-                        if (!path_equal_or_files_same(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path))
+                        if (!path_equal_or_files_same(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, 0))
                                 return false;
                 } else {
                         if (a->size != b->size)

diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index d262fe16a674eda3ecb7f704591367a9e4c4ca8e..0280afeecd743a210e6840a3bd43bbead2248db3 100644 (file)
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -176,16 +176,16 @@ int path_is_os_tree(const char *path) {
 }
 #endif // 0
 
-int files_same(const char *filea, const char *fileb) {
+int files_same(const char *filea, const char *fileb, int flags) {
         struct stat a, b;
 
         assert(filea);
         assert(fileb);
 
-        if (stat(filea, &a) < 0)
+        if (fstatat(AT_FDCWD, filea, &a, flags) < 0)
                 return -errno;
 
-        if (stat(fileb, &b) < 0)
+        if (fstatat(AT_FDCWD, fileb, &b, flags) < 0)
                 return -errno;
 
         return a.st_dev == b.st_dev &&

diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 32d09d01425ad39bda35d7e087ff0799d0be8bec..c74d1d58e042c1286519bf1e28a9d8d5ee2d2376 100644 (file)
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -57,7 +57,7 @@ int path_is_read_only_fs(const char *path);
 int path_is_os_tree(const char *path);
 #endif // 0
 
-int files_same(const char *filea, const char *fileb);
+int files_same(const char *filea, const char *fileb, int flags);
 
 /* The .f_type field of struct statfs is really weird defined on
  * different archs. Let's give its type a name. */

diff --git a/src/basic/util.c b/src/basic/util.c
index 88c996c55a3e5eebc0c69bb73b44732635593f9b..cd7f0e42de3c4d4446d33fa842c8811ef890b2a9 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -548,7 +548,7 @@ int namespace_enter(int pidns_fd, int mntns_fd, int netns_fd, int userns_fd, int
                 if (asprintf(&userns_fd_path, "/proc/self/fd/%d", userns_fd) < 0)
                         return -ENOMEM;
 
-                r = files_same(userns_fd_path, "/proc/self/ns/user");
+                r = files_same(userns_fd_path, "/proc/self/ns/user", 0);
                 if (r < 0)
                         return r;
                 if (r)

diff --git a/src/basic/virt.c b/src/basic/virt.c
index 9ea18e63f466a1251eb647f4cdc1bc32e4c85274..0060bb84602dc4c6aa98b53df4e41626ad3418d7 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -579,7 +579,7 @@ int running_in_chroot(void) {
                 return 0;
 #endif // 0
 
-        ret = files_same("/proc/1/root", "/");
+        ret = files_same("/proc/1/root", "/", 0);
         if (ret < 0)
                 return ret;
 

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 72b931568d004fcbc963fed55c0a076ce196d63f..c27624b43f0e5f6b00b23f014cffadb508c398a8 100644 (file)
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -117,23 +117,33 @@ static void test_path_equal_root(void) {
 
         /* Make sure that files_same works as expected. */
 
-        assert_se(files_same("/", "/") > 0);
-        assert_se(files_same("/", "//") > 0);
+        assert_se(files_same("/", "/", 0) > 0);
+        assert_se(files_same("/", "/", AT_SYMLINK_NOFOLLOW) > 0);
+        assert_se(files_same("/", "//", 0) > 0);
+        assert_se(files_same("/", "//", AT_SYMLINK_NOFOLLOW) > 0);
 
-        assert_se(files_same("/", "/./") > 0);
-        assert_se(files_same("/", "/../") > 0);
+        assert_se(files_same("/", "/./", 0) > 0);
+        assert_se(files_same("/", "/./", AT_SYMLINK_NOFOLLOW) > 0);
+        assert_se(files_same("/", "/../", 0) > 0);
+        assert_se(files_same("/", "/../", AT_SYMLINK_NOFOLLOW) > 0);
 
-        assert_se(files_same("/", "/.../") == -ENOENT);
+        assert_se(files_same("/", "/.../", 0) == -ENOENT);
+        assert_se(files_same("/", "/.../", AT_SYMLINK_NOFOLLOW) == -ENOENT);
 
         /* The same for path_equal_or_files_same. */
 
-        assert_se(path_equal_or_files_same("/", "/"));
-        assert_se(path_equal_or_files_same("/", "//"));
+        assert_se(path_equal_or_files_same("/", "/", 0));
+        assert_se(path_equal_or_files_same("/", "/", AT_SYMLINK_NOFOLLOW));
+        assert_se(path_equal_or_files_same("/", "//", 0));
+        assert_se(path_equal_or_files_same("/", "//", AT_SYMLINK_NOFOLLOW));
 
-        assert_se(path_equal_or_files_same("/", "/./"));
-        assert_se(path_equal_or_files_same("/", "/../"));
+        assert_se(path_equal_or_files_same("/", "/./", 0));
+        assert_se(path_equal_or_files_same("/", "/./", AT_SYMLINK_NOFOLLOW));
+        assert_se(path_equal_or_files_same("/", "/../", 0));
+        assert_se(path_equal_or_files_same("/", "/../", AT_SYMLINK_NOFOLLOW));
 
-        assert_se(!path_equal_or_files_same("/", "/.../"));
+        assert_se(!path_equal_or_files_same("/", "/.../", 0));
+        assert_se(!path_equal_or_files_same("/", "/.../", AT_SYMLINK_NOFOLLOW));
 }
 
 static void test_find_binary(const char *self) {

diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index 93d025dac861d190dc2d403a0046614d301d1d72..2825dbc5240ae0deeae5aeba033b2b309576cae5 100644 (file)
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -38,8 +38,10 @@ static void test_files_same(void) {
         assert_se(fd >= 0);
         assert_se(symlink(name, name_alias) >= 0);
 
-        assert_se(files_same(name, name));
-        assert_se(files_same(name, name_alias));
+        assert_se(files_same(name, name, 0));
+        assert_se(files_same(name, name, AT_SYMLINK_NOFOLLOW));
+        assert_se(files_same(name, name_alias, 0));
+        assert_se(!files_same(name, name_alias, AT_SYMLINK_NOFOLLOW));
 
         unlink(name);
         unlink(name_alias);