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

Userland+SystemMonitor: Recognize the MS_RDONLY mount flag

Browse source
This commit is contained in:
Sergey Bugaev 2020-05-28 18:03:58 +03:00 • committed by Andreas Kling
parent fdb71cdf8f
commit 4b300e085d
Notes: sideshowbarker 2024-07-19 06:00:47 +09:00
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Applications/SystemMonitor/main.cpp
View file

@ -78,7 +78,7 @@ static NonnullRefPtr<GUI::Widget> build_graphs_tab();
class UnavailableProcessWidget final : public GUI::Frame {
C_OBJECT(UnavailableProcessWidget)
public:
virtual ~UnavailableProcessWidget() override {}
virtual ~UnavailableProcessWidget() override { }
const String& text() const { return m_text; }
void set_text(String text) { m_text = move(text); }
@ -285,7 +285,7 @@ int main(int argc, char** argv)
class ProgressBarPaintingDelegate final : public GUI::TableCellPaintingDelegate {
public:
virtual ~ProgressBarPaintingDelegate() override {}
virtual ~ProgressBarPaintingDelegate() override { }
virtual void paint(GUI::Painter& painter, const Gfx::Rect& a_rect, const Palette& palette, const GUI::Model& model, const GUI::ModelIndex& index) override
{
@ -357,7 +357,9 @@ NonnullRefPtr<GUI::Widget> build_file_systems_tab()
return object.get("free_block_count").to_u32() * object.get("block_size").to_u32();
});
df_fields.empend("Access", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) {
return object.get("readonly").to_bool() ? "Read-only" : "Read/Write";
bool readonly = object.get("readonly").to_bool();
int mount_flags = object.get("mount_flags").to_int();
return readonly || (mount_flags & MS_RDONLY) ? "Read-only" : "Read/Write";
});
df_fields.empend("Mount flags", Gfx::TextAlignment::CenterLeft, [](const JsonObject& object) {
int mount_flags = object.get("mount_flags").to_int();
@ -375,6 +377,7 @@ NonnullRefPtr<GUI::Widget> build_file_systems_tab()
check(MS_NOEXEC, "noexec");
check(MS_NOSUID, "nosuid");
check(MS_BIND, "bind");
check(MS_RDONLY, "ro");
if (builder.string_view().is_empty())
return String("defaults");
return builder.to_string();

2
Userland/chroot.cpp
View file

@ -57,6 +57,8 @@ int main(int argc, char** argv)
flags |= MS_NOEXEC;
else if (part == "nosuid")
flags |= MS_NOSUID;
else if (part == "ro")
flags |= MS_RDONLY;
else if (part == "bind")
fprintf(stderr, "Ignoring -o bind, as it doesn't make sense for chroot\n");
else

4
Userland/mount.cpp
View file

@ -50,6 +50,8 @@ int parse_options(const StringView& options)
flags |= MS_NOSUID;
else if (part == "bind")
flags |= MS_BIND;
else if (part == "ro")
flags |= MS_RDONLY;
else
fprintf(stderr, "Ignoring invalid option: %s\n", part.to_string().characters());
}
@ -157,7 +159,7 @@ bool print_mounts()
printf("%s on %s type %s (", source.characters(), mount_point.characters(), class_name.characters());
if (readonly)
if (readonly || mount_flags & MS_RDONLY)
printf("ro");
else
printf("rw");