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

ls: Add -h (human readable) output switch

Browse source 
Fixes #543.
This commit is contained in:
Andreas Kling 2019-09-11 18:59:13 +02:00
parent 5cd04a6ad8
commit 825fa3463c
1 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Userland/ls.cpp
View file

@ -24,6 +24,7 @@ static bool flag_long = false;
static bool flag_show_dotfiles = false; static bool flag_show_dotfiles = false;
static bool flag_show_inode = false; static bool flag_show_inode = false;
static bool flag_print_numeric = false; static bool flag_print_numeric = false;
static bool flag_human_readable = false;
static int terminal_rows = 0; static int terminal_rows = 0;
static int terminal_columns = 0; static int terminal_columns = 0;
@ -39,7 +40,7 @@ int main(int argc, char** argv)
output_is_terminal = true; output_is_terminal = true;
} }
static const char* valid_option_characters = "laiGn"; static const char* valid_option_characters = "laiGnh";
int opt; int opt;
while ((opt = getopt(argc, argv, valid_option_characters)) != -1) { while ((opt = getopt(argc, argv, valid_option_characters)) != -1) {
switch (opt) { switch (opt) {
@ -58,7 +59,9 @@ int main(int argc, char** argv)
case 'n': case 'n':
flag_print_numeric = true; flag_print_numeric = true;
break; break;
case 'h':
flag_human_readable = true;
break;
default: default:
fprintf(stderr, "usage: ls [-%s] [paths...]\n", valid_option_characters); fprintf(stderr, "usage: ls [-%s] [paths...]\n", valid_option_characters);
return 1; return 1;
@ -125,6 +128,25 @@ int print_name(struct stat& st, const char* name, const char* path_for_link_reso
return nprinted; return nprinted;
} }
// FIXME: Remove this hackery once printf() supports floats.
// FIXME: Also, we should probably round the sizes in ls -lh output.
static String number_string_with_one_decimal(float number, const char* suffix)
{
float decimals = number - (int)number;
return String::format("%d.%d%s", (int)number, (int)(decimals * 10), suffix);
}
static String human_readable_size(size_t size)
{
if (size < 1 * KB)
return String::number(size);
if (size < 1 * MB)
return number_string_with_one_decimal((float)size / (float)KB, "K");
if (size < 1 * GB)
return number_string_with_one_decimal((float)size / (float)MB, "M");
return number_string_with_one_decimal((float)size / (float)GB, "G");
}
bool print_filesystem_object(const char* path, const char* name) bool print_filesystem_object(const char* path, const char* name)
{ {
struct stat st; struct stat st;
@ -182,10 +204,16 @@ bool print_filesystem_object(const char* path, const char* name)
printf(" %5u", st.st_gid); printf(" %5u", st.st_gid);
} }
if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
printf(" %4u,%4u ", major(st.st_rdev), minor(st.st_rdev)); printf(" %4u,%4u ", major(st.st_rdev), minor(st.st_rdev));
else } else {
printf(" %10u ", st.st_size); if (flag_human_readable) {
ASSERT(st.st_size > 0);
printf(" %10s ", human_readable_size((size_t)st.st_size).characters());
} else {
printf(" %10u ", st.st_size);
}
}
auto* tm = localtime(&st.st_mtime); auto* tm = localtime(&st.st_mtime);
printf(" %4u-%02u-%02u %02u:%02u:%02u ", printf(" %4u-%02u-%02u %02u:%02u:%02u ",