Changeset 87822ce in mainline for uspace/app/bdsh/cmds/modules/cat/cat.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/app/bdsh/cmds/modules/cat/cat.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -122 +122 @@
         cons_event_t ev;
         kbd_event_t *kev;
+        errno_t rc;
 
         while (true) {
-                if (!console_get_event(console, &ev)) {
+                rc = console_get_event(console, &ev);
+                if (rc != EOK)
                         return;
-                }
                 if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
                         kev = &ev.ev.key;