From f69bd3bd46534f3e675d32e86d360830e5fab100 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 16 Dec 2021 20:23:21 +0100 Subject: [PATCH] LibCore: Add syscall wrapper for mount() --- Userland/Libraries/LibCore/System.cpp | 34 +++++++++++++++++++++++++++ Userland/Libraries/LibCore/System.h | 2 ++ 2 files changed, 36 insertions(+) diff --git a/Userland/Libraries/LibCore/System.cpp b/Userland/Libraries/LibCore/System.cpp index 9e3fe04c76..f84495a853 100644 --- a/Userland/Libraries/LibCore/System.cpp +++ b/Userland/Libraries/LibCore/System.cpp @@ -90,6 +90,22 @@ ErrorOr setgroups(Span gids) return Error::from_syscall("setgroups"sv, -errno); return {}; } + +ErrorOr mount(int source_fd, StringView target, StringView fs_type, int flags) +{ + if (target.is_null() || fs_type.is_null()) + return Error::from_errno(EFAULT); + + Syscall::SC_mount_params params { + { target.characters_without_null_termination(), target.length() }, + { fs_type.characters_without_null_termination(), fs_type.length() }, + source_fd, + flags + }; + int rc = syscall(SC_mount, ¶ms); + HANDLE_SYSCALL_RETURN_VALUE("mount", rc, {}); +} + #endif ErrorOr sigaction(int signal, struct sigaction const* action, struct sigaction* old_action) @@ -431,4 +447,22 @@ ErrorOr isatty(int fd) return rc == 1; } +ErrorOr symlink(StringView target, StringView link_path) +{ +#ifdef __serenity__ + Syscall::SC_symlink_params params { + .target = { target.characters_without_null_termination(), target.length() }, + .linkpath = { link_path.characters_without_null_termination(), link_path.length() }, + }; + int rc = syscall(SC_symlink, ¶ms); + HANDLE_SYSCALL_RETURN_VALUE("symlink"sv, rc, {}); +#else + String target_string = target; + String link_path_string = link_path; + if (::symlink(target_string.characters(), link_path_string.characters()) < 0) + return Error::from_syscall("symlink"sv, -errno); + return {}; +#endif +} + } diff --git a/Userland/Libraries/LibCore/System.h b/Userland/Libraries/LibCore/System.h index b552db968b..c5bfcb28b8 100644 --- a/Userland/Libraries/LibCore/System.h +++ b/Userland/Libraries/LibCore/System.h @@ -27,6 +27,7 @@ ErrorOr sendfd(int sockfd, int fd); ErrorOr recvfd(int sockfd, int options); ErrorOr ptrace_peekbuf(pid_t tid, void const* tracee_addr, Bytes destination_buf); ErrorOr setgroups(Span); +ErrorOr mount(int source_fd, StringView target, StringView fs_type, int flags); #endif ErrorOr sigaction(int signal, struct sigaction const* action, struct sigaction* old_action); @@ -61,5 +62,6 @@ ErrorOr seteuid(uid_t); ErrorOr setgid(gid_t); ErrorOr setegid(gid_t); ErrorOr isatty(int fd); +ErrorOr symlink(StringView target, StringView link_path); }