p
/
sdn
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Use more precise filesizes
Arch Linux AUR Scripts failed Details 

The behaviour differs from GNU `ls -lh` in that we use binary units,
meaning we get 1023 before 1.0K rather than 999 before 1.0K,
which is nonetheless still four characters wide.
This commit is contained in:
Přemysl Eric Janouch 2024-04-07 16:00:07 +02:00
parent c9662f1a7b
commit 9ce6f47716
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sdn.cpp
View File

@ -640,6 +640,25 @@ fun ls_format (const entry &e, bool for_target) -> chtype {
return format; return format;
} }
fun suffixize (off_t size, unsigned shift, wchar_t suffix, std::wstring &out)
-> bool {
// Prevent implementation-defined and undefined behaviour
if (size < 0 || shift >= sizeof size * 8)
return false;
off_t divided = size >> shift;
if (divided >= 10) {
out.assign (std::to_wstring (divided)).append (1, suffix);
return true;
} else if (divided > 0) {
unsigned times_ten = size / double (off_t (1) << shift) * 10.0;
out.assign ({L'0' + wchar_t (times_ten / 10), L'.',
L'0' + wchar_t (times_ten % 10), suffix});
return true;
}
return false;
}
fun make_entry (const struct dirent *f) -> entry { fun make_entry (const struct dirent *f) -> entry {
entry e; entry e;
e.filename = f->d_name; e.filename = f->d_name;
@ -690,11 +709,12 @@ fun make_entry (const struct dirent *f) -> entry {
? apply_attrs (grp->second, 0) ? apply_attrs (grp->second, 0)
: apply_attrs (to_wstring (info.st_gid), 0); : apply_attrs (to_wstring (info.st_gid), 0);
auto size = to_wstring (info.st_size); std::wstring size;
if (info.st_size >> 40) size = to_wstring (info.st_size >> 40) + L"T"; if (!suffixize (info.st_size, 40, L'T', size) &&
else if (info.st_size >> 30) size = to_wstring (info.st_size >> 30) + L"G"; !suffixize (info.st_size, 30, L'G', size) &&
else if (info.st_size >> 20) size = to_wstring (info.st_size >> 20) + L"M"; !suffixize (info.st_size, 20, L'M', size) &&
else if (info.st_size >> 10) size = to_wstring (info.st_size >> 10) + L"K"; !suffixize (info.st_size, 10, L'K', size))
size = to_wstring (info.st_size);
e.cols[entry::SIZE] = apply_attrs (size, 0); e.cols[entry::SIZE] = apply_attrs (size, 0);
wchar_t buf[32] = L""; wchar_t buf[32] = L"";