RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:07:45 +00:00
Code Issues Activity Actions

du: Use 64-bit integers when handling file sizes or related values

Browse source 
We may very well dip into files larger than 4G at some point, so 32-bit
values are not enough, and the 64-bit sized `off_t` doesn't fully make
sense either, as it features negative values.

Instead, switch to the explicit type of `u64` everywhere, which is the
same size on all platforms and is unsigned. The exception to this is
the threshold, which needs to be signed instead of unsigned.
This commit is contained in:
Tim Schumacher 2022-07-23 18:25:21 +02:00 • committed by Linus Groh
parent c1ab29b73c
commit 9af302920a
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Utilities/du.cpp
View file

@ -29,15 +29,15 @@ struct DuOption {
bool human_readable = false; bool human_readable = false;
bool all = false; bool all = false;
bool apparent_size = false; bool apparent_size = false;
int threshold = 0; i64 threshold = 0;
TimeType time_type = TimeType::NotUsed; TimeType time_type = TimeType::NotUsed;
Vector<String> excluded_patterns; Vector<String> excluded_patterns;
size_t block_size = 1024; u64 block_size = 1024;
size_t max_depth = SIZE_MAX; size_t max_depth = SIZE_MAX;
}; };
static ErrorOr<void> parse_args(Main::Arguments arguments, Vector<String>& files, DuOption& du_option); static ErrorOr<void> parse_args(Main::Arguments arguments, Vector<String>& files, DuOption& du_option);
static ErrorOr<off_t> print_space_usage(String const& path, DuOption const& du_option, size_t current_depth, bool inside_dir = false); static ErrorOr<u64> print_space_usage(String const& path, DuOption const& du_option, size_t current_depth, bool inside_dir = false);
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
@ -134,10 +134,10 @@ ErrorOr<void> parse_args(Main::Arguments arguments, Vector<String>& files, DuOpt
return {}; return {};
} }
ErrorOr<off_t> print_space_usage(String const& path, DuOption const& du_option, size_t current_depth, bool inside_dir) ErrorOr<u64> print_space_usage(String const& path, DuOption const& du_option, size_t current_depth, bool inside_dir)
{ {
struct stat path_stat = TRY(Core::System::lstat(path)); struct stat path_stat = TRY(Core::System::lstat(path));
off_t directory_size = 0; u64 directory_size = 0;
bool const is_directory = S_ISDIR(path_stat.st_mode); bool const is_directory = S_ISDIR(path_stat.st_mode);
if (is_directory) { if (is_directory) {
auto di = Core::DirIterator(path, Core::DirIterator::SkipParentAndBaseDir); auto di = Core::DirIterator(path, Core::DirIterator::SkipParentAndBaseDir);
@ -158,7 +158,7 @@ ErrorOr<off_t> print_space_usage(String const& path, DuOption const& du_option,
return { 0 }; return { 0 };
} }
size_t size = path_stat.st_size; u64 size = path_stat.st_size;
if (!du_option.apparent_size) { if (!du_option.apparent_size) {
constexpr auto block_size = 512; constexpr auto block_size = 512;
size = path_stat.st_blocks * block_size; size = path_stat.st_blocks * block_size;
@ -170,7 +170,7 @@ ErrorOr<off_t> print_space_usage(String const& path, DuOption const& du_option,
if (is_directory) if (is_directory)
size = directory_size; size = directory_size;
if ((du_option.threshold > 0 && size < static_cast<size_t>(du_option.threshold)) || (du_option.threshold < 0 && size > static_cast<size_t>(-du_option.threshold))) if ((du_option.threshold > 0 && size < static_cast<u64>(du_option.threshold)) || (du_option.threshold < 0 && size > static_cast<u64>(-du_option.threshold)))
return { 0 }; return { 0 };
if (!du_option.human_readable) if (!du_option.human_readable)