mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
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.
This commit is contained in:
parent
fc2288f0be
commit
436e916eae
@ -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;
|
||||
|
||||
|
@ -18,12 +18,14 @@
|
||||
***/
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <linux/magic.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user