Changeset f65d9cc in mainline for uspace/app

Timestamp:

2013-09-21T05:28:00Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

026271d5

Parents:

772a172 (diff), b9f7848b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes.

Location:

uspace/app

Files:

• df/df.c (modified) (9 diffs)
• inet/inet.c (modified) (2 diffs)

uspace/app/df/df.c

@@ -50 +50 @@
 #define HEADER_TABLE_HR "Filesystem           Size           Used      Available Used%% Mounted on"
 
-#define PERCENTAGE(x, tot) ((unsigned long long) (100L * (x) / (tot)))
+#define PERCENTAGE(x, tot) (tot ? (100ULL * (x) / (tot)) : 0)
 #define FSBK_TO_BK(x, fsbk, bk) \
         (((fsbk) != 0 && (fsbk) < (bk)) ? \
@@ -59 +59 @@
 static unsigned int human_readable;
 
-static int size_to_human_readable(char buf[], uint64_t bytes);
+static void size_to_human_readable(char *buf, uint64_t bytes);
 static void print_header(void);
 static void print_statfs(struct statfs *, char *, char *);
@@ -90 +90 @@
  
                 case ':':
-                        fprintf(stderr, "Option -%c requires an operand\n", optopt);
+                        fprintf(stderr, "Option -%c requires an operand\n",
+                            optopt);
                         errflg++;
                         break;
@@ -100 +101 @@
 
                 default:
-                        fprintf(stderr, "Unknown error while parsing command line options.");
+                        fprintf(stderr,
+                            "Unknown error while parsing command line options");
                         errflg++;
                         break;
@@ -107 +109 @@
 
         if (optind > argc) {
-                fprintf(stderr, "Too many input parameter\n");
+                fprintf(stderr, "Too many input parameters\n");
                 errflg++;
         }
@@ -118 +120 @@
         LIST_INITIALIZE(mtab_list);
         get_mtab_list(&mtab_list);
+
         print_header();
         list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
@@ -123 +126 @@
                 print_statfs(&st, mtab_ent->fs_name, mtab_ent->mp);
         }
+
         putchar('\n');
         return 0;
 }
 
-static int size_to_human_readable(char buf[], uint64_t bytes)
+static void 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;
+
+        snprintf(buf, 6, "%4llu%c", (unsigned long long) bytes, units[i]);
 }
 
@@ -151 +150 @@
         else
                 printf(HEADER_TABLE, unit_size);
+
         putchar('\n');
 }
@@ -156 +156 @@
 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);
+
         printf("%10s", name);
 
         if (human_readable) {
                 char tmp[1024];
+
+                /* Print size */
                 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       */
+                printf(" %14s", tmp);
+
+                /* Number of used blocks */
+                size_to_human_readable(tmp, used_blocks  *  st->f_bsize);
+                printf(" %14s", tmp);
+
+                /* Number of available blocks */
                 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 */
-                );
+                printf(" %14s", tmp);
+
+                /* Percentage of used blocks */
+                printf(" %4u%%", perc_used);
+
+                /* Mount point */
+                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);
+        }
 
 }

uspace/app/inet/inet.c

@@ -312 +312 @@
 }
 
+static int link_list(void)
+{
+        sysarg_t *link_list;
+        inet_link_info_t linfo;
+
+        size_t count;
+        size_t i;
+        int rc;
+
+        rc = inetcfg_get_link_list(&link_list, &count);
+        if (rc != EOK) {
+                printf(NAME ": Failed getting link list.\n");
+                return rc;
+        }
+
+        printf("IP links:\n");
+        if (count > 0)
+                printf("    [Link-layer Address] [Link-Name] [Def-MTU]\n");
+
+        for (i = 0; i < count; i++) {
+                rc = inetcfg_link_get(link_list[i], &linfo);
+                if (rc != EOK) {
+                        printf("Failed getting properties of link %zu.\n",
+                            (size_t)link_list[i]);
+                        continue;
+                }
+
+                printf("    %02x:%02x:%02x:%02x:%02x:%02x %s %zu\n",
+                    linfo.mac_addr[0], linfo.mac_addr[1],
+                    linfo.mac_addr[2], linfo.mac_addr[3],
+                    linfo.mac_addr[4], linfo.mac_addr[5],
+                    linfo.name, linfo.def_mtu);
+
+                free(linfo.name);
+
+                linfo.name = NULL;
+        }
+
+        if (count == 0)
+                printf("    None\n");
+
+        free(link_list);
+
+        return EOK;
+}
+
 static int sroute_list(void)
 {
@@ -404 +450 @@
                 if (rc != EOK)
                         return 1;
+                rc = link_list();
+                if (rc != EOK)
+                        return 1;
                 return 0;
         }