RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #18550 from benpicco/sc_vfs-human

Browse Source 
sys/shell/vfs: make output of vfs df human readable
This commit is contained in:
Marian Buschsieweke 2022-09-08 20:13:08 +02:00 committed by GitHub
commit 1066195fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sys/shell/commands/sc_vfs.c
View File

@ -30,6 +30,7 @@
#include <fcntl.h> #include <fcntl.h>
#include "shell.h" #include "shell.h"
#include "macros/units.h"
#include "vfs.h" #include "vfs.h"
#include "vfs_util.h" #include "vfs_util.h"
@ -137,6 +138,37 @@ static int _errno_string(int err, char *buf, size_t buflen)
} }
#undef _case_snprintf_errno_name #undef _case_snprintf_errno_name
static void _print_size(uint64_t size)
{
unsigned long len;
const char *unit;
if (size == 0) {
len = 0;
unit = NULL;
} else if ((size & (GiB(1) - 1)) == 0) {
len = size / GiB(1);
unit = "GiB";
}
else if ((size & (MiB(1) - 1)) == 0) {
len = size / MiB(1);
unit = "MiB";
}
else if ((size & (KiB(1) - 1)) == 0) {
len = size / KiB(1);
unit = "KiB";
} else {
len = size;
unit = NULL;
}
if (unit) {
printf("%8lu %s ", len, unit);
} else {
printf("%10lu B ", len);
}
}
static void _print_df(vfs_DIR *dir) static void _print_df(vfs_DIR *dir)
{ {
struct statvfs buf; struct statvfs buf;
@ -148,14 +180,16 @@ static void _print_df(vfs_DIR *dir)
printf("statvfs failed: %s\n", err); printf("statvfs failed: %s\n", err);
return; return;
} }
printf("%12lu %12lu %12lu %7lu%%\n", (unsigned long)buf.f_blocks,
(unsigned long)(buf.f_blocks - buf.f_bfree), (unsigned long)buf.f_bavail, _print_size(buf.f_blocks * buf.f_bsize);
(unsigned long)(((buf.f_blocks - buf.f_bfree) * 100) / buf.f_blocks)); _print_size((buf.f_blocks - buf.f_bfree) * buf.f_bsize);
_print_size(buf.f_bavail * buf.f_bsize);
printf("%7lu%%\n", (unsigned long)(((buf.f_blocks - buf.f_bfree) * 100) / buf.f_blocks));
} }
static int _df_handler(int argc, char **argv) static int _df_handler(int argc, char **argv)
{ {
puts("Mountpoint Total Used Available Capacity"); puts("Mountpoint Total Used Available Use%");
if (argc > 1) { if (argc > 1) {
const char *path = argv[1]; const char *path = argv[1];
/* Opening a directory just to statfs is somewhat odd, but it is the /* Opening a directory just to statfs is somewhat odd, but it is the