Changeset 87822ce in mainline for uspace/lib/clui/tinput.c

Timestamp:

2021-03-04T19:14:30Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d6c4d40

Parents:

760a392

Message:

Avoid infinite loop when console communication is broken

Need to make sure callers of console_get_event_timeout() can distinguish
between timeout and I/O error. Fix all callers of console_get_event()
and console_get_event_timeout() not to enter infinite loop when console
connection is broken. Also avoid setting of errno variable.

File:

• uspace/lib/clui/tinput.c (modified) (2 diffs)

uspace/lib/clui/tinput.c

@@ -874 +874 @@
 errno_t tinput_read_i(tinput_t *ti, const char *istr, char **dstr)
 {
+        errno_t rc;
+
         console_flush(ti->console);
         if (console_get_size(ti->console, &ti->con_cols, &ti->con_rows) != EOK)
@@ -891 +893 @@
 
                 cons_event_t ev;
-                if (!console_get_event(ti->console, &ev))
+                rc = console_get_event(ti->console, &ev);
+                if (rc != EOK)
                         return EIO;