From 76fce0b89941e2df06c4b806f6aa21abdd7ed8cc Mon Sep 17 00:00:00 2001 From: Arda Cinar Date: Sat, 10 Dec 2022 10:48:28 +0300 Subject: [PATCH] df: Add an option to display used/available inodes --- Userland/Utilities/df.cpp | 70 +++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 18 deletions(-) diff --git a/Userland/Utilities/df.cpp b/Userland/Utilities/df.cpp index f92cb3b7bd7..760b0456d20 100644 --- a/Userland/Utilities/df.cpp +++ b/Userland/Utilities/df.cpp @@ -13,8 +13,6 @@ #include #include -static bool flag_human_readable = false; - struct FileSystem { DeprecatedString fs; size_t total_block_count { 0 }; @@ -27,30 +25,48 @@ struct FileSystem { ErrorOr serenity_main(Main::Arguments arguments) { + bool flag_human_readable = false; + bool flag_inode_info = false; + Core::ArgsParser args_parser; args_parser.set_general_help("Display free disk space of each partition."); args_parser.add_option(flag_human_readable, "Print human-readable sizes", "human-readable", 'h'); + args_parser.add_option(flag_inode_info, "Show inode information as well", "inodes", 'i'); args_parser.parse(arguments); auto file = TRY(Core::Stream::File::open("/sys/kernel/df"sv, Core::Stream::OpenMode::Read)); - if (flag_human_readable) { - outln("Filesystem Size Used Available Used% Mount point"); - } else { - outln("Filesystem Blocks Used Available Used% Mount point"); + Vector headers; + TRY(headers.try_append(flag_human_readable ? "Size"sv : "Blocks"sv)); + TRY(headers.try_append("Used"sv)); + TRY(headers.try_append("Available"sv)); + TRY(headers.try_append("Used%"sv)); + if (flag_inode_info) { + TRY(headers.try_append("Inodes"sv)); + TRY(headers.try_append("IUsed"sv)); + TRY(headers.try_append("IAvailable"sv)); + TRY(headers.try_append("IUsed%"sv)); } + TRY(headers.try_append("Mount point"sv)); + + out("{:12} ", "Filesystem"); + + for (auto& header : headers) + out("{:>12} ", header); + outln(); auto file_contents = TRY(file->read_until_eof()); auto json_result = TRY(JsonValue::from_string(file_contents)); auto const& json = json_result.as_array(); - json.for_each([](auto& value) { + json.for_each([&](auto& value) { auto& fs_object = value.as_object(); auto fs = fs_object.get("class_name"sv).to_deprecated_string(); auto total_block_count = fs_object.get("total_block_count"sv).to_u64(); auto free_block_count = fs_object.get("free_block_count"sv).to_u64(); auto used_block_count = total_block_count - free_block_count; - [[maybe_unused]] auto total_inode_count = fs_object.get("total_inode_count"sv).to_u64(); - [[maybe_unused]] auto free_inode_count = fs_object.get("free_inode_count"sv).to_u64(); + auto total_inode_count = fs_object.get("total_inode_count"sv).to_u64(); + auto free_inode_count = fs_object.get("free_inode_count"sv).to_u64(); + auto used_inode_count = total_inode_count - free_inode_count; auto block_size = fs_object.get("block_size"sv).to_u64(); auto mount_point = fs_object.get("mount_point"sv).to_deprecated_string(); @@ -58,18 +74,36 @@ ErrorOr serenity_main(Main::Arguments arguments) if (total_block_count != 0) used_percentage = (used_block_count * 100) / total_block_count; - out("{:10}", fs); + auto used_inode_percentage = 100; + if (total_inode_count != 0) + used_inode_percentage = (used_inode_count * 100) / total_inode_count; + + out("{:12} ", fs); if (flag_human_readable) { - out("{:>10} ", human_readable_size(total_block_count * block_size)); - out("{:>10} ", human_readable_size(used_block_count * block_size)); - out("{:>10} ", human_readable_size(free_block_count * block_size)); - out("{:>9}% ", used_percentage); + out("{:>12} ", human_readable_size(total_block_count * block_size)); + out("{:>12} ", human_readable_size(used_block_count * block_size)); + out("{:>12} ", human_readable_size(free_block_count * block_size)); + out("{:>11}% ", used_percentage); } else { - out("{:>10} ", (uint64_t)total_block_count); - out("{:>10} ", (uint64_t)used_block_count); - out("{:>10} ", (uint64_t)free_block_count); - out("{:>9}% ", used_percentage); + out("{:>12} ", (uint64_t)total_block_count); + out("{:>12} ", (uint64_t)used_block_count); + out("{:>12} ", (uint64_t)free_block_count); + out("{:>11}% ", used_percentage); + } + + if (flag_inode_info) { + if (flag_human_readable) { + out("{:>12} ", human_readable_quantity(total_inode_count)); + out("{:>12} ", human_readable_quantity(used_inode_count)); + out("{:>12} ", human_readable_quantity(free_inode_count)); + out("{:>11}% ", used_inode_percentage); + } else { + out("{:>12} ", (uint64_t)total_inode_count); + out("{:>12} ", (uint64_t)used_inode_count); + out("{:>12} ", (uint64_t)free_inode_count); + out("{:>11}% ", used_inode_percentage); + } } out("{}", mount_point);