0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mount: Report error instead of crashing on failure

Browse source 
Being unable to `open` on the source caused mount to crash. The error is
now properly reported to the user.
This commit is contained in:
Lucas CHOLLET 2022-10-01 16:11:30 +02:00 • committed by Andreas Kling
parent 6c86b40724
commit b8c42365f0
Notes: sideshowbarker 2024-07-17 06:25:28 +09:00
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Userland/Utilities/mount.cpp
View file

@ -51,20 +51,14 @@ static bool is_source_none(StringView source)
return source == "none"sv;
}
static int get_source_fd(StringView source)
static ErrorOr<int> get_source_fd(StringView source)
{
if (is_source_none(source))
return -1;
auto fd_or_error = Core::System::open(source, O_RDWR);
if (fd_or_error.is_error())
fd_or_error = Core::System::open(source, O_RDONLY);
if (fd_or_error.is_error()) {
int saved_errno = errno;
auto message = String::formatted("Failed to open: {}\n", source);
errno = saved_errno;
perror(message.characters());
}
return fd_or_error.release_value();
return fd_or_error;
}
static bool mount_by_line(String const& line)
@ -90,7 +84,12 @@ static bool mount_by_line(String const& line)
auto filename = parts[0];
int fd = get_source_fd(filename);
auto fd_or_error = get_source_fd(filename);
if (fd_or_error.is_error()) {
outln("{}", fd_or_error.release_error());
return false;
}
auto const fd = fd_or_error.release_value();
dbgln("Mounting {} ({}) on {}", filename, fstype, mountpoint);
@ -222,7 +221,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
fs_type = "ext2"sv;
int flags = !options.is_empty() ? parse_options(options) : 0;
int fd = get_source_fd(source);
int const fd = TRY(get_source_fd(source));
TRY(Core::System::mount(fd, mountpoint, fs_type, flags));