Skip to content

nshlib/ls_handler: eliminate floating-point operations for human-readable sizes #3293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acassis merged 1 commit into from
Dec 31, 2025
Merged

nshlib/ls_handler: eliminate floating-point operations for human-readable sizes #3293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions nshlib/nsh_fscmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,24 +518,39 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,

if ((lsflags & LSFLAGS_SIZE) != 0)
{
#ifdef CONFIG_HAVE_FLOAT
if (lsflags & LSFLAGS_HUMANREADBLE && buf.st_size >= KB)
{
uint32_t integer_part;
uint32_t decimal_part;
uint32_t unit;
char suffix;

/* Determine the appropriate unit and suffix */

if (buf.st_size >= GB)
{
nsh_output(vtbl, "%11.1fG", (float)buf.st_size / GB);
unit = GB;
suffix = 'G';
}
else if (buf.st_size >= MB)
{
nsh_output(vtbl, "%11.1fM", (float)buf.st_size / MB);
unit = MB;
suffix = 'M';
}
else
{
nsh_output(vtbl, "%11.1fK", (float)buf.st_size / KB);
unit = KB;
suffix = 'K';
}

/* Use integer arithmetic to avoid floating point */

integer_part = buf.st_size / unit;
decimal_part = ((buf.st_size % unit) * 10) / unit;
nsh_output(vtbl, "%10" PRIu32 ".%" PRIu32 "%c",
integer_part, decimal_part, suffix);
}
else
#endif
{
nsh_output(vtbl, "%12" PRIdOFF, buf.st_size);
}
Expand Down Expand Up @@ -1549,11 +1564,10 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
lsflags |= LSFLAGS_SIZE;
break;

#ifdef CONFIG_HAVE_FLOAT
case 'h':
lsflags |= LSFLAGS_HUMANREADBLE;
break;
#endif

case '?':
default:
nsh_error(vtbl, g_fmtarginvalid, argv[0]);
Expand Down
Loading