Changeset 87822ce in mainline for uspace/lib/ui/src/ui.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/ui/src/ui.c (modified) (3 diffs)

uspace/lib/ui/src/ui.c

@@ -39 +39 @@
 #include <fibril.h>
 #include <io/console.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <str.h>
@@ -220 +221 @@
 void ui_run(ui_t *ui)
 {
-        bool have_event;
         cons_event_t event;
         usec_t timeout;
+        errno_t rc;
 
         /* Only return command prompt if we are running in a separate window */
@@ -231 +232 @@
                 if (ui->console != NULL) {
                         timeout = 100000;
-                        have_event = console_get_event_timeout(ui->console,
+                        rc = console_get_event_timeout(ui->console,
                             &event, &timeout);
-                        if (have_event)
+
+                        /* Do we actually have an event? */
+                        if (rc == EOK) {
                                 ui_cons_event_process(ui, &event);
+                        } else if (rc != ETIMEOUT) {
+                                /* Error, quit */
+                                break;
+                        }
                 } else {
                         fibril_usleep(100000);