Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ls: Print total field with -l

Browse Source
This commit is contained in:
Bananymous
2026-05-15 22:46:50 +03:00
parent 8f8ba2751c
commit dc1d7e3fae
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
userspace/programs/ls/main.cpp
View File

@@ -185,9 +185,14 @@ int list_directory(const BAN::String& path, Config config)
return 2; return 2;
} }
const bool is_directory = S_ISDIR(st.st_mode);
const size_t block_size = st.st_blksize;
size_t blocks_used = 0;
int ret = 0; int ret = 0;
if (!S_ISDIR(st.st_mode)) if (!is_directory)
{ {
MUST(entries.emplace_back(path, st, BAN::String())); MUST(entries.emplace_back(path, st, BAN::String()));
if (S_ISLNK(st.st_mode)) if (S_ISLNK(st.st_mode))
@@ -231,6 +236,8 @@ int list_directory(const BAN::String& path, Config config)
continue; continue;
} }
blocks_used += st.st_blocks;
MUST(entries.emplace_back(BAN::StringView(dirent->d_name), st, BAN::String())); MUST(entries.emplace_back(BAN::StringView(dirent->d_name), st, BAN::String()));
if (S_ISLNK(st.st_mode)) if (S_ISLNK(st.st_mode))
{ {
@@ -353,6 +360,14 @@ int list_directory(const BAN::String& path, Config config)
MUST(full_entries.push_back(BAN::move(full_entry))); MUST(full_entries.push_back(BAN::move(full_entry)));
} }
if (is_directory)
{
if (config.human_readable)
printf("total: %s\n", build_size_string(blocks_used * block_size, config).data());
else
printf("total: %zu\n", blocks_used);
}
for (const auto& full_entry : full_entries) for (const auto& full_entry : full_entries)
printf("%*s %*s %*s %*s %*s %*s %*s %*s %s\n", printf("%*s %*s %*s %*s %*s %*s %*s %*s %s\n",
(int)max_entry.access.size(), full_entry.access.data(), (int)max_entry.access.size(), full_entry.access.data(),