Changes in uspace/app/df/df.c [120d5bc:582a0b8] in mainline

File:

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

uspace/app/df/df.c

@@ -28 +28 @@
 
 /** @addtogroup df
- * @brief Print amounts of free and used disk space.
+ * @brief Df utility.
  * @{
  */
@@ -35 +35 @@
  */
 
-#include <cap.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -48 +46 @@
 #define NAME  "df"
 
-#define HEADER_TABLE     "Filesystem           Size           Used      Available Used%% Mounted on"
-#define HEADER_TABLE_BLK "Filesystem  Blk. Size     Total        Used   Available Used%% Mounted on"
+#define HEADER_TABLE    "Filesystem     %4u-blocks           Used      Available Used%% Mounted on"
+#define HEADER_TABLE_HR "Filesystem           Size           Used      Available Used%% Mounted on"
 
 #define PERCENTAGE(x, tot) (tot ? (100ULL * (x) / (tot)) : 0)
-
-static bool display_blocks;
-
-static int size_to_human_readable(uint64_t, size_t, char **);
+#define FSBK_TO_BK(x, fsbk, bk) \
+        (((fsbk) != 0 && (fsbk) < (bk)) ? \
+                (unsigned long long) ((x) / ((bk) / (fsbk))) : \
+                (unsigned long long) ((x) * ((fsbk) / (bk))))
+
+static unsigned int unit_size;
+static unsigned int human_readable;
+
+static void size_to_human_readable(char *buf, uint64_t bytes);
 static void print_header(void);
-static int print_statfs(struct statfs *, char *, char *);
+static void print_statfs(struct statfs *, char *, char *);
 static void print_usage(void);
 
@@ -64 +67 @@
         int optres, errflg = 0;
         struct statfs st;
-        int rc;
-
-        display_blocks = false;
-
-        /* Parse command-line options */
-        while ((optres = getopt(argc, argv, ":ubh")) != -1) {
+
+        unit_size = 512;
+        human_readable = 0;
+
+        /******************************************/
+        /*   Parse command line options...        */
+        /******************************************/
+        while ((optres = getopt(argc, argv, ":uhb:")) != -1) {
                 switch(optres) {
-                case 'h':
+                case 'u':
                         print_usage();
                         return 0;
 
+                case 'h':
+                        human_readable = 1;
+                        break;
+
                 case 'b':
-                        display_blocks = true;
+                        str_uint32_t(optarg, NULL, 0, 0, &unit_size);
                         break;
  
@@ -114 +123 @@
         list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
                 if (vfs_statfs_path(mtab_ent->mp, &st) == 0) {
-                        rc = print_statfs(&st, mtab_ent->fs_name, mtab_ent->mp);
-                        if (rc != EOK)
-                                return 1;
+                        print_statfs(&st, mtab_ent->fs_name, mtab_ent->mp);
                 } else {
                         fprintf(stderr, "Cannot get information for '%s' (%d).\n",
@@ -127 +134 @@
 }
 
-static int size_to_human_readable(uint64_t nblocks, size_t block_size, char **rptr)
-{
-        cap_spec_t cap;
-
-        cap_from_blocks(nblocks, block_size, &cap);
-        cap_simplify(&cap);
-        return cap_format(&cap, rptr);
+static void size_to_human_readable(char *buf, uint64_t bytes)
+{
+        const char *units = "BkMGTPEZY";
+        int i = 0;
+
+        while (bytes >= 1024) {
+                bytes /= 1024;
+                i++;
+        }
+
+        snprintf(buf, 6, "%4llu%c", (unsigned long long) bytes, units[i]);
 }
 
 static void print_header(void)
 {
-        if (!display_blocks)
-                printf(HEADER_TABLE);
+        if (human_readable)
+                printf(HEADER_TABLE_HR);
         else
-                printf(HEADER_TABLE_BLK);
+                printf(HEADER_TABLE, unit_size);
 
         putchar('\n');
 }
 
-static int print_statfs(struct statfs *st, char *name, char *mountpoint)
+static void print_statfs(struct statfs *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;
-        int rc;
 
         printf("%10s", name);
 
-        if (!display_blocks) {
+        if (human_readable) {
+                char tmp[1024];
+
                 /* Print size */
-                rc = size_to_human_readable(st->f_blocks, st->f_bsize, &str);
-                if (rc != EOK)
-                        goto error;
-                printf(" %14s", str);
-                free(str);
+                size_to_human_readable(tmp, st->f_blocks *  st->f_bsize);
+                printf(" %14s", tmp);
 
                 /* Number of used blocks */
-                rc = size_to_human_readable(used_blocks, st->f_bsize, &str);
-                if (rc != EOK)
-                        goto error;
-                printf(" %14s", str);
-                free(str);
+                size_to_human_readable(tmp, used_blocks  *  st->f_bsize);
+                printf(" %14s", tmp);
 
                 /* Number of available blocks */
-                rc = size_to_human_readable(st->f_bfree, st->f_bsize, &str);
-                if (rc != EOK)
-                        goto error;
-                printf(" %14s", str);
-                free(str);
+                size_to_human_readable(tmp, st->f_bfree *  st->f_bsize);
+                printf(" %14s", tmp);
 
                 /* Percentage of used blocks */
@@ -183 +185 @@
                 printf(" %s\n", mountpoint);
         } else {
-                /* Block size / Blocks / Used blocks / Available blocks / Used% / Mounted on */
-                printf(" %10" PRIu32 " %9" PRIu64 " %11" PRIu64 " %11" PRIu64 " %4u%% %s\n", 
-                    st->f_bsize, st->f_blocks, used_blocks, st->f_bfree,
-                    perc_used, mountpoint);
-        }
-
-        return EOK;
-error:
-        printf("\nError: Out of memory.\n");
-        return ENOMEM;
+                /* Blocks / Used blocks / Available blocks / Used% / Mounted on */
+                printf(" %15llu %14llu %14llu %4u%% %s\n", 
+                    FSBK_TO_BK(st->f_blocks, st->f_bsize, unit_size),
+                    FSBK_TO_BK(used_blocks, st->f_bsize, unit_size),
+                    FSBK_TO_BK(st->f_bfree, st->f_bsize, unit_size),
+                    perc_used,
+                    mountpoint);
+        }
+
 }
 
 static void print_usage(void)
 {
-        printf("Syntax: %s [<options>] \n", NAME);
-        printf("Options:\n");
-        printf("  -h Print help\n");
-        printf("  -b Print exact block sizes and numbers\n");
+        printf("syntax: %s [-u] [-h] [-b <size>] \n", NAME);
+        printf("  u : Show usage.\n");
+        printf("  h : \"Human-readable\" output.\n");
+        printf("  b : Scale block sizes by selected size.\n");
+        printf("\n");
 }