Changeset 5e962ad in mainline

Timestamp:

2017-09-21T16:13:41Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

207d5da

Parents:

4c363fa2

Message:

Add a module to format command output as a table.

Location:

uspace

Files:

• app/inet/inet.c (modified) (14 diffs)
• lib/c/Makefile (modified) (2 diffs)
• lib/c/generic/io/table.c (added)
• lib/c/include/io/table.h (added)
• lib/c/test/io/table.c (added)
• lib/c/test/main.c (modified) (1 diff)

uspace/app/inet/inet.c

@@ -38 +38 @@
 #include <inet/addr.h>
 #include <inet/inetcfg.h>
+#include <io/table.h>
 #include <loc.h>
 #include <stdio.h>
@@ -48 +49 @@
 static void print_syntax(void)
 {
-        printf("syntax:\n");
-        printf("\t" NAME " create <addr>/<width> <link-name> <addr-name>\n");
-        printf("\t" NAME " delete <link-name> <addr-name>\n");
-        printf("\t" NAME " add-sr <dest-addr>/<width> <router-addr> <route-name>\n");
-        printf("\t" NAME " del-sr <route-name>\n");
+        printf("Syntax:\n");
+        printf("  %s create <addr>/<width> <link-name> <addr-name>\n", NAME);
+        printf("  %s delete <link-name> <addr-name>\n", NAME);
+        printf("  %s add-sr <dest-addr>/<width> <router-addr> <route-name>\n", NAME);
+        printf("  %s del-sr <route-name>\n", NAME);
 }
 
@@ -242 +243 @@
         inet_addr_info_t ainfo;
         inet_link_info_t linfo;
+        table_t *table = NULL;
 
         size_t count;
         size_t i;
         int rc;
-        char *astr;
+        char *astr = NULL;
+
+        ainfo.name = NULL;
+        linfo.name = NULL;
 
         rc = inetcfg_get_addr_list(&addr_list, &count);
@@ -254 +259 @@
         }
 
-        printf("Configured addresses:\n");
-        if (count > 0)
-                printf("    [Addr/Width] [Link-Name] [Addr-Name] [Def-MTU]\n");
-        ainfo.name = NULL;
-        linfo.name = NULL;
-        astr = NULL;
+        rc = table_create(&table);
+        if (rc != EOK) {
+                printf("Memory allocation failed.\n");
+                goto out;
+        }
+
+        table_set_margin_left(table, 4);
+
+        printf("Configured addresses:\n\n");
+
+        table_header_row(table);
+        table_printf(table, "Addr/Width\t" "Link-Name\t" "Addr-Name\t"
+            "Def-MTU\n");
 
         for (i = 0; i < count; i++) {
@@ -285 +297 @@
                 }
 
-                printf("    %s %s %s %zu\n", astr, linfo.name,
-                    ainfo.name, linfo.def_mtu);
+                table_printf(table, "%s\t" "%s\t" "%s\t" "%zu\n", astr,
+                    linfo.name, ainfo.name, linfo.def_mtu);
 
                 free(ainfo.name);
@@ -297 +309 @@
         }
 
-        if (count == 0)
-                printf("    None\n");
+        if (count == 0) {
+                printf("None\n");
+        } else {
+                rc = table_print_out(table, stdout);
+                if (rc != EOK) {
+                        printf("Error printing table.\n");
+                        goto out;
+                }
+        }
+
+        rc = EOK;
 out:
+        table_destroy(table);
         if (ainfo.name != NULL)
                 free(ainfo.name);
@@ -309 +331 @@
         free(addr_list);
 
-        return EOK;
+        return rc;
 }
 
 static int link_list(void)
 {
-        sysarg_t *link_list;
+        sysarg_t *link_list = NULL;
         inet_link_info_t linfo;
+        table_t *table = NULL;
 
         size_t count;
@@ -327 +350 @@
         }
 
