Changeset 3aae4e8 in mainline for uspace/app/sbi/src/os/helenos.c

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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 changes.

File:

• uspace/app/sbi/src/os/helenos.c (modified) (2 diffs)

uspace/app/sbi/src/os/helenos.c

@@ -105 +105 @@
 {
         char *line;
+        int rc;
 
         if (tinput == NULL) {
@@ -112 +113 @@
         }
 
-        line = tinput_read(tinput);
-        if (line == NULL)
+        rc = tinput_read(tinput, &line);
+        if (rc == ENOENT) {
+                /* User-requested abort */
+                *ptr = os_str_dup("");
+                return EOK;
+        }
+
+        if (rc != EOK) {
+                /* Error in communication with console */
                 return EIO;
+        }
 
         /* XXX Input module needs trailing newline to keep going. */