Changeset 3432ddb in mainline

Timestamp:

2013-08-07T20:37:22Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

81bd5f4

Parents:

781408e

Message:

Implement human readable command option.

File:

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

uspace/app/df/df.c

@@ -47 +47 @@
 #define NAME  "df"
 
-#define HEADER_TABLE "Filesystem     %4u-blocks           Used      Available Used%% Mounted on\n"
+#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) ((unsigned long long) (100L * (x) / (tot)))  
@@ -56 +57 @@
 
 static unsigned int unit_size;
+static unsigned int human_readable;
 
+static int size_to_human_readable(char buf[], uint64_t bytes)
+static void print_header(void);
 static void print_statfs(struct statfs *, char *, char *);
 static void print_usage(void);
@@ -66 +70 @@
         
         unit_size = 512;
+        human_readable = 0;
 
         /******************************************/
@@ -73 +78 @@
                 switch(optres) {
                 case 'h':
+                        human_readable = 1;
                         break;
 
@@ -111 +117 @@
         LIST_INITIALIZE(mtab_list);
         get_mtab_list(&mtab_list);
-        printf(HEADER_TABLE, unit_size);
+        print_header();
         list_foreach(mtab_list, cur) {
                 mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
@@ -122 +128 @@
 }
 
+static int size_to_human_readable(char buf[], uint64_t bytes)
+{
+        const char *units = "BkMGTPEZY";
+        int i = 0;
+        int limit;
+
+        limit = str_length(units);
+        while (bytes >= 1024) {
+                if (i >= limit) 
+                        return -1;
+                bytes /= 1024;
+                i++;
+        }
+        snprintf(buf, 6, "%4llu%c", (unsigned long long)bytes, units[i]);
+
+        return 0;
+}
+
+static void print_header(void)
+{
+        if (human_readable)
+                printf(HEADER_TABLE_HR); 
+        else 
+                printf(HEADER_TABLE, unit_size);
+        putchar('\n');
+}
+
 static void print_statfs(struct statfs *st, char *name, char *mountpoint)
 {
         printf("%10s", name);
-        printf(" %15llu %14llu %14llu %4llu%% %s\n", 
-                FSBK_TO_BK(st->f_blocks, st->f_bsize, unit_size),                              /* Blocks     */
-                FSBK_TO_BK(st->f_blocks - st->f_bfree, st->f_bsize, unit_size),                /* Used       */
-                FSBK_TO_BK(st->f_bfree, st->f_bsize, unit_size),                               /* Available  */
-                (st->f_blocks)?PERCENTAGE(st->f_blocks - st->f_bfree, st->f_blocks):0L,        /* Used%      */
-                mountpoint                                                                     /* Mounted on */
-        );
+        
+        if (human_readable) {
+                char tmp[1024];
+                size_to_human_readable(tmp, st->f_blocks *  st->f_bsize);
+                printf(" %14s", tmp);                                                                 /* Size       */
+                size_to_human_readable(tmp, (st->f_blocks - st->f_bfree)  *  st->f_bsize);
+                printf(" %14s", tmp);                                                                 /* Used       */
+                size_to_human_readable(tmp, st->f_bfree *  st->f_bsize);
+                printf(" %14s", tmp);                                                                 /* Available  */
+                printf(" %4llu%% %s\n", 
+                        (st->f_blocks)?PERCENTAGE(st->f_blocks - st->f_bfree, st->f_blocks):0L,        /* Used%      */
+                        mountpoint                                                                     /* Mounted on */
+                );
+        }
+        else
+                printf(" %15llu %14llu %14llu %4llu%% %s\n", 
+                        FSBK_TO_BK(st->f_blocks, st->f_bsize, unit_size),                              /* Blocks     */
+                        FSBK_TO_BK(st->f_blocks - st->f_bfree, st->f_bsize, unit_size),                /* Used       */
+                        FSBK_TO_BK(st->f_bfree, st->f_bsize, unit_size),                               /* Available  */
+                        (st->f_blocks)?PERCENTAGE(st->f_blocks - st->f_bfree, st->f_blocks):0L,        /* Used%      */
+                        mountpoint                                                                     /* Mounted on */
+                );
+        
 }