Changes in uspace/lib/clui/tinput.c [5db9084:36a75a2] in mainline

File:

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

uspace/lib/clui/tinput.c

@@ -513 +513 @@
 }
 
-/** Read in one line of input.
- *
- * @param ti    Text input.
- * @param dstr  Place to save pointer to new string.
- * @return      EOK on success, ENOENT if user requested abort, EIO
- *              if communication with console failed.
- */
-int tinput_read(tinput_t *ti, char **dstr)
+/** Read in one line of input. */
+char *tinput_read(tinput_t *ti)
 {
         console_event_t ev;
@@ -528 +522 @@
 
         if (console_get_size(fphone(stdin), &ti->con_cols, &ti->con_rows) != EOK)
-                return EIO;
+                return NULL;
         if (console_get_pos(fphone(stdin), &ti->col0, &ti->row0) != EOK)
-                return EIO;
+                return NULL;
 
         ti->pos = ti->sel_start = 0;
@@ -536 +530 @@
         ti->buffer[0] = '\0';
         ti->done = false;
-        ti->exit_clui = false;
 
         while (!ti->done) {
                 fflush(stdout);
                 if (!console_get_event(fphone(stdin), &ev))
-                        return EIO;
+                        return NULL;
 
                 if (ev.type != KEY_PRESS)
@@ -572 +565 @@
         }
 
-        if (ti->exit_clui)
-                return ENOENT;
-
         ti->pos = ti->nc;
         tinput_position_caret(ti);
@@ -585 +575 @@
         ti->hpos = 0;
 
-        *dstr = str;
-        return EOK;
+        return str;
 }
 
@@ -617 +606 @@
         case KC_A:
                 tinput_sel_all(ti);
-                break;
-        case KC_Q:
-                /* Signal libary client to quit interactive loop. */
-                ti->done = true;
-                ti->exit_clui = true;
                 break;
         default: