RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:37:47 +00:00
Code Issues Activity Actions

LibCore+LibSystem: Move syscall wrappers from LibSystem to LibCore

Browse source 
With this change, System::foo() becomes Core::System::foo().

Since LibCore builds on other systems than SerenityOS, we now have to
make sure that wrappers work with just a standard C library underneath.
This commit is contained in:
Andreas Kling 2021-11-23 10:59:50 +01:00
parent acc2eccede
commit 21a5fb0fa2
32 changed files with 165 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibSystem/CMakeLists.txt
View file

@ -1,13 +1,7 @@
set(SOURCES
Wrappers.cpp
syscall.cpp
)
# FIXME: This is a hack to avoid a circular dependency with LibC. Figure out a better way.
if ("${SERENITY_ARCH}" STREQUAL "i686")
set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS "-fno-stack-protector")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
serenity_libc(LibSystem system)
target_include_directories(LibSystem PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

51
Userland/Libraries/LibSystem/Wrappers.cpp
View file

@ -1,51 +0,0 @@
/*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibSystem/Wrappers.h>
#include <LibSystem/syscall.h>
#define HANDLE_SYSCALL_RETURN_VALUE(syscall_name, rc, success_value) \
if ((rc) < 0) { \
return Error::from_syscall(syscall_name, rc); \
} \
return success_value;
namespace System {
ErrorOr<void> pledge(StringView promises, StringView execpromises)
{
Syscall::SC_pledge_params params {
{ promises.characters_without_null_termination(), promises.length() },
{ execpromises.characters_without_null_termination(), execpromises.length() },
};
int rc = syscall(SC_pledge, &params);
HANDLE_SYSCALL_RETURN_VALUE("pledge"sv, rc, {});
}
ErrorOr<void> unveil(StringView path, StringView permissions)
{
Syscall::SC_unveil_params params {
{ path.characters_without_null_termination(), path.length() },
{ permissions.characters_without_null_termination(), permissions.length() },
};
int rc = syscall(SC_unveil, &params);
HANDLE_SYSCALL_RETURN_VALUE("unveil"sv, rc, {});
}
ErrorOr<void> sigaction(int signal, struct sigaction const* action, struct sigaction* old_action)
{
int rc = syscall(SC_sigaction, signal, action, old_action);
HANDLE_SYSCALL_RETURN_VALUE("sigaction"sv, rc, {});
}
ErrorOr<struct stat> fstat(int fd)
{
struct stat st;
int rc = syscall(SC_fstat, fd, &st);
HANDLE_SYSCALL_RETURN_VALUE("fstat"sv, rc, st);
}
}

20
Userland/Libraries/LibSystem/Wrappers.h
View file

@ -1,20 +0,0 @@
/*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/Error.h>
#include <signal.h>
#include <sys/stat.h>
namespace System {
ErrorOr<void> pledge(StringView promises, StringView execpromises);
ErrorOr<void> unveil(StringView path, StringView permissions);
ErrorOr<void> sigaction(int signal, struct sigaction const* action, struct sigaction* old_action);
ErrorOr<struct stat> fstat(int fd);
}