Changeset 25eec4e in mainline for uspace/app/klog/klog.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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:

Merge mainline chages.

File:

• uspace/app/klog/klog.c (modified) (2 diffs)

uspace/app/klog/klog.c

@@ -48 +48 @@
 #include <adt/list.h>
 #include <adt/prodcons.h>
+#include <tinput.h>
 
 #define NAME       "klog"
@@ -228 +229 @@
         }
         
+        tinput_t *input = tinput_new();
+        if (!input) {
+                fprintf(stderr, "%s: Could not create input\n", NAME);
+                return ENOMEM;
+        }       
+
         fibril_add_ready(fid);
         event_unmask(EVENT_KLOG);
         klog_update();
         
-        task_retval(0);
-        async_manager();
-        
-        return 0;
+        tinput_set_prompt(input, "klog> ");
+
+        char *str;
+        while ((rc = tinput_read(input, &str)) == EOK) {
+                if (str_cmp(str, "") == 0) {
+                        free(str);
+                        continue;
+                }
+
+                klog_command(str, str_size(str));
+                free(str);
+        }
+ 
+        if (rc == ENOENT)
+                rc = EOK;       
+
+        return EOK;
 }