From 7dcdb24e192c664d1e84db748fa38819f3daa693 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 8 Dec 2016 17:19:27 +0100 Subject: util-lib: beef path_is_os_tree() up a bit Let's use chase_symlinks() when looking for /etc/os-release and /usr/lib/os-release as these files might be symlinks (and actually are IRL on some distros). --- src/test/test-stat-util.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/test/test-stat-util.c') diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c index 6c34250a01..10fc4af79f 100644 --- a/src/test/test-stat-util.c +++ b/src/test/test-stat-util.c @@ -60,9 +60,16 @@ static void test_is_symlink(void) { unlink(name_link); } +static void test_path_is_os_tree(void) { + assert_se(path_is_os_tree("/") > 0); + assert_se(path_is_os_tree("/etc") == 0); + assert_se(path_is_os_tree("/idontexist") == -ENOENT); +} + int main(int argc, char *argv[]) { test_files_same(); test_is_symlink(); + test_path_is_os_tree(); return 0; } -- cgit v1.2.3-54-g00ecf From 436e916eae03c97837425e157fbf6bb8ce5d5a53 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 20 Dec 2016 19:09:27 +0100 Subject: util-lib: rework path_check_fstype() and path_is_temporary_fs() to use O_PATH Also, add tests to make sure this actually works as intended. --- src/basic/stat-util.c | 4 ++-- src/test/test-stat-util.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) (limited to 'src/test/test-stat-util.c') diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c index ac5db71022..7e1914aa14 100644 --- a/src/basic/stat-util.c +++ b/src/basic/stat-util.c @@ -204,7 +204,7 @@ int fd_check_fstype(int fd, statfs_f_type_t magic_value) { int path_check_fstype(const char *path, statfs_f_type_t magic_value) { _cleanup_close_ int fd = -1; - fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY); + fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_PATH); if (fd < 0) return -errno; @@ -228,7 +228,7 @@ int fd_is_temporary_fs(int fd) { int path_is_temporary_fs(const char *path) { _cleanup_close_ int fd = -1; - fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY); + fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_PATH); if (fd < 0) return -errno; diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c index 10fc4af79f..a48dca99e1 100644 --- a/src/test/test-stat-util.c +++ b/src/test/test-stat-util.c @@ -18,12 +18,14 @@ ***/ #include +#include #include #include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "macro.h" +#include "missing.h" #include "stat-util.h" static void test_files_same(void) { @@ -66,10 +68,27 @@ static void test_path_is_os_tree(void) { assert_se(path_is_os_tree("/idontexist") == -ENOENT); } +static void test_path_check_fstype(void) { + assert_se(path_check_fstype("/run", TMPFS_MAGIC) > 0); + assert_se(path_check_fstype("/run", BTRFS_SUPER_MAGIC) == 0); + assert_se(path_check_fstype("/proc", PROC_SUPER_MAGIC) > 0); + assert_se(path_check_fstype("/proc", BTRFS_SUPER_MAGIC) == 0); + assert_se(path_check_fstype("/proc", BTRFS_SUPER_MAGIC) == 0); + assert_se(path_check_fstype("/i-dont-exist", BTRFS_SUPER_MAGIC) == -ENOENT); +} + +static void test_path_is_temporary_fs(void) { + assert_se(path_is_temporary_fs("/run") > 0); + assert_se(path_is_temporary_fs("/proc") == 0); + assert_se(path_is_temporary_fs("/i-dont-exist") == -ENOENT); +} + int main(int argc, char *argv[]) { test_files_same(); test_is_symlink(); test_path_is_os_tree(); + test_path_check_fstype(); + test_path_is_temporary_fs(); return 0; } -- cgit v1.2.3-54-g00ecf