Changeset c0f13d2 in mainline for kernel/generic/src/console

Timestamp:

2010-06-10T16:04:07Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

48dcc69

Parents:

8eec3c8

Message:

introduce more compact and more readable command output to kconsole (suitable even for 80-column screens)

Location:

kernel/generic/src/console

Files:

• cmd.c (modified) (3 diffs)
• kconsole.c (modified) (2 diffs)

kernel/generic/src/console/cmd.c

@@ -207 +207 @@
 };
 
-/* Data and methods for 'call0' command. */
+/* Data and methods for 'call0' and 'mcall0' command. */
 static char call0_buf[MAX_CMDLINE + 1];
 static char carg1_buf[MAX_CMDLINE + 1];
@@ -363 +363 @@
 };
 
+
 static int cmd_tasks(cmd_arg_t *argv);
+static char tasks_buf[MAX_CMDLINE + 1];
+
+static cmd_arg_t tasks_argv = {
+        .type = ARG_TYPE_STRING_OPTIONAL,
+        .buffer = tasks_buf,
+        .len = sizeof(tasks_buf)
+};
 static cmd_info_t tasks_info = {
         .name = "tasks",
-        .description = "List all tasks.",
+        .description = "List all tasks (use -a for additional information).",
         .func = cmd_tasks,
-        .argc = 0
+        .argc = 1,
+        .argv = &tasks_argv
 };
 
@@ -930 +939 @@
  * @return Always 1
  */
-int cmd_tasks(cmd_arg_t * argv)
-{
-        task_print_list();
+int cmd_tasks(cmd_arg_t *argv)
+{
+        if (str_cmp(tasks_buf, "-a") == 0)
+                task_print_list(true);
+        else if (str_cmp(tasks_buf, "") == 0)
+                task_print_list(false);
+        else
+                printf("Unknown argument \"%s\".\n", tasks_buf);
+        
         return 1;
 }

kernel/generic/src/console/kconsole.c

@@ -590 +590 @@
         size_t i;
         for (i = 0; i < cmd->argc; i++) {
+                char *buf;
+                
                 start = end;
                 if (!parse_argument(cmdline, size, &start, &end)) {
+                        if (cmd->argv[i].type == ARG_TYPE_STRING_OPTIONAL) {
+                                buf = (char *) cmd->argv[i].buffer;
+                                str_cpy(buf, cmd->argv[i].len, "");
+                                continue;
+                        }
+                        
                         printf("Too few arguments.\n");
                         spinlock_unlock(&cmd->lock);
@@ -597 +605 @@
                 }
                 
-                char *buf;
                 switch (cmd->argv[i].type) {
                 case ARG_TYPE_STRING:
+                case ARG_TYPE_STRING_OPTIONAL:
                         buf = (char *) cmd->argv[i].buffer;
                         str_ncpy(buf, cmd->argv[i].len, cmdline + start,