Changeset c1f7f6ea in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2009-02-27T12:53:46Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c214a65

Parents:

e49e234

Message:

prettyprint help and tests

File:

• kernel/generic/src/console/cmd.c (modified) (3 diffs)

kernel/generic/src/console/cmd.c

@@ -515 +515 @@
 int cmd_help(cmd_arg_t *argv)
 {
+        spinlock_lock(&cmd_lock);
+        
         link_t *cur;
-
-        spinlock_lock(&cmd_lock);
-        
+        size_t len = 0;
         for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
                 cmd_info_t *hlp;
-                
                 hlp = list_get_instance(cur, cmd_info_t, link);
+                
                 spinlock_lock(&hlp->lock);
-                
-                printf("%s - %s\n", hlp->name, hlp->description);
-
+                if (strlen(hlp->name) > len)
+                        len = strlen(hlp->name);
                 spinlock_unlock(&hlp->lock);
         }
         
+        for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
+                cmd_info_t *hlp;
+                hlp = list_get_instance(cur, cmd_info_t, link);
+                
+                spinlock_lock(&hlp->lock);
+                printf("%-*s %s\n", len, hlp->name, hlp->description);
+                spinlock_unlock(&hlp->lock);
+        }
+        
         spinlock_unlock(&cmd_lock);
-
+        
         return 1;
 }
@@ -949 +957 @@
 int cmd_tests(cmd_arg_t *argv)
 {
+        size_t len = 0;
         test_t *test;
+        for (test = tests; test->name != NULL; test++) {
+                if (strlen(test->name) > len)
+                        len = strlen(test->name);
+        }
         
         for (test = tests; test->name != NULL; test++)
-                printf("%-10s %s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
-        
-        printf("%-10s Run all safe tests\n", "*");
+                printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+        
+        printf("%-*s Run all safe tests\n", len, "*");
         return 1;
 }
@@ -960 +973 @@
 static bool run_test(const test_t *test)
 {
-        printf("%s\t\t%s\n", test->name, test->desc);
+        printf("%s (%s)\n", test->name, test->desc);
         
         /* Update and read thread accounting