Changeset 120d5bc in mainline

Timestamp:

2017-09-13T20:49:43Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5918c00

Parents:

6c4eedf

Message:

Let df give 'human-readable' output by default. Use cap.h for better capacity formatting. Let -b print block size and numbers of blocks for each FS.

Location:

uspace

Files:

• app/df/df.c (modified) (7 diffs)
• lib/c/generic/cap.c (modified) (1 diff)
• lib/c/include/cap.h (modified) (1 diff)
• lib/fdisk/src/fdisk.c (modified) (1 diff)

uspace/app/df/df.c

@@ -28 +28 @@
 
 /** @addtogroup df
- * @brief Df utility.
+ * @brief Print amounts of free and used disk space.
  * @{
  */
@@ -35 +35 @@
  */
 
+#include <cap.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46 +48 @@
 #define NAME  "df"
 
-#define HEADER_TABLE    "Filesystem     %4u-blocks           Used      Available Used%% Mounted on"
-#define HEADER_TABLE_HR "Filesystem           Size           Used      Available Used%% Mounted on"
+#define HEADER_TABLE     "Filesystem           Size           Used      Available Used%% Mounted on"
+#define HEADER_TABLE_BLK "Filesystem  Blk. Size     Total        Used   Available Used%% Mounted on"
 
 #define PERCENTAGE(x, tot) (tot ? (100ULL * (x) / (tot)) : 0)
-#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 bool display_blocks;
+
+static int size_to_human_readable(uint64_t, size_t, char **);
 static void print_header(void);
-static void print_statfs(struct statfs *, char *, char *);
+static int print_statfs(struct statfs *, char *, char *);
 static void print_usage(void);
 
@@ -67 +64 @@
         int optres, errflg = 0;
         struct statfs st;
-
-        unit_size = 512;
-        human_readable = 0;
-
-        /******************************************/
-        /*   Parse command line options...        */
-        /******************************************/
-        while ((optres = getopt(argc, argv, ":uhb:")) != -1) {
+        int rc;
+
+        display_blocks = false;
+
+        /* Parse command-line options */
+        while ((optres = getopt(argc, argv, ":ubh")) != -1) {
                 switch(optres) {
-                case 'u':
+                case 'h':
                         print_usage();
                         return 0;
 
-                case 'h':
-                        human_readable = 1;
-                        break;
-
                 case 'b':
-                        str_uint32_t(optarg, NULL, 0, 0, &unit_size);
+                        display_blocks = true;
                         break;
  
@@ -123 +114 @@
         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' (%d).\n",
@@ -134 +127 @@
 }
 
-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 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 print_header(void)
 {
-        if (human_readable)
-                printf(HEADER_TABLE_HR);
+        if (!display_blocks)
+                printf(HEADER_TABLE);
         else
-                printf(HEADER_TABLE, unit_size);
+                printf(HEADER_TABLE_BLK);
 
         putchar('\n');
 }
 
-static void print_statfs(struct statfs *st, char *name, char *mountpoint)
+static int 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 (human_readable) {
-                char tmp[1024];
-
+        if (!display_blocks) {
                 /* Print size */
-                size_to_human_readable(tmp, st->f_blocks *  st->f_bsize);
-                printf(" %14s", tmp);
+                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 */
-                size_to_human_readable(tmp, used_blocks  *  st->f_bsize);
-                printf(" %14s", tmp);
+                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 */
-                size_to_human_readable(tmp, st->f_bfree *  st->f_bsize);
-                printf(" %14s", tmp);
+                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 */
@@ -185 +183 @@
                 printf(" %s\n", mountpoint);
         } else {
-                /* 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);
-        }
-
+                /* 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;
 }
 
 static void print_usage(void)
 {
-        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");
+        printf("Syntax: %s [<options>] \n", NAME);
+        printf("Options:\n");
+        printf("  -h Print help\n");
+        printf("  -b Print exact block sizes and numbers\n");
 }
 

uspace/lib/c/generic/cap.c

@@ -81 +81 @@
  * and @c cv_max gives the maximum value.
  */
-int cap_spec_to_blocks(cap_spec_t *cap, cap_vsel_t cvsel, size_t block_size,
+int cap_to_blocks(cap_spec_t *cap, cap_vsel_t cvsel, size_t block_size,
     uint64_t *rblocks)
 {

uspace/lib/c/include/cap.h

@@ -94 +94 @@
 extern void cap_simplify(cap_spec_t *);
 extern void cap_from_blocks(uint64_t, size_t, cap_spec_t *);
-extern int cap_spec_to_blocks(cap_spec_t *, cap_vsel_t, size_t, uint64_t *);
+extern int cap_to_blocks(cap_spec_t *, cap_vsel_t, size_t, uint64_t *);
 
 #endif

uspace/lib/fdisk/src/fdisk.c

@@ -996 +996 @@
         int rc;
 
-        rc = cap_spec_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
             &nom_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = cap_spec_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
             &min_blocks);
         if (rc != EOK)
                 return rc;
 
-        rc = cap_spec_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
+        rc = cap_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
             &max_blocks);
         if (rc != EOK)