-        printf("IP links:\n");
-        if (count > 0)
-                printf("    [Link-layer Address] [Link-Name] [Def-MTU]\n");
+        rc = table_create(&table);
+        if (rc != EOK) {
+                printf("Memory allocation failed.\n");
+                goto out;
+        }
+
+        table_set_margin_left(table, 4);
+
+        printf("IP links:\n\n");
+        table_header_row(table);
+        table_printf(table, "Link-layer Address\t" "Link-Name\t" "Def-MTU\n");
 
         for (i = 0; i < count; i++) {
@@ -339 +370 @@
                 }
 
-                printf("    %02x:%02x:%02x:%02x:%02x:%02x %s %zu\n",
+                table_printf(table, "%02x:%02x:%02x:%02x:%02x:%02x\t"
+                    "%s\t" "%zu\n",
                     linfo.mac_addr[0], linfo.mac_addr[1],
                     linfo.mac_addr[2], linfo.mac_addr[3],
@@ -350 +382 @@
         }
 
-        if (count == 0)
-                printf("    None\n");
-
+        if (count == 0) {
+                printf("None\n");
+        } else {
+                rc = table_print_out(table, stdout);
+                if (rc != EOK) {
+                        printf("Error printing table.\n");
+                        goto out;
+                }
+        }
+
+        rc = EOK;
+out:
+        table_destroy(table);
         free(link_list);
 
-        return EOK;
+        return rc;
 }
 
 static int sroute_list(void)
 {
-        sysarg_t *sroute_list;
+        sysarg_t *sroute_list = NULL;
         inet_sroute_info_t srinfo;
+        table_t *table = NULL;
 
         size_t count;
         size_t i;
         int rc;
-        char *dest_str;
-        char *router_str;
+        char *dest_str = NULL;
+        char *router_str = NULL;
+
+        srinfo.name = NULL;
 
         rc = inetcfg_get_sroute_list(&sroute_list, &count);
@@ -375 +420 @@
         }
 
-        printf("Static routes:\n");
-        if (count > 0)
-                printf("    [Dest/Width] [Router-Addr] [Route-Name]\n");
-
-        srinfo.name = NULL;
-        dest_str = NULL;
-        router_str = NULL;
+        rc = table_create(&table);
+        if (rc != EOK) {
+                printf("Memory allocation failed.\n");
+                goto out;
+        }
+
+        table_set_margin_left(table, 4);
+
+        printf("Static routes:\n\n");
+        table_header_row(table);
+        table_printf(table, "Dest/Width\t" "Router-Addr\t" "Route-Name\n");
 
         for (i = 0; i < count; i++) {
@@ -406 +455 @@
                 }
 
-                printf("    %s %s %s\n", dest_str, router_str, srinfo.name);
+                table_printf(table, "%s\t" "%s\t" "%s\n", dest_str, router_str,
+                    srinfo.name);
 
                 free(srinfo.name);
@@ -417 +467 @@
         }
 
-        if (count == 0)
-                printf("    None\n");
+        if (count == 0) {
+                printf("None\n");
+        } else {
+                rc = table_print_out(table, stdout);
+                if (rc != EOK) {
+                        printf("Error printing table.\n");
+                        goto out;
+                }
+        }
+
+        rc = EOK;
 out:
+        table_destroy(table);
         if (srinfo.name != NULL)
                 free(srinfo.name);
@@ -429 +489 @@
         free(sroute_list);
 
-        return EOK;
+        return rc;
 }
 

uspace/lib/c/Makefile

@@ -126 +126 @@
         generic/io/con_srv.c \
         generic/io/console.c \
+        generic/io/table.c \
         generic/io/visualizer.c \
         generic/io/window.c \
@@ -183 +184 @@
         test/fibril/timer.c \
         test/main.c \
+        test/io/table.c \
         test/odict.c \
         test/qsort.c \

uspace/lib/c/test/main.c

@@ -37 +37 @@
 PCUT_IMPORT(sprintf);
 PCUT_IMPORT(str);
+PCUT_IMPORT(table);
 
 PCUT_MAIN()