Changes in uspace/app/df/df.c [c111da2:c24b0dcb] in mainline

File:

• uspace/app/df/df.c (modified) (8 diffs)

uspace/app/df/df.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2013 Manuele Conti
  * All rights reserved.
@@ -57 +56 @@
 static bool display_blocks;
 
+static errno_t size_to_human_readable(uint64_t, size_t, char **);
 static void print_header(void);
-static void print_statfs(vfs_statfs_t *, char *, char *);
+static errno_t print_statfs(vfs_statfs_t *, char *, char *);
 static void print_usage(void);
 
@@ -65 +65 @@
         int optres, errflg = 0;
         vfs_statfs_t st;
+        errno_t rc;
 
         display_blocks = false;
@@ -108 +109 @@
         list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
                 if (vfs_statfs_path(mtab_ent->mp, &st) == 0) {
-                        print_statfs(&st, mtab_ent->fs_name, mtab_ent->mp);
+                        rc = print_statfs(&st, mtab_ent->fs_name, mtab_ent->mp);
+                        if (rc != EOK)
+                                return 1;
                 } else {
                         fprintf(stderr, "Cannot get information for '%s' (%s).\n",
@@ -119 +122 @@
 }
 
+static errno_t size_to_human_readable(uint64_t nblocks, size_t block_size, char **rptr)
+{
+        capa_spec_t capa;
+
+        capa_from_blocks(nblocks, block_size, &capa);
+        capa_simplify(&capa);
+        return capa_format(&capa, rptr);
+}
+
 static void print_header(void)
 {
@@ -129 +141 @@
 }
 
-static void print_statfs(vfs_statfs_t *st, char *name, char *mountpoint)
+static errno_t print_statfs(vfs_statfs_t *st, char *name, char *mountpoint)
 {
         uint64_t const used_blocks = st->f_blocks - st->f_bfree;
         unsigned const perc_used = PERCENTAGE(used_blocks, st->f_blocks);
-        char str[CAPA_BLOCKS_BUFSIZE];
+        char *str;
+        errno_t rc;
 
         printf("%10s", name);
@@ -139 +152 @@
         if (!display_blocks) {
                 /* Print size */
-                capa_blocks_format_buf(st->f_blocks, st->f_bsize, str,
-                    sizeof(str));
+                rc = size_to_human_readable(st->f_blocks, st->f_bsize, &str);
+                if (rc != EOK)
+                        goto error;
                 printf(" %14s", str);
+                free(str);
 
                 /* Number of used blocks */
-                capa_blocks_format_buf(used_blocks, st->f_bsize, str,
-                    sizeof(str));
+                rc = size_to_human_readable(used_blocks, st->f_bsize, &str);
+                if (rc != EOK)
+                        goto error;
                 printf(" %14s", str);
+                free(str);
 
                 /* Number of available blocks */
-                capa_blocks_format_buf(st->f_bfree, st->f_bsize, str,
-                    sizeof(str));
+                rc = size_to_human_readable(st->f_bfree, st->f_bsize, &str);
+                if (rc != EOK)
+                        goto error;
                 printf(" %14s", str);
+                free(str);
 
                 /* Percentage of used blocks */
@@ -164 +183 @@
                     perc_used, mountpoint);
         }
+
+        return EOK;
+error:
+        printf("\nError: Out of memory.\n");
+        return ENOMEM;
 }