system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 18:15:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK+LibSystem+LibMain: Add Error::from_syscall() for syscall failures

Browse source 
This creates an error that contains the name of the syscall that failed.
This allows error handlers to print out the name of the call if they
want to. :^)
This commit is contained in:
Andreas Kling 2021-11-22 16:00:53 +01:00
parent d3cf68a540
commit 4e530135d5
3 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
AK/Error.h
View file

@ -21,9 +21,11 @@ namespace AK {
class Error {
public:
static Error from_errno(int code) { return Error(code); }
static Error from_syscall(StringView syscall_name, int rc) { return Error(syscall_name, rc); }
static Error from_string_literal(StringView string_literal) { return Error(string_literal); }
bool is_errno() const { return m_code != 0; }
bool is_syscall() const { return m_syscall; }
int code() const { return m_code; }
StringView string_literal() const { return m_string_literal; }
@ -40,8 +42,16 @@ private:
{
}
Error(StringView syscall_name, int rc)
: m_code(-rc)
, m_string_literal(syscall_name)
, m_syscall(true)
{
}
int m_code { 0 };
StringView m_string_literal;
bool m_syscall { false };
};
template<typename T, typename ErrorType>

9
Userland/Libraries/LibMain/Main.cpp
View file

@ -8,6 +8,7 @@
#include <AK/StringView.h>
#include <AK/Vector.h>
#include <LibMain/Main.h>
#include <string.h>
int main(int argc, char** argv)
{
@ -22,7 +23,13 @@ int main(int argc, char** argv)
.arguments = arguments.span(),
});
if (result.is_error()) {
warnln("Runtime error: {}", result.error());
auto error = result.release_error();
if (error.is_syscall())
warnln("Runtime error: {}: {} (errno={})", error.string_literal(), strerror(error.code()), error.code());
else if (error.is_errno())
warnln("Runtime error: {} (errno={})", strerror(error.code()), error.code());
else
warnln("Runtime error: {}", error.string_literal());
return 1;
}
return result.value();

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

@ -7,6 +7,12 @@
#include <LibSystem/Wrappers.h>
#include <LibSystem/syscall.h>
#define HANDLE_SYSCALL_RETURN_VALUE(syscall_name, rc) \
if ((rc) < 0) { \
return Error::from_syscall(syscall_name, rc); \
} \
return {};
namespace System {
ErrorOr<void> pledge(StringView promises, StringView execpromises)
@ -16,9 +22,7 @@ ErrorOr<void> pledge(StringView promises, StringView execpromises)
{ execpromises.characters_without_null_termination(), execpromises.length() },
};
int rc = syscall(SC_pledge, &params);
if (rc < 0)
return Error::from_errno(-rc);
return {};
HANDLE_SYSCALL_RETURN_VALUE("pledge"sv, rc);
}
ErrorOr<void> unveil(StringView path, StringView permissions)
@ -28,9 +32,7 @@ ErrorOr<void> unveil(StringView path, StringView permissions)
{ permissions.characters_without_null_termination(), permissions.length() },
};
int rc = syscall(SC_unveil, &params);
if (rc < 0)
return Error::from_errno(-rc);
return {};
HANDLE_SYSCALL_RETURN_VALUE("unveil"sv, rc);
}
}