Changeset f4cbf9dd in mainline

Timestamp:

2013-07-19T22:16:59Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

17a0fb8

Parents:

330df83

Message:

Add unit_size option.

File:

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

uspace/app/df/df.c

@@ -47 +47 @@
 #define NAME  "df"
 
-#define HEADER_TABLE "Filesystem     512-blocks           Used      Available Used% Mounted on"
+#define HEADER_TABLE "Filesystem     %4u-blocks           Used      Available Used%% Mounted on\n"
 
 #define PERCENTAGE(x, tot) ((unsigned long long) (100L * (x) / (tot)))  
@@ -54 +54 @@
                 (unsigned long long) ((x) / ((bk) / (fsbk))) : \
                 (unsigned long long) ((x) * ((fsbk) / (bk))))
+
+static unsigned int unit_size;
 
 static void print_statfs(struct statfs *, char *, char *);
@@ -63 +65 @@
         struct statfs st;
         
+        unit_size = 512;
+
         /******************************************/
         /*   Parse command line options...        */
         /******************************************/
-        while ((optres = getopt(argc, argv, ":hi")) != -1) {
+        while ((optres = getopt(argc, argv, ":hib:")) != -1) {
                 switch(optres) {
                 case 'h':
@@ -72 +76 @@
 
                 case 'i':
+                        break;
+
+                case 'b':
+                        str_uint32_t(optarg, NULL, 0, 0, &unit_size);
                         break;
     
@@ -103 +111 @@
         LIST_INITIALIZE(mtab_list);
         get_mtab_list(&mtab_list);
-        printf("%s\n", HEADER_TABLE);
+        printf(HEADER_TABLE, unit_size);
         list_foreach(mtab_list, cur) {
                 mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
@@ -117 +125 @@
 {
         printf("%10s", name);
-        printf(" %14llu %14llu %14llu %4llu%% %s\n", 
-                FSBK_TO_BK(st->f_blocks, st->f_bsize, 512),                              /* Blocks     */
-                FSBK_TO_BK(st->f_blocks - st->f_bfree, st->f_bsize, 512),                /* Used       */
-                FSBK_TO_BK(st->f_bfree, st->f_bsize, 512),                               /* Available  */
-                (st->f_blocks)?PERCENTAGE(st->f_blocks - st->f_bfree, st->f_blocks):0L,  /* Used%      */
-                mountpoint                                                               /* Mounted on */
+        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 */
         );
 }